From a3a696b436af824914a5393535969439521faa74 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Thu, 2 Jul 2009 12:26:38 +0100
Subject: [PATCH 01/84] code clean-up

---
 .../hPsiMixtureThermo/hPsiMixtureThermo.C     | 30 ++++++++--------
 .../hRhoMixtureThermo/hRhoMixtureThermo.C     | 36 +++++++++----------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hPsiMixtureThermo/hPsiMixtureThermo.C b/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hPsiMixtureThermo/hPsiMixtureThermo.C
index 7ca8690461..5a788049a6 100644
--- a/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hPsiMixtureThermo/hPsiMixtureThermo.C
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hPsiMixtureThermo/hPsiMixtureThermo.C
@@ -43,14 +43,14 @@ void Foam::hPsiMixtureThermo<MixtureType>::calculate()
 
     forAll(TCells, celli)
     {
-        const typename MixtureType::thermoType& mixture_ =
+        const typename MixtureType::thermoType& mixture =
             this->cellMixture(celli);
 
-        TCells[celli] = mixture_.TH(hCells[celli], TCells[celli]);
-        psiCells[celli] = mixture_.psi(pCells[celli], TCells[celli]);
+        TCells[celli] = mixture.TH(hCells[celli], TCells[celli]);
+        psiCells[celli] = mixture.psi(pCells[celli], TCells[celli]);
 
-        muCells[celli] = mixture_.mu(TCells[celli]);
-        alphaCells[celli] = mixture_.alpha(TCells[celli]);
+        muCells[celli] = mixture.mu(TCells[celli]);
+        alphaCells[celli] = mixture.alpha(TCells[celli]);
     }
 
     forAll(T_.boundaryField(), patchi)
@@ -68,28 +68,28 @@ void Foam::hPsiMixtureThermo<MixtureType>::calculate()
         {
             forAll(pT, facei)
             {
-                const typename MixtureType::thermoType& mixture_ =
+                const typename MixtureType::thermoType& mixture =
                     this->patchFaceMixture(patchi, facei);
 
-                ph[facei] = mixture_.H(pT[facei]);
+                ph[facei] = mixture.H(pT[facei]);
 
-                ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
-                pmu_[facei] = mixture_.mu(pT[facei]);
-                palpha_[facei] = mixture_.alpha(pT[facei]);
+                ppsi[facei] = mixture.psi(pp[facei], pT[facei]);
+                pmu_[facei] = mixture.mu(pT[facei]);
+                palpha_[facei] = mixture.alpha(pT[facei]);
             }
         }
         else
         {
             forAll(pT, facei)
             {
-                const typename MixtureType::thermoType& mixture_ =
+                const typename MixtureType::thermoType& mixture =
                     this->patchFaceMixture(patchi, facei);
 
-                pT[facei] = mixture_.TH(ph[facei], pT[facei]);
+                pT[facei] = mixture.TH(ph[facei], pT[facei]);
 
-                ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
-                pmu_[facei] = mixture_.mu(pT[facei]);
-                palpha_[facei] = mixture_.alpha(pT[facei]);
+                ppsi[facei] = mixture.psi(pp[facei], pT[facei]);
+                pmu_[facei] = mixture.mu(pT[facei]);
+                palpha_[facei] = mixture.alpha(pT[facei]);
             }
         }
     }
diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hRhoMixtureThermo/hRhoMixtureThermo.C b/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hRhoMixtureThermo/hRhoMixtureThermo.C
index 0c763fd78a..9cbf9202de 100644
--- a/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hRhoMixtureThermo/hRhoMixtureThermo.C
+++ b/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hRhoMixtureThermo/hRhoMixtureThermo.C
@@ -44,15 +44,15 @@ void Foam::hRhoMixtureThermo<MixtureType>::calculate()
 
     forAll(TCells, celli)
     {
-        const typename MixtureType::thermoType& mixture_ =
+        const typename MixtureType::thermoType& mixture =
             this->cellMixture(celli);
 
-        TCells[celli] = mixture_.TH(hCells[celli], TCells[celli]);
-        psiCells[celli] = mixture_.psi(pCells[celli], TCells[celli]);
-        rhoCells[celli] = mixture_.rho(pCells[celli], TCells[celli]);
+        TCells[celli] = mixture.TH(hCells[celli], TCells[celli]);
+        psiCells[celli] = mixture.psi(pCells[celli], TCells[celli]);
+        rhoCells[celli] = mixture.rho(pCells[celli], TCells[celli]);
 
-        muCells[celli] = mixture_.mu(TCells[celli]);
-        alphaCells[celli] = mixture_.alpha(TCells[celli]);
+        muCells[celli] = mixture.mu(TCells[celli]);
+        alphaCells[celli] = mixture.alpha(TCells[celli]);
     }
 
     forAll(T_.boundaryField(), patchi)
@@ -71,30 +71,30 @@ void Foam::hRhoMixtureThermo<MixtureType>::calculate()
         {
             forAll(pT, facei)
             {
-                const typename MixtureType::thermoType& mixture_ =
+                const typename MixtureType::thermoType& mixture =
                     this->patchFaceMixture(patchi, facei);
 
-                ph[facei] = mixture_.H(pT[facei]);
+                ph[facei] = mixture.H(pT[facei]);
 
-                ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
-                prho[facei] = mixture_.rho(pp[facei], pT[facei]);
-                pmu_[facei] = mixture_.mu(pT[facei]);
-                palpha_[facei] = mixture_.alpha(pT[facei]);
+                ppsi[facei] = mixture.psi(pp[facei], pT[facei]);
+                prho[facei] = mixture.rho(pp[facei], pT[facei]);
+                pmu_[facei] = mixture.mu(pT[facei]);
+                palpha_[facei] = mixture.alpha(pT[facei]);
             }
         }
         else
         {
             forAll(pT, facei)
             {
-                const typename MixtureType::thermoType& mixture_ =
+                const typename MixtureType::thermoType& mixture =
                     this->patchFaceMixture(patchi, facei);
 
-                pT[facei] = mixture_.TH(ph[facei], pT[facei]);
+                pT[facei] = mixture.TH(ph[facei], pT[facei]);
 
-                ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
-                prho[facei] = mixture_.rho(pp[facei], pT[facei]);
-                pmu_[facei] = mixture_.mu(pT[facei]);
-                palpha_[facei] = mixture_.alpha(pT[facei]);
+                ppsi[facei] = mixture.psi(pp[facei], pT[facei]);
+                prho[facei] = mixture.rho(pp[facei], pT[facei]);
+                pmu_[facei] = mixture.mu(pT[facei]);
+                palpha_[facei] = mixture.alpha(pT[facei]);
             }
         }
     }

From d98e7e524609406e7233e1b3e16eb39a269c0803 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Thu, 2 Jul 2009 16:40:23 +0100
Subject: [PATCH 02/84] changed flip

---
 src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
index 0839e621cb..b5b4174fb3 100644
--- a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -113,7 +113,7 @@ Foam::label Foam::meshRefinement::createBaffle
                 true,                       // face flip
                 neiPatch,                   // patch for face
                 zoneID,                     // zone for face
-                zoneFlip                    // face flip in zone
+                !zoneFlip                   // face flip in zone
             )
         );
     }

From 45a014dd023bc3bcdd2338f44b0dea3d7c0b6702 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Thu, 2 Jul 2009 16:40:57 +0100
Subject: [PATCH 03/84] referenced non-existing fvMesh instead of polyMesh

---
 src/lagrangian/basic/Particle/Particle.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lagrangian/basic/Particle/Particle.C b/src/lagrangian/basic/Particle/Particle.C
index 4b51b88a45..0658e4947f 100644
--- a/src/lagrangian/basic/Particle/Particle.C
+++ b/src/lagrangian/basic/Particle/Particle.C
@@ -75,7 +75,7 @@ void Foam::Particle<ParticleType>::findFaces
     DynamicList<label>& faceList
 ) const
 {
-    const polyMesh& mesh = cloud_.mesh();
+    const polyMesh& mesh = cloud_.pMesh();
     const labelList& faces = mesh.cells()[celli];
     const vector& C = mesh.cellCentres()[celli];
 

From 2fa69983c9ca4fa9d3b25406e57b94cb9b8c759b Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Thu, 2 Jul 2009 18:30:02 +0100
Subject: [PATCH 04/84] added PatchInjection injection model

---
 .../include/makeParcelInjectionModels.H       |   9 +-
 ...eReactingMultiphaseParcelInjectionModels.H |   8 +
 .../makeReactingParcelInjectionModels.H       |   8 +
 .../GradientDispersionRAS.C                   |   4 +-
 .../StochasticDispersionRAS.C                 |   4 +-
 .../PatchInjection/PatchInjection.C           | 206 ++++++++++++++++++
 .../PatchInjection/PatchInjection.H           | 187 ++++++++++++++++
 7 files changed, 421 insertions(+), 5 deletions(-)
 create mode 100644 src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
 create mode 100644 src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H

diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H
index 5483f56f61..c247249f9d 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H
@@ -37,10 +37,11 @@ License
 #include "KinematicLookupTableInjection.H"
 #include "ManualInjection.H"
 #include "NoInjection.H"
+#include "PatchInjection.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeParcelInjectionModels(ParcelType)                                  \
+#define makeParcelInjectionModels(ParcelType)                                 \
                                                                               \
     makeInjectionModel(KinematicCloud<ParcelType>);                           \
                                                                               \
@@ -79,6 +80,12 @@ License
         NoInjection,                                                          \
         KinematicCloud,                                                       \
         ParcelType                                                            \
+    );                                                                        \
+    makeInjectionModelType                                                    \
+    (                                                                         \
+        PatchInjection,                                                       \
+        KinematicCloud,                                                       \
+        ParcelType                                                            \
     );
 
 
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H
index 01a3689760..e93dce2375 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H
@@ -37,6 +37,7 @@ License
 #include "FieldActivatedInjection.H"
 #include "ManualInjection.H"
 #include "NoInjection.H"
+#include "PatchInjection.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -100,6 +101,13 @@ License
         ParcelType,                                                           \
         ThermoType                                                            \
     );                                                                        \
+    makeInjectionModelThermoType                                              \
+    (                                                                         \
+        PatchInjection,                                                       \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H
index 288510c48c..41ca35fcf5 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H
@@ -37,6 +37,7 @@ License
 #include "FieldActivatedInjection.H"
 #include "ManualInjection.H"
 #include "NoInjection.H"
+#include "PatchInjection.H"
 #include "ReactingLookupTableInjection.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -102,6 +103,13 @@ License
         ThermoType                                                            \
     );                                                                        \
     makeInjectionModelThermoType                                              \
+    (                                                                         \
+        PatchInjection,                                                       \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+    makeInjectionModelThermoType                                              \
     (                                                                         \
         ReactingLookupTableInjection,                                         \
         KinematicCloud,                                                       \
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
index a8fdac2b47..876a6dc021 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
@@ -68,8 +68,8 @@ Foam::vector Foam::GradientDispersionRAS<CloudType>::update
 {
     const scalar cps = 0.16432;
 
-    const volScalarField& k = this->turbulence().k();
-    const volScalarField& epsilon = this->turbulence().epsilon();
+    const volScalarField k = this->turbulence().k();
+    const volScalarField epsilon = this->turbulence().epsilon();
     const volVectorField gradk = fvc::grad(k);
 
     const scalar UrelMag = mag(U - Uc - UTurb);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
index fb03ca581c..0c1d8468d3 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
@@ -68,8 +68,8 @@ Foam::vector Foam::StochasticDispersionRAS<CloudType>::update
 {
     const scalar cps = 0.16432;
 
-    const volScalarField& k = this->turbulence().k();
-    const volScalarField& epsilon = this->turbulence().epsilon();
+    const volScalarField k = this->turbulence().k();
+    const volScalarField epsilon = this->turbulence().epsilon();
 
     const scalar UrelMag = mag(U - Uc - UTurb);
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
new file mode 100644
index 0000000000..b79a8a1af1
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
@@ -0,0 +1,206 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "PatchInjection.H"
+#include "DataEntry.H"
+#include "pdf.H"
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::label Foam::PatchInjection<CloudType>::parcelsToInject
+(
+    const scalar time0,
+    const scalar time1
+) const
+{
+    if ((time0 >= 0.0) && (time0 < duration_))
+    {
+        return round(fraction_*(time1 - time0)*parcelsPerSecond_);
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::PatchInjection<CloudType>::volumeToInject
+(
+    const scalar time0,
+    const scalar time1
+) const
+{
+    if ((time0 >= 0.0) && (time0 < duration_))
+    {
+        return fraction_*volumeFlowRate_().integrate(time0, time1);
+    }
+    else
+    {
+        return 0.0;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::PatchInjection<CloudType>::PatchInjection
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+:
+    InjectionModel<CloudType>(dict, owner, typeName),
+    patchName_(this->coeffDict().lookup("patchName")),
+    duration_(readScalar(this->coeffDict().lookup("duration"))),
+    parcelsPerSecond_
+    (
+        readScalar(this->coeffDict().lookup("parcelsPerSecond"))
+    ),
+    U0_(this->coeffDict().lookup("U0")),
+    volumeFlowRate_
+    (
+        DataEntry<scalar>::New
+        (
+            "volumeFlowRate",
+            this->coeffDict()
+        )
+    ),
+    parcelPDF_
+    (
+        pdf::New
+        (
+            this->coeffDict().subDict("parcelPDF"),
+            owner.rndGen()
+        )
+    ),
+    cellOwners_(),
+    fraction_(1.0)
+{
+    label patchId = owner.mesh().boundaryMesh().findPatchID(patchName_);
+
+    if (patchId < 0)
+    {
+        FatalErrorIn
+        (
+            "PatchInjection<CloudType>::PatchInjection"
+            "("
+                "const dictionary&, "
+                "CloudType&"
+            ")"
+        )   << "Requested patch " << patchName_ << " not found" << nl
+            << "Available patches are: " << owner.mesh().boundaryMesh().names()
+            << nl << exit(FatalError);
+    }
+
+    const polyPatch& patch = owner.mesh().boundaryMesh()[patchId];
+
+    cellOwners_ = patch.faceCells();
+
+    label patchSize = cellOwners_.size();
+    label totalPatchSize = patchSize;
+    reduce(totalPatchSize, sumOp<scalar>());
+    fraction_ = patchSize/totalPatchSize;
+
+    // Set total volume to inject
+    this->volumeTotal_ = fraction_*volumeFlowRate_().integrate(0.0, duration_);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::PatchInjection<CloudType>::~PatchInjection()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+bool Foam::PatchInjection<CloudType>::active() const
+{
+    return true;
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::PatchInjection<CloudType>::timeEnd() const
+{
+    return this->SOI_ + duration_;
+}
+
+
+template<class CloudType>
+void Foam::PatchInjection<CloudType>::setPositionAndCell
+(
+    const label,
+    const label,
+    const scalar,
+    vector& position,
+    label& cellOwner
+)
+{
+    label cellI = this->owner().rndGen().integer(0, cellOwners_.size() - 1);
+
+    cellOwner = cellOwners_[cellI];
+    position = this->owner().mesh().C()[cellOwner];
+}
+
+
+template<class CloudType>
+void Foam::PatchInjection<CloudType>::setProperties
+(
+    const label,
+    const label,
+    const scalar,
+    typename CloudType::parcelType& parcel
+)
+{
+    // set particle velocity
+    parcel.U() = U0_;
+
+    // set particle diameter
+    parcel.d() = parcelPDF_->sample();
+}
+
+
+template<class CloudType>
+bool Foam::PatchInjection<CloudType>::fullyDescribed() const
+{
+    return false;
+}
+
+
+template<class CloudType>
+bool Foam::PatchInjection<CloudType>::validInjection(const label)
+{
+    return true;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
new file mode 100644
index 0000000000..05117ce3be
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
@@ -0,0 +1,187 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::PatchInjection
+
+Description
+    Patch injection
+
+    - User specifies
+      - Total mass to inject
+      - Name of patch
+      - Injection duration
+      - Initial parcel velocity
+      - Injection volume flow rate
+    - Parcel diameters obtained by PDF model
+    - Parcels injected at cell centres adjacent to patch
+
+SourceFiles
+    PatchInjection.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef PatchInjection_H
+#define PatchInjection_H
+
+#include "InjectionModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+template<class Type>
+class DataEntry;
+
+class pdf;
+
+/*---------------------------------------------------------------------------*\
+                       Class PatchInjection Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class PatchInjection
+:
+    public InjectionModel<CloudType>
+{
+    // Private data
+
+        //- Name of patch
+        const word patchName_;
+
+        //- Injection duration [s]
+        const scalar duration_;
+
+        //- Number of parcels to introduce per second []
+        const label parcelsPerSecond_;
+
+        //- Initial parcel velocity [m/s]
+        const vector U0_;
+
+        //- Volume flow rate of parcels to introduce relative to SOI [m^3/s]
+        const autoPtr<DataEntry<scalar> > volumeFlowRate_;
+
+        //- Parcel size PDF model
+        const autoPtr<pdf> parcelPDF_;
+
+        //- Cell owners
+        labelList cellOwners_;
+
+        //- Fraction of injection controlled by this processor
+        scalar fraction_;
+
+
+protected:
+
+    // Protected member functions
+
+        //- Number of parcels to introduce over the time step relative to SOI
+        label parcelsToInject
+        (
+            const scalar time0,
+            const scalar time1
+        ) const;
+
+        //- Volume of parcels to introduce over the time step relative to SOI
+        scalar volumeToInject
+        (
+            const scalar time0,
+            const scalar time1
+        ) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("PatchInjection");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        PatchInjection
+        (
+            const dictionary& dict,
+            CloudType& owner
+        );
+
+
+    //- Destructor
+    virtual ~PatchInjection();
+
+
+    // Member Functions
+
+        //- Flag to indicate whether model activates injection model
+        bool active() const;
+
+        //- Return the end-of-injection time
+        scalar timeEnd() const;
+
+
+        // Injection geometry
+
+            //- Set the injection position and owner cell
+            virtual void setPositionAndCell
+            (
+                const label parcelI,
+                const label nParcels,
+                const scalar time,
+                vector& position,
+                label& cellOwner
+            );
+
+            virtual void setProperties
+            (
+                const label parcelI,
+                const label nParcels,
+                const scalar time,
+                typename CloudType::parcelType& parcel
+            );
+
+            //- Flag to identify whether model fully describes the parcel
+            virtual bool fullyDescribed() const;
+
+            //- Return flag to identify whether or not injection of parcelI is
+            //  permitted
+            virtual bool validInjection(const label parcelI);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "PatchInjection.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 2eba6f7aace5ef17a9b50a3670e96ed0f0292db5 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Thu, 2 Jul 2009 18:30:15 +0100
Subject: [PATCH 05/84] cleaning

---
 .../Kinematic/InjectionModel/ManualInjection/ManualInjection.C  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
index 3177b78c31..dab3cf6f13 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
@@ -138,7 +138,7 @@ void Foam::ManualInjection<CloudType>::setPositionAndCell
 (
     const label parcelI,
     const label,
-    const scalar time,
+    const scalar,
     vector& position,
     label& cellOwner
 )

From aca0e25983c85608a851b29bd2c792940d239bc8 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Thu, 2 Jul 2009 18:46:48 +0100
Subject: [PATCH 06/84] avoid name conflict for registered objects

---
 .../GradientDispersionRAS/GradientDispersionRAS.C          | 7 +++++--
 .../StochasticDispersionRAS/StochasticDispersionRAS.C      | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
index 876a6dc021..8a0fdd898e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
@@ -68,8 +68,11 @@ Foam::vector Foam::GradientDispersionRAS<CloudType>::update
 {
     const scalar cps = 0.16432;
 
-    const volScalarField k = this->turbulence().k();
-    const volScalarField epsilon = this->turbulence().epsilon();
+    const tmp<volScalarField> tk = this->turbulence().k();
+    const volScalarField& k = tk();
+    const tmp<volScalarField> tepsilon = this->turbulence().epsilon();
+    const volScalarField& epsilon = tepsilon();
+
     const volVectorField gradk = fvc::grad(k);
 
     const scalar UrelMag = mag(U - Uc - UTurb);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
index 0c1d8468d3..d1999cba4d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
@@ -68,8 +68,10 @@ Foam::vector Foam::StochasticDispersionRAS<CloudType>::update
 {
     const scalar cps = 0.16432;
 
-    const volScalarField k = this->turbulence().k();
-    const volScalarField epsilon = this->turbulence().epsilon();
+    const tmp<volScalarField> tk = this->turbulence().k();
+    const volScalarField& k = tk();
+    const tmp<volScalarField> tepsilon = this->turbulence().epsilon();
+    const volScalarField& epsilon = tepsilon();
 
     const scalar UrelMag = mag(U - Uc - UTurb);
 

From 218b2baec4dc69cd1298c199eacbc43e9e7d41f1 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Fri, 3 Jul 2009 11:46:45 +0100
Subject: [PATCH 07/84] Changed SP and DP to WM_SP and WM_DP.

---
 .../PV3FoamReader/PV3FoamReader/CMakeLists.txt  |  2 +-
 .../PVFoamReader/PVFoamReader/CMakeLists.txt    |  2 +-
 src/OSspecific/POSIX/signals/sigFpe.C           |  2 +-
 src/OpenFOAM/primitives/Scalar/scalar/scalar.H  |  6 +++---
 src/Pstream/mpi/Pstream.C                       |  4 ++--
 .../MGridGenGamgAgglomeration/Make/options      |  2 +-
 tutorials/combustion/XiFoam/les/Allrun          | 17 -----------------
 wmake/rules/General/general                     |  6 +++---
 8 files changed, 12 insertions(+), 29 deletions(-)
 delete mode 100755 tutorials/combustion/XiFoam/les/Allrun

diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/CMakeLists.txt
index 17be614da4..670b78c33d 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/CMakeLists.txt
@@ -23,7 +23,7 @@ INCLUDE_DIRECTORIES(
 )
 
 ADD_DEFINITIONS(
-    -D$ENV{WM_PRECISION_OPTION}
+    -DWM_$ENV{WM_PRECISION_OPTION}
 )
 
 # Set output library destination to plugin folder
diff --git a/applications/utilities/postProcessing/graphics/PVFoamReader/PVFoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PVFoamReader/PVFoamReader/CMakeLists.txt
index acbe2254eb..1c88efbbff 100644
--- a/applications/utilities/postProcessing/graphics/PVFoamReader/PVFoamReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PVFoamReader/PVFoamReader/CMakeLists.txt
@@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES(
     $ENV{ParaView_INST_DIR}/include
     ../vtkFoam/lnInclude
 )
-ADD_DEFINITIONS(-D$ENV{WM_PRECISION_OPTION})
+ADD_DEFINITIONS(-DWM_$ENV{WM_PRECISION_OPTION})
 
 #-----------------------------------------------------------------------------
 # Most users should not need to change anything below this line.
diff --git a/src/OSspecific/POSIX/signals/sigFpe.C b/src/OSspecific/POSIX/signals/sigFpe.C
index bdcc1d08bd..6aeaac2d19 100644
--- a/src/OSspecific/POSIX/signals/sigFpe.C
+++ b/src/OSspecific/POSIX/signals/sigFpe.C
@@ -68,7 +68,7 @@ void* Foam::sigFpe::my_malloc_hook(size_t size, const void *caller)
     result = malloc (size);
 
     // initialize to signalling nan
-#   ifdef SP
+#   ifdef WM_SP
 
     const uint32_t sNAN = 0x7ff7fffflu;
 
diff --git a/src/OpenFOAM/primitives/Scalar/scalar/scalar.H b/src/OpenFOAM/primitives/Scalar/scalar/scalar.H
index 0dd919d90d..f27612e9f0 100644
--- a/src/OpenFOAM/primitives/Scalar/scalar/scalar.H
+++ b/src/OpenFOAM/primitives/Scalar/scalar/scalar.H
@@ -27,7 +27,7 @@ Typedef
 
 Description
     Single floating point number identical to float or double depending on
-    whether SP or DP is defined.
+    whether WM_SP or WM_DP is defined.
 
 SourceFiles
     scalar.C
@@ -42,7 +42,7 @@ SourceFiles
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#if defined(SP)
+#if defined(WM_SP)
 
 // Define scalar as a float
 
@@ -60,7 +60,7 @@ namespace Foam
     scalar readScalar(Istream& is);
 }
 
-#elif defined(DP)
+#elif defined(WM_DP)
 
 // Define scalar as a double
 
diff --git a/src/Pstream/mpi/Pstream.C b/src/Pstream/mpi/Pstream.C
index 8011fb3b42..ba4629d754 100644
--- a/src/Pstream/mpi/Pstream.C
+++ b/src/Pstream/mpi/Pstream.C
@@ -34,9 +34,9 @@ License
 #include <cstdlib>
 #include <csignal>
 
-#if defined(SP)
+#if defined(WM_SP)
 #   define MPI_SCALAR MPI_FLOAT
-#elif defined(DP)
+#elif defined(WM_DP)
 #   define MPI_SCALAR MPI_DOUBLE
 #endif
 
diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options
index bc278a29cb..26c2b8abfb 100644
--- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options
+++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options
@@ -1,7 +1,7 @@
 ParMGridGen = $(WM_THIRD_PARTY_DIR)/ParMGridGen-1.0
 
 TYPE_REAL=
-#if defined(SP)
+#if defined(WM_SP)
 TYPE_REAL=-DTYPE_REAL
 #endif
 
diff --git a/tutorials/combustion/XiFoam/les/Allrun b/tutorials/combustion/XiFoam/les/Allrun
deleted file mode 100755
index e43b54e4e3..0000000000
--- a/tutorials/combustion/XiFoam/les/Allrun
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# Get application name from directory
-application="XiFoam"
-
-cases=" \
-pitzDaily \
-pitzDaily3D
-"
-
-for i in $cases; do
-    blockMesh -case $i
-    $application -case $i
-done
-
diff --git a/wmake/rules/General/general b/wmake/rules/General/general
index 2f2a67cb56..419d9b1d38 100644
--- a/wmake/rules/General/general
+++ b/wmake/rules/General/general
@@ -3,7 +3,7 @@ ARFLAGS    = cr
 RANLIB     = ranlib
 LD         = ld
 
-GFLAGS     = -D$(WM_ARCH) -D$(WM_PRECISION_OPTION)
-GINC       = 
+GFLAGS     = -D$(WM_ARCH) -DWM_$(WM_PRECISION_OPTION)
+GINC       =
 GLIBS      = -lm
-GLIB_LIBS  = 
+GLIB_LIBS  =

From d83044173599a00f131850d5f5097410ffb1bd31 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Fri, 3 Jul 2009 11:46:56 +0100
Subject: [PATCH 08/84] New boundary files

---
 .../flange/constant/polyMesh/boundary         |  5 +-
 .../cylinder/constant/polyMesh/boundary       |  5 +-
 .../pitzDaily/constant/polyMesh/boundary      | 69 +++++++++----------
 .../pitzDaily/constant/polyMesh/boundary      | 69 +++++++++----------
 .../les/pitzDaily/constant/polyMesh/boundary  | 69 +++++++++----------
 .../aachenBomb/constant/polyMesh/boundary     |  2 +-
 .../kivaTest/constant/polyMesh/boundary       | 43 ++++++------
 7 files changed, 127 insertions(+), 135 deletions(-)

diff --git a/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary b/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary
index c2b732e0e5..c97383b613 100644
--- a/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary
+++ b/tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       polyBoundaryMesh;
+    location    "constant/polyMesh";
     object      boundary;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/basic/potentialFoam/cylinder/constant/polyMesh/boundary b/tutorials/basic/potentialFoam/cylinder/constant/polyMesh/boundary
index b336b81ded..057865c7ff 100644
--- a/tutorials/basic/potentialFoam/cylinder/constant/polyMesh/boundary
+++ b/tutorials/basic/potentialFoam/cylinder/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       polyBoundaryMesh;
+    location    "constant/polyMesh";
     object      boundary;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/boundary b/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/boundary
index 8eb7d98937..313dcceba1 100644
--- a/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/boundary
+++ b/tutorials/basic/potentialFoam/pitzDaily/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,46 +10,43 @@ FoamFile
     version     2.0;
     format      ascii;
     class       polyBoundaryMesh;
+    location    "constant/polyMesh";
     object      boundary;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 5
 (
-inlet
-{
-    type patch;
-    nFaces 30;
-    startFace 24170;
-}
-
-outlet
-{
-    type patch;
-    nFaces 57;
-    startFace 24200;
-}
-
-upperWall
-{
-    type wall;
-    nFaces 223;
-    startFace 24257;
-}
-
-lowerWall
-{
-    type wall;
-    nFaces 250;
-    startFace 24480;
-}
-
-frontAndBack
-{
-    type empty;
-    nFaces 24450;
-    startFace 24730;
-}
+    inlet
+    {
+        type            patch;
+        nFaces          30;
+        startFace       24170;
+    }
+    outlet
+    {
+        type            patch;
+        nFaces          57;
+        startFace       24200;
+    }
+    upperWall
+    {
+        type            wall;
+        nFaces          223;
+        startFace       24257;
+    }
+    lowerWall
+    {
+        type            wall;
+        nFaces          250;
+        startFace       24480;
+    }
+    frontAndBack
+    {
+        type            empty;
+        nFaces          24450;
+        startFace       24730;
+    }
 )
 
 // ************************************************************************* //
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/boundary b/tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/boundary
index 8eb7d98937..313dcceba1 100644
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/boundary
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,46 +10,43 @@ FoamFile
     version     2.0;
     format      ascii;
     class       polyBoundaryMesh;
+    location    "constant/polyMesh";
     object      boundary;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 5
 (
-inlet
-{
-    type patch;
-    nFaces 30;
-    startFace 24170;
-}
-
-outlet
-{
-    type patch;
-    nFaces 57;
-    startFace 24200;
-}
-
-upperWall
-{
-    type wall;
-    nFaces 223;
-    startFace 24257;
-}
-
-lowerWall
-{
-    type wall;
-    nFaces 250;
-    startFace 24480;
-}
-
-frontAndBack
-{
-    type empty;
-    nFaces 24450;
-    startFace 24730;
-}
+    inlet
+    {
+        type            patch;
+        nFaces          30;
+        startFace       24170;
+    }
+    outlet
+    {
+        type            patch;
+        nFaces          57;
+        startFace       24200;
+    }
+    upperWall
+    {
+        type            wall;
+        nFaces          223;
+        startFace       24257;
+    }
+    lowerWall
+    {
+        type            wall;
+        nFaces          250;
+        startFace       24480;
+    }
+    frontAndBack
+    {
+        type            empty;
+        nFaces          24450;
+        startFace       24730;
+    }
 )
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary b/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary
index 8eb7d98937..313dcceba1 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,46 +10,43 @@ FoamFile
     version     2.0;
     format      ascii;
     class       polyBoundaryMesh;
+    location    "constant/polyMesh";
     object      boundary;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 5
 (
-inlet
-{
-    type patch;
-    nFaces 30;
-    startFace 24170;
-}
-
-outlet
-{
-    type patch;
-    nFaces 57;
-    startFace 24200;
-}
-
-upperWall
-{
-    type wall;
-    nFaces 223;
-    startFace 24257;
-}
-
-lowerWall
-{
-    type wall;
-    nFaces 250;
-    startFace 24480;
-}
-
-frontAndBack
-{
-    type empty;
-    nFaces 24450;
-    startFace 24730;
-}
+    inlet
+    {
+        type            patch;
+        nFaces          30;
+        startFace       24170;
+    }
+    outlet
+    {
+        type            patch;
+        nFaces          57;
+        startFace       24200;
+    }
+    upperWall
+    {
+        type            wall;
+        nFaces          223;
+        startFace       24257;
+    }
+    lowerWall
+    {
+        type            wall;
+        nFaces          250;
+        startFace       24480;
+    }
+    frontAndBack
+    {
+        type            empty;
+        nFaces          24450;
+        startFace       24730;
+    }
 )
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary b/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary
index 2e94e303b7..5e28555623 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary
+++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary b/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary
index 7a3a7294ec..24684a3ecf 100644
--- a/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,32 +10,31 @@ FoamFile
     version     2.0;
     format      ascii;
     class       polyBoundaryMesh;
+    location    "constant/polyMesh";
     object      boundary;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 3
 (
-piston
-{
-    type wall;
-    nFaces 1326;
-    startFace 79522;
-}
-
-liner
-{
-    type wall;
-    nFaces 2710;
-    startFace 80848;
-}
-
-cylinderHead
-{
-    type wall;
-    nFaces 2184;
-    startFace 83558;
-}
+    piston
+    {
+        type            wall;
+        nFaces          1326;
+        startFace       79522;
+    }
+    liner
+    {
+        type            wall;
+        nFaces          2710;
+        startFace       80848;
+    }
+    cylinderHead
+    {
+        type            wall;
+        nFaces          2184;
+        startFace       83558;
+    }
 )
 
 // ************************************************************************* //

From ac79a282c132cbf0b9bfa42d4876c713174cb66f Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 3 Jul 2009 17:21:25 +0100
Subject: [PATCH 09/84] updated soldFuelComponents->solidComponents

---
 .../simplifiedSiwek/constant/thermophysicalProperties     | 2 +-
 .../filter/constant/thermophysicalProperties              | 2 +-
 .../evaporationTest/constant/thermophysicalProperties     | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
index e5c06a7e04..9a18bc51f1 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
@@ -32,7 +32,7 @@ liquidComponents
 
 H2O             H2O defaultCoeffs;
 
-solidFuelComponents
+solidComponents
 (
     C
     ash
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermophysicalProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermophysicalProperties
index 5d9a097035..5946130cbb 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/thermophysicalProperties
@@ -29,7 +29,7 @@ liquidComponents
 );
 H2O             H2O defaultCoeffs;
 
-solidFuelComponents
+solidComponents
 (
 );
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties
index 8b80f059a3..6e80104f13 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties
@@ -23,9 +23,13 @@ foamChemistryFile "$FOAM_CASE/chemkin/foam.inp";
 
 foamChemistryThermoFile "$FOAM_CASE/chemkin/foam.dat";
 
-liquidComponents ( H2O );
+liquidComponents
+(
+    H2O
+);
 
-solidFuelComponents ( );
+solidComponents
+();
 
 inertSpecie     N2;
 

From a01012141d9e68ab3762374ab6ebce98ab4ebfa6 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 3 Jul 2009 17:21:52 +0100
Subject: [PATCH 10/84] updated dispersion models - carrier fields now cached

---
 .../Templates/KinematicCloud/KinematicCloud.C | 30 ++++++++--
 .../Templates/KinematicCloud/KinematicCloud.H |  9 +++
 .../Templates/ReactingCloud/ReactingCloud.C   | 23 ++++++--
 .../Templates/ReactingCloud/ReactingCloud.H   |  9 +++
 .../ReactingMultiphaseCloud.C                 | 23 ++++++--
 .../ReactingMultiphaseCloud.H                 | 13 ++++-
 .../Templates/ThermoCloud/ThermoCloud.C       | 23 ++++++--
 .../Templates/ThermoCloud/ThermoCloud.H       | 11 ++++
 .../DispersionModel/DispersionModel.H         |  3 +
 .../DispersionRASModel/DispersionRASModel.C   | 57 ++++++++++++++++++-
 .../DispersionRASModel/DispersionRASModel.H   | 21 ++++++-
 .../GradientDispersionRAS.C                   | 35 +++++++++---
 .../GradientDispersionRAS.H                   | 13 ++++-
 .../NoDispersion/NoDispersion.C               |  7 +++
 .../NoDispersion/NoDispersion.H               |  7 ++-
 .../StochasticDispersionRAS.C                 |  6 +-
 .../StochasticDispersionRAS.H                 |  4 +-
 17 files changed, 249 insertions(+), 45 deletions(-)

diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index 1a7ba97084..e2dd07acf1 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -173,9 +173,32 @@ void Foam::KinematicCloud<ParcelType>::resetSourceTerms()
 }
 
 
+template<class ParcelType>
+void Foam::KinematicCloud<ParcelType>::preEvolve()
+{
+    this->dispersion().cacheFields(true);
+}
+
+
+template<class ParcelType>
+void Foam::KinematicCloud<ParcelType>::postEvolve()
+{
+    if (debug)
+    {
+        this->writePositions();
+    }
+
+    this->dispersion().cacheFields(false);
+
+    this->postProcessing().post();
+}
+
+
 template<class ParcelType>
 void Foam::KinematicCloud<ParcelType>::evolve()
 {
+    preEvolve();
+
     autoPtr<interpolation<scalar> > rhoInterpolator =
         interpolation<scalar>::New
         (
@@ -209,11 +232,6 @@ void Foam::KinematicCloud<ParcelType>::evolve()
 
     this->injection().inject(td);
 
-    if (debug)
-    {
-        this->writePositions();
-    }
-
     if (coupled_)
     {
         resetSourceTerms();
@@ -221,7 +239,7 @@ void Foam::KinematicCloud<ParcelType>::evolve()
 
     Cloud<ParcelType>::move(td);
 
-    this->postProcessing().post();
+    postEvolve();
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index 538975a912..077067a972 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -184,6 +184,15 @@ protected:
             DimensionedField<vector, volMesh> UTrans_;
 
 
+        // Cloud evolution functions
+
+            //- Pre-evolve
+            void preEvolve();
+
+            //- Post-evolve
+            void postEvolve();
+
+
 public:
 
     // Constructors
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
index d4f4f10c9a..1e58d2876c 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -175,9 +175,25 @@ void Foam::ReactingCloud<ParcelType>::resetSourceTerms()
 }
 
 
+template<class ParcelType>
+void Foam::ReactingCloud<ParcelType>::preEvolve()
+{
+    ThermoCloud<ParcelType>::preEvolve();
+}
+
+
+template<class ParcelType>
+void Foam::ReactingCloud<ParcelType>::postEvolve()
+{
+    ThermoCloud<ParcelType>::postEvolve();
+}
+
+
 template<class ParcelType>
 void Foam::ReactingCloud<ParcelType>::evolve()
 {
+    preEvolve();
+
     const volScalarField& T = this->carrierThermo().T();
     const volScalarField cp = this->carrierThermo().Cp();
     const volScalarField& p = this->carrierThermo().p();
@@ -233,11 +249,6 @@ void Foam::ReactingCloud<ParcelType>::evolve()
 
     this->injection().inject(td);
 
-    if (debug)
-    {
-        this->writePositions();
-    }
-
     if (this->coupled())
     {
         resetSourceTerms();
@@ -245,7 +256,7 @@ void Foam::ReactingCloud<ParcelType>::evolve()
 
     Cloud<ParcelType>::move(td);
 
-    this->postProcessing().post();
+    postEvolve();
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
index 4a79c03b6f..74b75ea416 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
@@ -132,6 +132,15 @@ protected:
             );
 
 
+        // Cloud evolution functions
+
+            //- Pre-evolve
+            void preEvolve();
+
+            //- Post-evolve
+            void postEvolve();
+
+
 public:
 
     // Constructors
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
index d07db7ed62..5e7dee64bc 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
@@ -129,9 +129,25 @@ void Foam::ReactingMultiphaseCloud<ParcelType>::resetSourceTerms()
 }
 
 
+template<class ParcelType>
+void Foam::ReactingMultiphaseCloud<ParcelType>::preEvolve()
+{
+    ReactingCloud<ParcelType>::preEvolve();
+}
+
+
+template<class ParcelType>
+void Foam::ReactingMultiphaseCloud<ParcelType>::postEvolve()
+{
+    ReactingCloud<ParcelType>::postEvolve();
+}
+
+
 template<class ParcelType>
 void Foam::ReactingMultiphaseCloud<ParcelType>::evolve()
 {
+    preEvolve();
+
     const volScalarField& T = this->carrierThermo().T();
     const volScalarField cp = this->carrierThermo().Cp();
     const volScalarField& p = this->carrierThermo().p();
@@ -187,11 +203,6 @@ void Foam::ReactingMultiphaseCloud<ParcelType>::evolve()
 
     this->injection().inject(td);
 
-    if (debug)
-    {
-        this->writePositions();
-    }
-
     if (this->coupled())
     {
         resetSourceTerms();
@@ -199,7 +210,7 @@ void Foam::ReactingMultiphaseCloud<ParcelType>::evolve()
 
     Cloud<ParcelType>::move(td);
 
-    this->postProcessing().post();
+    postEvolve();
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
index 525b03983c..b073308407 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
@@ -68,7 +68,7 @@ class ReactingMultiphaseCloud
     public ReactingCloud<ParcelType>,
     public reactingMultiphaseCloud
 {
-    // Private Member Functions
+    // Private member functions
 
         //- Disallow default bitwise copy construct
         ReactingMultiphaseCloud(const ReactingMultiphaseCloud&);
@@ -112,6 +112,17 @@ protected:
             scalar dMassSurfaceReaction_;
 
 
+    // Protected member functions
+
+        // Cloud evolution functions
+
+            //- Pre-evolve
+            void preEvolve();
+
+            //- Post-evolve
+            void postEvolve();
+
+
 public:
 
     // Constructors
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
index 19428d38a1..0585629246 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
@@ -142,9 +142,25 @@ void Foam::ThermoCloud<ParcelType>::resetSourceTerms()
 }
 
 
+template<class ParcelType>
+void Foam::ThermoCloud<ParcelType>::preEvolve()
+{
+    KinematicCloud<ParcelType>::preEvolve();
+}
+
+
+template<class ParcelType>
+void Foam::ThermoCloud<ParcelType>::postEvolve()
+{
+    KinematicCloud<ParcelType>::postEvolve();
+}
+
+
 template<class ParcelType>
 void Foam::ThermoCloud<ParcelType>::evolve()
 {
+    preEvolve();
+
     const volScalarField& T = carrierThermo_.T();
     const volScalarField cp = carrierThermo_.Cp();
 
@@ -192,11 +208,6 @@ void Foam::ThermoCloud<ParcelType>::evolve()
 
     this->injection().inject(td);
 
-    if (debug)
-    {
-        this->writePositions();
-    }
-
     if (this->coupled())
     {
         resetSourceTerms();
@@ -204,7 +215,7 @@ void Foam::ThermoCloud<ParcelType>::evolve()
 
     Cloud<ParcelType>::move(td);
 
-    this->postProcessing().post();
+    postEvolve();
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
index cc8f0fadc8..151b076411 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
@@ -118,6 +118,17 @@ protected:
             DimensionedField<scalar, volMesh> hcTrans_;
 
 
+    // Protected member functions
+
+        // Cloud evolution functions
+
+            //- Pre-evolve
+            void preEvolve();
+
+            //- Post-evolve
+            void postEvolve();
+
+
 public:
 
     // Constructors
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
index 74131b6fff..8587eaccca 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
@@ -121,6 +121,9 @@ public:
         //- Flag to indicate whether model activates injection model
         virtual bool active() const = 0;
 
+        //- Cache carrier fields
+        virtual void cacheFields(const bool store) = 0;
+
         //- Update (disperse particles)
         virtual vector update
         (
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
index 6c028d0205..3689acf8f4 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
@@ -42,7 +42,11 @@ Foam::DispersionRASModel<CloudType>::DispersionRASModel
         (
             "RASProperties"
         )
-    )
+    ),
+    kPtr_(NULL),
+    ownK_(false),
+    epsilonPtr_(NULL),
+    ownEpsilon_(false)
 {}
 
 
@@ -50,7 +54,56 @@ Foam::DispersionRASModel<CloudType>::DispersionRASModel
 
 template<class CloudType>
 Foam::DispersionRASModel<CloudType>::~DispersionRASModel()
-{}
+{
+    cacheFields(false);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+void Foam::DispersionRASModel<CloudType>::cacheFields(const bool store)
+{
+    if (store)
+    {
+        tmp<volScalarField> tk = this->turbulence().k();
+        if (tk.isTmp())
+        {
+            kPtr_ = tk.ptr();
+            ownK_ = true;
+        }
+        else
+        {
+            kPtr_ = tk.operator->();
+            ownK_ = false;
+        }
+
+        tmp<volScalarField> tepsilon = this->turbulence().epsilon();
+        if (tepsilon.isTmp())
+        {
+            epsilonPtr_ = tepsilon.ptr();
+            ownEpsilon_ = true;
+        }
+        else
+        {
+            epsilonPtr_ = tepsilon.operator->();
+            ownEpsilon_ = false;
+        }
+    }
+    else
+    {
+        if (ownK_ && kPtr_)
+        {
+            delete kPtr_;
+            ownK_ = false;
+        }
+        if (ownEpsilon_ && epsilonPtr_)
+        {
+            delete epsilonPtr_;
+            ownEpsilon_ = false;
+        }
+    }
+}
 
 
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
index ecda55be49..f95ab36885 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
@@ -50,11 +50,27 @@ class DispersionRASModel
 :
     public DispersionModel<CloudType>
 {
-    // Private data
+protected:
+
+    // Protected data
 
         //- Reference to the compressible turbulence model
         const compressible::RASModel& turbulence_;
 
+        // Locally cached turbulence fields
+
+            //- Turbulence k
+            const volScalarField* kPtr_;
+
+            //- Take ownership of the k field
+            bool ownK_;
+
+            //- Turbulence epsilon
+            const volScalarField* epsilonPtr_;
+
+            //- Take ownership of the epsilon field
+            bool ownEpsilon_;
+
 
 public:
 
@@ -78,6 +94,9 @@ public:
 
     // Member Functions
 
+        //- Cache carrier fields
+        virtual void cacheFields(const bool store);
+
         //- Return const access to the turbulence model
         const compressible::RASModel& turbulence() const
         {
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
index 8a0fdd898e..7877af745e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
@@ -35,7 +35,8 @@ Foam::GradientDispersionRAS<CloudType>::GradientDispersionRAS
     CloudType& owner
 )
 :
-    DispersionRASModel<CloudType>(dict, owner)
+    DispersionRASModel<CloudType>(dict, owner),
+    gradkPtr_(NULL)
 {}
 
 
@@ -43,7 +44,9 @@ Foam::GradientDispersionRAS<CloudType>::GradientDispersionRAS
 
 template<class CloudType>
 Foam::GradientDispersionRAS<CloudType>::~GradientDispersionRAS()
-{}
+{
+    cacheFields(false);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -55,6 +58,25 @@ bool Foam::GradientDispersionRAS<CloudType>::active() const
 }
 
 
+template<class CloudType>
+void Foam::GradientDispersionRAS<CloudType>::cacheFields(const bool store)
+{
+    DispersionRASModel<CloudType>::cacheFields(store);
+
+    if (store)
+    {
+        gradkPtr_ = fvc::grad(*this->kPtr_).ptr();
+    }
+    else
+    {
+        if (gradkPtr_)
+        {
+            delete gradkPtr_;
+        }
+    }
+}
+
+
 template<class CloudType>
 Foam::vector Foam::GradientDispersionRAS<CloudType>::update
 (
@@ -68,12 +90,9 @@ Foam::vector Foam::GradientDispersionRAS<CloudType>::update
 {
     const scalar cps = 0.16432;
 
-    const tmp<volScalarField> tk = this->turbulence().k();
-    const volScalarField& k = tk();
-    const tmp<volScalarField> tepsilon = this->turbulence().epsilon();
-    const volScalarField& epsilon = tepsilon();
-
-    const volVectorField gradk = fvc::grad(k);
+    const volScalarField& k = *this->kPtr_;
+    const volScalarField& epsilon = *this->epsilonPtr_;
+    const volVectorField& gradk = *this->gradkPtr_;
 
     const scalar UrelMag = mag(U - Uc - UTurb);
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H
index 9cf99ecc20..18391f4eea 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H
@@ -51,6 +51,14 @@ class GradientDispersionRAS
 :
     public DispersionRASModel<CloudType>
 {
+protected:
+
+    // Locally cached turbulence fields
+
+        //- Gradient of k
+        const volVectorField* gradkPtr_;
+
+
 public:
 
     //- Runtime type information
@@ -76,8 +84,11 @@ public:
         //- Flag to indicate whether model activates injection model
         bool active() const;
 
+        //- Cache carrier fields
+        virtual void cacheFields(const bool store);
+
         //- Update (disperse particles)
-        vector update
+        virtual vector update
         (
             const scalar dt,
             const label celli,
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C
index 56745ef686..a1927dfcd4 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C
@@ -55,6 +55,13 @@ bool Foam::NoDispersion<CloudType>::active() const
 }
 
 
+template<class CloudType>
+void Foam::NoDispersion<CloudType>::cacheFields(const bool)
+{
+// do nothing
+}
+
+
 template<class CloudType>
 Foam::vector Foam::NoDispersion<CloudType>::update
 (
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H
index 48e938cc03..93482c49ae 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H
@@ -72,10 +72,13 @@ public:
     // Member Functions
 
         //- Flag to indicate whether model activates injection model
-        bool active() const;
+        virtual bool active() const;
+
+        //- Cache carrier fields
+        virtual void cacheFields(const bool store);
 
         //- Update (disperse particles)
-        vector update
+        virtual vector update
         (
             const scalar dt,
             const label celli,
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
index d1999cba4d..ffd3fd974a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
@@ -68,10 +68,8 @@ Foam::vector Foam::StochasticDispersionRAS<CloudType>::update
 {
     const scalar cps = 0.16432;
 
-    const tmp<volScalarField> tk = this->turbulence().k();
-    const volScalarField& k = tk();
-    const tmp<volScalarField> tepsilon = this->turbulence().epsilon();
-    const volScalarField& epsilon = tepsilon();
+    const volScalarField& k = *this->kPtr_;
+    const volScalarField& epsilon = *this->epsilonPtr_;
 
     const scalar UrelMag = mag(U - Uc - UTurb);
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H
index 46059d4e83..17c70b7814 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H
@@ -74,10 +74,10 @@ public:
     // Member Functions
 
         //- Flag to indicate whether model activates injection model
-        bool active() const;
+        virtual bool active() const;
 
         //- Update (disperse particles)
-        vector update
+        virtual vector update
         (
             const scalar dt,
             const label celli,

From 383823e69d76f3357c48f378bd633586e20ce7fd Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 6 Jul 2009 10:50:47 +0100
Subject: [PATCH 11/84] updated particle forces

---
 .../Templates/KinematicCloud/KinematicCloud.C |  2 +
 .../Templates/KinematicCloud/KinematicCloud.H | 12 -----
 .../particleForces/particleForces.C           | 47 +++++++++++++------
 .../particleForces/particleForces.H           | 18 +++++--
 .../constant/coalCloud1Properties             |  2 -
 .../constant/limestoneCloud1Properties        |  2 -
 .../filter/constant/reactingCloud1Properties  |  2 -
 .../constant/reactingCloud1Properties         |  2 -
 .../constant/kinematicCloud1Properties        |  2 -
 .../constant/thermoCloud1Properties           |  2 -
 10 files changed, 49 insertions(+), 42 deletions(-)

diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index e2dd07acf1..e473102c1a 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -177,6 +177,7 @@ template<class ParcelType>
 void Foam::KinematicCloud<ParcelType>::preEvolve()
 {
     this->dispersion().cacheFields(true);
+    forces_.cacheFields(true);
 }
 
 
@@ -189,6 +190,7 @@ void Foam::KinematicCloud<ParcelType>::postEvolve()
     }
 
     this->dispersion().cacheFields(false);
+    forces_.cacheFields(false);
 
     this->postProcessing().post();
 }
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index 077067a972..ee2b3bafe2 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -274,18 +274,6 @@ public:
                 inline const dictionary& interpolationSchemes() const;
 
 
-            // Forces to include in particle motion evaluation
-
-                //- Return reference to the gravity force flag
-                inline Switch forceGravity() const;
-
-                //- Return reference to the virtual mass force flag
-                inline Switch forceVirtualMass() const;
-
-                //- Return reference to the pressure gradient force flag
-                inline Switch forcePressureGradient() const;
-
-
             // Sub-models
 
                 //- Return const-access to the dispersion model
diff --git a/src/lagrangian/intermediate/particleForces/particleForces.C b/src/lagrangian/intermediate/particleForces/particleForces.C
index d81ebadefc..5320566c84 100644
--- a/src/lagrangian/intermediate/particleForces/particleForces.C
+++ b/src/lagrangian/intermediate/particleForces/particleForces.C
@@ -27,6 +27,7 @@ License
 #include "particleForces.H"
 #include "fvMesh.H"
 #include "volFields.H"
+#include "fvcGrad.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -40,21 +41,17 @@ Foam::particleForces::particleForces
     mesh_(mesh),
     dict_(dict.subDict("particleForces")),
     g_(g),
+    gradUPtr_(NULL),
     gravity_(dict_.lookup("gravity")),
     virtualMass_(dict_.lookup("virtualMass")),
     Cvm_(0.0),
     pressureGradient_(dict_.lookup("pressureGradient")),
-    gradUName_("unknown_gradUName")
+    UName_(dict_.lookupOrDefault<word>("U", "U"))
 {
-    if (gravity_)
+    if (virtualMass_)
     {
         dict_.lookup("Cvm") >> Cvm_;
     }
-
-    if (pressureGradient_)
-    {
-        dict_.lookup("gradU") >> gradUName_;
-    }
 }
 
 
@@ -63,18 +60,21 @@ Foam::particleForces::particleForces(const particleForces& f)
     mesh_(f.mesh_),
     dict_(f.dict_),
     g_(f.g_),
+    gradUPtr_(f.gradUPtr_),
     gravity_(f.gravity_),
     virtualMass_(f.virtualMass_),
     Cvm_(f.Cvm_),
     pressureGradient_(f.pressureGradient_),
-    gradUName_(f.gradUName_)
+    UName_(f.UName_)
 {}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::particleForces::~particleForces()
-{}
+{
+    cacheFields(false);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -109,9 +109,26 @@ Foam::Switch Foam::particleForces::pressureGradient() const
 }
 
 
-const Foam::word& Foam::particleForces::gradUName() const
+const Foam::word& Foam::particleForces::UName() const
 {
-    return gradUName_;
+    return UName_;
+}
+
+
+void Foam::particleForces::cacheFields(const bool store)
+{
+    if (store && pressureGradient_)
+    {
+        const volVectorField U = mesh_.lookupObject<volVectorField>(UName_);
+        gradUPtr_ = fvc::grad(U).ptr();
+    }
+    else
+    {
+        if (gradUPtr_)
+        {
+            delete gradUPtr_;
+        }
+    }
 }
 
 
@@ -130,15 +147,17 @@ Foam::vector Foam::particleForces::calcCoupled
     // Virtual mass force
     if (virtualMass_)
     {
-        notImplemented("Foam::particleForces::calc(...) - virtualMass force");
+        notImplemented
+        (
+            "Foam::particleForces::calcCoupled(...) - virtual mass force"
+        );
 //        Ftot += Cvm_*rhoc/rho*d(Uc - U)/dt;
     }
 
     // Pressure gradient force
     if (pressureGradient_)
     {
-        const volSymmTensorField& gradU =
-            mesh_.lookupObject<volSymmTensorField>(gradUName_);
+        const volTensorField& gradU = *gradUPtr_;
         Ftot += rhoc/rho*(U & gradU[cellI]);
     }
 
diff --git a/src/lagrangian/intermediate/particleForces/particleForces.H b/src/lagrangian/intermediate/particleForces/particleForces.H
index aab27da465..fbe88a6dc8 100644
--- a/src/lagrangian/intermediate/particleForces/particleForces.H
+++ b/src/lagrangian/intermediate/particleForces/particleForces.H
@@ -39,6 +39,7 @@ SourceFiles
 #include "dictionary.H"
 #include "Switch.H"
 #include "vector.H"
+#include "volFieldsFwd.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -65,6 +66,9 @@ class particleForces
         //- Gravity
         const vector g_;
 
+        //- Velocity gradient field
+        const volTensorField* gradUPtr_;
+
 
         // Forces to include in particle motion evaluation
 
@@ -80,8 +84,11 @@ class particleForces
             //- Pressure gradient
             Switch pressureGradient_;
 
-            //- Name of velocity gradient field for pressure gradient force
-            word gradUName_;
+
+        // Additional info
+
+            //- Name of velucity field - default = "U"
+            const word UName_;
 
 
 public:
@@ -126,12 +133,15 @@ public:
             //- Return pressure gradient force activate switch
             Switch pressureGradient() const;
 
-            //- Return the name of the velocity gradient field
-            const word& gradUName() const;
+            //- Return name of velocity field
+            const word& UName() const;
 
 
        // Evaluation
 
+            //- Cache carrier fields
+            void cacheFields(const bool store);
+
             //- Calculate action/reaction forces between carrier and particles
             vector calcCoupled
             (
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
index 8f53d4c4b0..7fcb35b37c 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
@@ -80,9 +80,7 @@ particleForces
 {
     gravity         on;
     virtualMass     off;
-    Cvm             0.5;
     pressureGradient off;
-    gradU           gradU;
 }
 
 ManualInjectionCoeffs
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
index 51e1df0810..a76ed5115f 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
@@ -66,9 +66,7 @@ particleForces
 {
     gravity         on;
     virtualMass     off;
-    Cvm             0.5;
     pressureGradient off;
-    gradU           gradU;
 }
 
 ManualInjectionCoeffs
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
index d33cf9f91c..76e55a95ea 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
@@ -74,9 +74,7 @@ particleForces
 {
     gravity         on;
     virtualMass     off;
-    Cvm             0.5;
     pressureGradient off;
-    gradU           gradU;
 }
 
 ManualInjectionCoeffs
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
index a669b9451b..6a53da3143 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
@@ -74,9 +74,7 @@ particleForces
 {
     gravity         on;
     virtualMass     off;
-    Cvm             0.5;
     pressureGradient off;
-    gradU           gradU;
 }
 
 ManualInjectionCoeffs
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties
index 8c69fb42b5..93a7d43a9d 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties
@@ -54,9 +54,7 @@ particleForces
 {
     gravity         on;
     virtualMass     off;
-    Cvm             0.5;
     pressureGradient off;
-    gradU           gradU;
 }
 
 ManualInjectionCoeffs
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties
index a7c19443e2..ea9f237fb5 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties
@@ -66,9 +66,7 @@ particleForces
 {
     gravity         on;
     virtualMass     off;
-    Cvm             0.5;
     pressureGradient off;
-    gradU           gradU;
 }
 
 ManualInjectionCoeffs

From b1d2ecd38a6133356d964343ab300fe789d45b10 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 6 Jul 2009 12:31:16 +0100
Subject: [PATCH 12/84] opened up function obect interface

---
 .../OutputFilterFunctionObject.H              | 92 +++++++++++++++----
 src/sampling/probes/probes.H                  | 17 +++-
 2 files changed, 89 insertions(+), 20 deletions(-)

diff --git a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H
index 5ab4ebbece..9ac00bd060 100644
--- a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H
+++ b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H
@@ -63,17 +63,28 @@ class OutputFilterFunctionObject
 {
     // Private data
 
+        //- Output filter name
         word name_;
+
+        //- Reference to the time database
         const Time& time_;
+
+        //- Input dictionary
         dictionary dict_;
+
+        //- Name of region
         word regionName_;
+
+        //- Optional dictionary name to supply required inputs
         word dictName_;
 
         //- Switch for the execution of the functionObject
         bool enabled_;
 
+        //- Output controls
         outputFilterOutputControl outputControl_;
 
+        //- Pointer to the output filter
         autoPtr<OutputFilter> ptr_;
 
 
@@ -108,31 +119,78 @@ public:
 
     // Member Functions
 
-        //- Return name
-        virtual const word& name() const
-        {
-            return name_;
-        }
+        // Access
 
-        //- Switch the function object on
-        virtual void on();
+            //- Return name
+            virtual const word& name() const
+            {
+                return name_;
+            }
 
-        //- Switch the function object off
-        virtual void off();
+            //- Return time database
+            virtual const Time& time() const
+            {
+                return time_;
+            }
+
+            //- Return the input dictionary
+            virtual const dictionary& dict() const
+            {
+                return dict_;
+            }
+
+            //- Return the region name
+            virtual const word& regionName() const
+            {
+                return regionName_;
+            }
+
+            //- Return the optional dictionary name
+            virtual const word& dictName() const
+            {
+                return dictName_;
+            }
+
+            //- Return the enabled flag
+            virtual bool enabled() const
+            {
+                return enabled_;
+            }
+
+            //- Return the output control object
+            virtual const outputFilterOutputControl& outputControl() const
+            {
+                return outputControl_;
+            }
+
+            //- Return the output filter
+            virtual const OutputFilter& outputFilter() const
+            {
+                return ptr_();
+            }
 
 
-        //- Called at the start of the time-loop
-        virtual bool start();
+        // Function object control
 
-        //- Called at each ++ or += of the time-loop
-        virtual bool execute();
+            //- Switch the function object on
+            virtual void on();
 
-        //- Called when Time::run() determines that the time-loop exits
-        virtual bool end();
+            //- Switch the function object off
+            virtual void off();
 
 
-        //- Read and set the function object if its data have changed
-        virtual bool read(const dictionary&);
+            //- Called at the start of the time-loop
+            virtual bool start();
+
+            //- Called at each ++ or += of the time-loop
+            virtual bool execute();
+
+            //- Called when Time::run() determines that the time-loop exits
+            virtual bool end();
+
+
+            //- Read and set the function object if its data have changed
+            virtual bool read(const dictionary&);
 };
 
 
diff --git a/src/sampling/probes/probes.H b/src/sampling/probes/probes.H
index 33e4f39e25..11a7f581c1 100644
--- a/src/sampling/probes/probes.H
+++ b/src/sampling/probes/probes.H
@@ -175,9 +175,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~probes();
+    //- Destructor
+    virtual ~probes();
 
 
     // Member Functions
@@ -188,6 +187,18 @@ public:
             return name_;
         }
 
+        //- Return names of fields to probe
+        virtual const wordList& fieldNames() const
+        {
+            return fieldNames_;
+        }
+
+        //- Return locations to probe
+        virtual const vectorField& probeLocations() const
+        {
+            return probeLocations_;
+        }
+
         //- Cells to be probed (obtained from the locations)
         const labelList& cells() const
         {

From 4bf4e007165f57f486cf7d8fd848c969b4860d99 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 6 Jul 2009 12:58:25 +0100
Subject: [PATCH 13/84] renamed polynomialThermo -> hPolynomialThermo

---
 .../specie/include/reactionTypes.H            |  2 +-
 .../specie/include/thermoPhysicsTypes.H       |  4 +-
 .../reaction/reactions/makeReactionThermo.H   |  2 +-
 .../hPolynomialThermo.C}                      |  8 +-
 .../hPolynomialThermo.H}                      | 78 +++++++++----------
 .../hPolynomialThermoI.H}                     | 54 ++++++-------
 6 files changed, 74 insertions(+), 74 deletions(-)
 rename src/thermophysicalModels/specie/thermo/{polynomial/polynomialThermo.C => hPolynomial/hPolynomialThermo.C} (89%)
 rename src/thermophysicalModels/specie/thermo/{polynomial/polynomialThermo.H => hPolynomial/hPolynomialThermo.H} (69%)
 rename src/thermophysicalModels/specie/thermo/{polynomial/polynomialThermoI.H => hPolynomial/hPolynomialThermoI.H} (75%)

diff --git a/src/thermophysicalModels/specie/include/reactionTypes.H b/src/thermophysicalModels/specie/include/reactionTypes.H
index 531c9760bf..6ea8803c79 100644
--- a/src/thermophysicalModels/specie/include/reactionTypes.H
+++ b/src/thermophysicalModels/specie/include/reactionTypes.H
@@ -37,7 +37,7 @@ Description
 #include "Reaction.H"
 
 #include "icoPolynomial.H"
-#include "polynomialThermo.H"
+#include "hPolynomialThermo.H"
 #include "polynomialTransport.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H b/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H
index 2b85b22474..502958b505 100644
--- a/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H
+++ b/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H
@@ -41,7 +41,7 @@ Description
 #include "constTransport.H"
 
 #include "icoPolynomial.H"
-#include "polynomialThermo.H"
+#include "hPolynomialThermo.H"
 #include "polynomialTransport.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -58,7 +58,7 @@ namespace Foam
         <
             specieThermo
             <
-                polynomialThermo
+                hPolynomialThermo
                 <
                     icoPolynomial<8>,
                     8
diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermo.H b/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermo.H
index 89cf9875d0..6d982155c7 100644
--- a/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermo.H
+++ b/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermo.H
@@ -46,7 +46,7 @@ Description
 #include "perfectGas.H"
 
 #include "polynomialTransport.H"
-#include "polynomialThermo.H"
+#include "hPolynomialThermo.H"
 #include "icoPolynomial.H"
 
 #include "addToRunTimeSelectionTable.H"
diff --git a/src/thermophysicalModels/specie/thermo/polynomial/polynomialThermo.C b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
similarity index 89%
rename from src/thermophysicalModels/specie/thermo/polynomial/polynomialThermo.C
rename to src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
index c764426bbe..294a96005a 100644
--- a/src/thermophysicalModels/specie/thermo/polynomial/polynomialThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
@@ -24,13 +24,13 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "polynomialThermo.H"
+#include "hPolynomialThermo.H"
 #include "IOstreams.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class EquationOfState, int PolySize>
-Foam::polynomialThermo<EquationOfState, PolySize>::polynomialThermo(Istream& is)
+Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo(Istream& is)
 :
     EquationOfState(is),
     Hf_(readScalar(is)),
@@ -47,7 +47,7 @@ template<class EquationOfState, int PolySize>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const polynomialThermo<EquationOfState, PolySize>& pt
+    const hPolynomialThermo<EquationOfState, PolySize>& pt
 )
 {
     os  << static_cast<const EquationOfState&>(pt) << tab
@@ -59,7 +59,7 @@ Foam::Ostream& Foam::operator<<
 
     os.check
     (
-        "operator<<(Ostream& os, const polynomialThermo<EquationOfState>& pt)"
+        "operator<<(Ostream& os, const hPolynomialThermo<EquationOfState>& pt)"
     );
 
     return os;
diff --git a/src/thermophysicalModels/specie/thermo/polynomial/polynomialThermo.H b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
similarity index 69%
rename from src/thermophysicalModels/specie/thermo/polynomial/polynomialThermo.H
rename to src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
index 5f76a826d7..ec3c752f24 100644
--- a/src/thermophysicalModels/specie/thermo/polynomial/polynomialThermo.H
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::polynomialThermo
+    Foam::hPolynomialThermo
 
 Description
     Thermodynamics package templated on the equation of state, using polynomial
@@ -32,13 +32,13 @@ Description
     Polynomials for h and s derived from cp
 
 SourceFiles
-    polynomialThermoI.H
-    polynomialThermo.C
+    hPolynomialThermoI.H
+    hPolynomialThermo.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef polynomialThermo_H
-#define polynomialThermo_H
+#ifndef hPolynomialThermo_H
+#define hPolynomialThermo_H
 
 #include "scalar.H"
 #include "Polynomial.H"
@@ -51,50 +51,50 @@ namespace Foam
 // Forward declaration of friend functions and operators
 
 template<class EquationOfState, int PolySize>
-class polynomialThermo;
+class hPolynomialThermo;
 
 template<class EquationOfState, int PolySize>
-inline polynomialThermo<EquationOfState, PolySize> operator+
+inline hPolynomialThermo<EquationOfState, PolySize> operator+
 (
-    const polynomialThermo<EquationOfState, PolySize>&,
-    const polynomialThermo<EquationOfState, PolySize>&
+    const hPolynomialThermo<EquationOfState, PolySize>&,
+    const hPolynomialThermo<EquationOfState, PolySize>&
 );
 
 template<class EquationOfState, int PolySize>
-inline polynomialThermo<EquationOfState, PolySize> operator-
+inline hPolynomialThermo<EquationOfState, PolySize> operator-
 (
-    const polynomialThermo<EquationOfState, PolySize>&,
-    const polynomialThermo<EquationOfState, PolySize>&
+    const hPolynomialThermo<EquationOfState, PolySize>&,
+    const hPolynomialThermo<EquationOfState, PolySize>&
 );
 
 template<class EquationOfState, int PolySize>
-inline polynomialThermo<EquationOfState, PolySize> operator*
+inline hPolynomialThermo<EquationOfState, PolySize> operator*
 (
     const scalar,
-    const polynomialThermo<EquationOfState, PolySize>&
+    const hPolynomialThermo<EquationOfState, PolySize>&
 );
 
 template<class EquationOfState, int PolySize>
-inline polynomialThermo<EquationOfState, PolySize> operator==
+inline hPolynomialThermo<EquationOfState, PolySize> operator==
 (
-    const polynomialThermo<EquationOfState, PolySize>&,
-    const polynomialThermo<EquationOfState, PolySize>&
+    const hPolynomialThermo<EquationOfState, PolySize>&,
+    const hPolynomialThermo<EquationOfState, PolySize>&
 );
 
 template<class EquationOfState, int PolySize>
 Ostream& operator<<
 (
     Ostream&,
-    const polynomialThermo<EquationOfState, PolySize>&
+    const hPolynomialThermo<EquationOfState, PolySize>&
 );
 
 
 /*---------------------------------------------------------------------------*\
-                      Class polynomialThermo Declaration
+                      Class hPolynomialThermo Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class EquationOfState, int PolySize>
-class polynomialThermo
+class hPolynomialThermo
 :
     public EquationOfState
 {
@@ -119,7 +119,7 @@ class polynomialThermo
     // Private member functions
 
         //- Construct from components
-        inline polynomialThermo
+        inline hPolynomialThermo
         (
             const EquationOfState& pt,
             const scalar Hf,
@@ -135,10 +135,10 @@ public:
     // Constructors
 
         //- Construct from dictionary
-        polynomialThermo(Istream& is);
+        hPolynomialThermo(Istream& is);
 
         //- Construct as a named copy
-        inline polynomialThermo(const word&, const polynomialThermo&);
+        inline hPolynomialThermo(const word&, const hPolynomialThermo&);
 
 
     // Member Functions
@@ -161,34 +161,34 @@ public:
 
     // Member operators
 
-        inline void operator+=(const polynomialThermo&);
-        inline void operator-=(const polynomialThermo&);
+        inline void operator+=(const hPolynomialThermo&);
+        inline void operator-=(const hPolynomialThermo&);
 
 
     // Friend operators
 
-        friend polynomialThermo operator+ <EquationOfState, PolySize>
+        friend hPolynomialThermo operator+ <EquationOfState, PolySize>
         (
-            const polynomialThermo&,
-            const polynomialThermo&
+            const hPolynomialThermo&,
+            const hPolynomialThermo&
         );
 
-        friend polynomialThermo operator- <EquationOfState, PolySize>
+        friend hPolynomialThermo operator- <EquationOfState, PolySize>
         (
-            const polynomialThermo&,
-            const polynomialThermo&
+            const hPolynomialThermo&,
+            const hPolynomialThermo&
         );
 
-        friend polynomialThermo operator* <EquationOfState, PolySize>
+        friend hPolynomialThermo operator* <EquationOfState, PolySize>
         (
             const scalar,
-            const polynomialThermo&
+            const hPolynomialThermo&
         );
 
-        friend polynomialThermo operator== <EquationOfState, PolySize>
+        friend hPolynomialThermo operator== <EquationOfState, PolySize>
         (
-            const polynomialThermo&,
-            const polynomialThermo&
+            const hPolynomialThermo&,
+            const hPolynomialThermo&
         );
 
 
@@ -197,7 +197,7 @@ public:
         friend Ostream& operator<< <EquationOfState, PolySize>
         (
             Ostream&,
-            const polynomialThermo&
+            const hPolynomialThermo&
         );
 };
 
@@ -208,10 +208,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "polynomialThermoI.H"
+#include "hPolynomialThermoI.H"
 
 #ifdef NoRepository
-#   include "polynomialThermo.C"
+#   include "hPolynomialThermo.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/thermo/polynomial/polynomialThermoI.H b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
similarity index 75%
rename from src/thermophysicalModels/specie/thermo/polynomial/polynomialThermoI.H
rename to src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
index 28e80c5d5f..1382c6f3ec 100644
--- a/src/thermophysicalModels/specie/thermo/polynomial/polynomialThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
@@ -24,12 +24,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "polynomialThermo.H"
+#include "hPolynomialThermo.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class EquationOfState, int PolySize>
-inline Foam::polynomialThermo<EquationOfState, PolySize>::polynomialThermo
+inline Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
 (
     const EquationOfState& pt,
     const scalar Hf,
@@ -51,10 +51,10 @@ inline Foam::polynomialThermo<EquationOfState, PolySize>::polynomialThermo
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class EquationOfState, int PolySize>
-inline Foam::polynomialThermo<EquationOfState, PolySize>::polynomialThermo
+inline Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
 (
     const word& name,
-    const polynomialThermo& pt
+    const hPolynomialThermo& pt
 )
 :
     EquationOfState(name, pt),
@@ -69,7 +69,7 @@ inline Foam::polynomialThermo<EquationOfState, PolySize>::polynomialThermo
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class EquationOfState, int PolySize>
-inline Foam::scalar Foam::polynomialThermo<EquationOfState, PolySize>::cp
+inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::cp
 (
     const scalar T
 ) const
@@ -79,7 +79,7 @@ inline Foam::scalar Foam::polynomialThermo<EquationOfState, PolySize>::cp
 
 
 template<class EquationOfState, int PolySize>
-inline Foam::scalar Foam::polynomialThermo<EquationOfState, PolySize>::h
+inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::h
 (
     const scalar T
 ) const
@@ -89,7 +89,7 @@ inline Foam::scalar Foam::polynomialThermo<EquationOfState, PolySize>::h
 
 
 template<class EquationOfState, int PolySize>
-inline Foam::scalar Foam::polynomialThermo<EquationOfState, PolySize>::hs
+inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::hs
 (
     const scalar T
 ) const
@@ -99,7 +99,7 @@ inline Foam::scalar Foam::polynomialThermo<EquationOfState, PolySize>::hs
 
 
 template<class EquationOfState, int PolySize>
-inline Foam::scalar Foam::polynomialThermo<EquationOfState, PolySize>::hc()
+inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::hc()
 const
 {
     return Hf_*this->W();
@@ -107,7 +107,7 @@ const
 
 
 template<class EquationOfState, int PolySize>
-inline Foam::scalar Foam::polynomialThermo<EquationOfState, PolySize>::s
+inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::s
 (
     const scalar T
 ) const
@@ -119,9 +119,9 @@ inline Foam::scalar Foam::polynomialThermo<EquationOfState, PolySize>::s
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class EquationOfState, int PolySize>
-inline void Foam::polynomialThermo<EquationOfState, PolySize>::operator+=
+inline void Foam::hPolynomialThermo<EquationOfState, PolySize>::operator+=
 (
-    const polynomialThermo<EquationOfState, PolySize>& pt
+    const hPolynomialThermo<EquationOfState, PolySize>& pt
 )
 {
     scalar molr1 = this->nMoles();
@@ -140,9 +140,9 @@ inline void Foam::polynomialThermo<EquationOfState, PolySize>::operator+=
 
 
 template<class EquationOfState, int PolySize>
-inline void Foam::polynomialThermo<EquationOfState, PolySize>::operator-=
+inline void Foam::hPolynomialThermo<EquationOfState, PolySize>::operator-=
 (
-    const polynomialThermo<EquationOfState, PolySize>& pt
+    const hPolynomialThermo<EquationOfState, PolySize>& pt
 )
 {
     scalar molr1 = this->nMoles();
@@ -163,10 +163,10 @@ inline void Foam::polynomialThermo<EquationOfState, PolySize>::operator-=
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
 template<class EquationOfState, int PolySize>
-inline Foam::polynomialThermo<EquationOfState, PolySize> Foam::operator+
+inline Foam::hPolynomialThermo<EquationOfState, PolySize> Foam::operator+
 (
-    const polynomialThermo<EquationOfState, PolySize>& pt1,
-    const polynomialThermo<EquationOfState, PolySize>& pt2
+    const hPolynomialThermo<EquationOfState, PolySize>& pt1,
+    const hPolynomialThermo<EquationOfState, PolySize>& pt2
 )
 {
     EquationOfState eofs
@@ -177,7 +177,7 @@ inline Foam::polynomialThermo<EquationOfState, PolySize> Foam::operator+
 
     scalar molr1 = pt1.nMoles()/eofs.nMoles();
     scalar molr2 = pt2.nMoles()/eofs.nMoles();
-    return polynomialThermo<EquationOfState, PolySize>
+    return hPolynomialThermo<EquationOfState, PolySize>
     (
         eofs,
         molr1*pt1.Hf_ + molr2*pt2.Hf_,
@@ -190,10 +190,10 @@ inline Foam::polynomialThermo<EquationOfState, PolySize> Foam::operator+
 
 
 template<class EquationOfState, int PolySize>
-inline Foam::polynomialThermo<EquationOfState, PolySize> Foam::operator-
+inline Foam::hPolynomialThermo<EquationOfState, PolySize> Foam::operator-
 (
-    const polynomialThermo<EquationOfState, PolySize>& pt1,
-    const polynomialThermo<EquationOfState, PolySize>& pt2
+    const hPolynomialThermo<EquationOfState, PolySize>& pt1,
+    const hPolynomialThermo<EquationOfState, PolySize>& pt2
 )
 {
     EquationOfState eofs
@@ -204,7 +204,7 @@ inline Foam::polynomialThermo<EquationOfState, PolySize> Foam::operator-
 
     scalar molr1 = pt1.nMoles()/eofs.nMoles();
     scalar molr2 = pt2.nMoles()/eofs.nMoles();
-    return polynomialThermo<EquationOfState, PolySize>
+    return hPolynomialThermo<EquationOfState, PolySize>
     (
         eofs,
         molr1*pt1.Hf_ - molr2*pt2.Hf_,
@@ -217,13 +217,13 @@ inline Foam::polynomialThermo<EquationOfState, PolySize> Foam::operator-
 
 
 template<class EquationOfState, int PolySize>
-inline Foam::polynomialThermo<EquationOfState, PolySize> Foam::operator*
+inline Foam::hPolynomialThermo<EquationOfState, PolySize> Foam::operator*
 (
     const scalar s,
-    const polynomialThermo<EquationOfState, PolySize>& pt
+    const hPolynomialThermo<EquationOfState, PolySize>& pt
 )
 {
-    return polynomialThermo<EquationOfState, PolySize>
+    return hPolynomialThermo<EquationOfState, PolySize>
     (
         s*static_cast<const EquationOfState&>(pt),
         pt.Hf_,
@@ -236,10 +236,10 @@ inline Foam::polynomialThermo<EquationOfState, PolySize> Foam::operator*
 
 
 template<class EquationOfState, int PolySize>
-inline Foam::polynomialThermo<EquationOfState, PolySize> Foam::operator==
+inline Foam::hPolynomialThermo<EquationOfState, PolySize> Foam::operator==
 (
-    const polynomialThermo<EquationOfState, PolySize>& pt1,
-    const polynomialThermo<EquationOfState, PolySize>& pt2
+    const hPolynomialThermo<EquationOfState, PolySize>& pt1,
+    const hPolynomialThermo<EquationOfState, PolySize>& pt2
 )
 {
     return pt2 - pt1;

From cd0a0a696cf74a9342df9b4b7524d03e2a1488d8 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 6 Jul 2009 15:25:01 +0100
Subject: [PATCH 14/84] added gas thermophysics

---
 .../hReactionThermo/hReactionThermos.C          | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/hReactionThermos.C b/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/hReactionThermos.C
index 006e45b588..cafc62c494 100644
--- a/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/hReactionThermos.C
+++ b/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/hReactionThermos.C
@@ -114,6 +114,7 @@ makeReactionThermo
     perfectGas
 );
 
+
 makeReactionThermo
 (
     hReactionThermo,
@@ -135,6 +136,14 @@ makeReactionMixtureThermo
     icoPoly8ThermoPhysics
 );
 
+makeReactionMixtureThermo
+(
+    hReactionThermo,
+    hRhoMixtureThermo,
+    multiComponentMixture,
+    gasThermoPhysics
+);
+
 
 // Multi-component reaction thermo
 
@@ -146,6 +155,14 @@ makeReactionMixtureThermo
     icoPoly8ThermoPhysics
 );
 
+makeReactionMixtureThermo
+(
+    hReactionThermo,
+    hRhoMixtureThermo,
+    reactingMixture,
+    gasThermoPhysics
+);
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

From 516c20c8e7d0678883044f1dfd8af75545ce48fb Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 6 Jul 2009 15:33:55 +0100
Subject: [PATCH 15/84] adding rhoReactingFoam solver

---
 .../combustion/rhoReactingFoam/Make/files     |   3 +
 .../combustion/rhoReactingFoam/Make/options   |  19 ++++
 .../solvers/combustion/rhoReactingFoam/YEqn.H |  43 ++++++++
 .../combustion/rhoReactingFoam/chemistry.H    |  24 +++++
 .../combustion/rhoReactingFoam/createFields.H |  85 +++++++++++++++
 .../solvers/combustion/rhoReactingFoam/pEqn.H |  93 ++++++++++++++++
 .../rhoReactingFoam/readChemistryProperties.H |  23 ++++
 .../rhoReactingFoam/rhoReactingFoam.C         | 102 ++++++++++++++++++
 8 files changed, 392 insertions(+)
 create mode 100644 applications/solvers/combustion/rhoReactingFoam/Make/files
 create mode 100644 applications/solvers/combustion/rhoReactingFoam/Make/options
 create mode 100644 applications/solvers/combustion/rhoReactingFoam/YEqn.H
 create mode 100644 applications/solvers/combustion/rhoReactingFoam/chemistry.H
 create mode 100644 applications/solvers/combustion/rhoReactingFoam/createFields.H
 create mode 100644 applications/solvers/combustion/rhoReactingFoam/pEqn.H
 create mode 100644 applications/solvers/combustion/rhoReactingFoam/readChemistryProperties.H
 create mode 100644 applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C

diff --git a/applications/solvers/combustion/rhoReactingFoam/Make/files b/applications/solvers/combustion/rhoReactingFoam/Make/files
new file mode 100644
index 0000000000..3a97a48fd6
--- /dev/null
+++ b/applications/solvers/combustion/rhoReactingFoam/Make/files
@@ -0,0 +1,3 @@
+rhoReactingFoam.C
+
+EXE = $(FOAM_APPBIN)/rhoReactingFoam
diff --git a/applications/solvers/combustion/rhoReactingFoam/Make/options b/applications/solvers/combustion/rhoReactingFoam/Make/options
new file mode 100644
index 0000000000..e982f635a1
--- /dev/null
+++ b/applications/solvers/combustion/rhoReactingFoam/Make/options
@@ -0,0 +1,19 @@
+EXE_INC = \
+    -I../XiFoam \
+    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
+    -I$(LIB_SRC)/ODE/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
+
+EXE_LIBS = \
+    -lcompressibleRASModels \
+    -lcompressibleLESModels \
+    -lreactionThermophysicalModels \
+    -lspecie \
+    -lbasicThermophysicalModels \
+    -lchemistryModel \
+    -lODE \
+    -lfiniteVolume
diff --git a/applications/solvers/combustion/rhoReactingFoam/YEqn.H b/applications/solvers/combustion/rhoReactingFoam/YEqn.H
new file mode 100644
index 0000000000..cda24ec2f7
--- /dev/null
+++ b/applications/solvers/combustion/rhoReactingFoam/YEqn.H
@@ -0,0 +1,43 @@
+tmp<fv::convectionScheme<scalar> > mvConvection
+(
+    fv::convectionScheme<scalar>::New
+    (
+        mesh,
+        fields,
+        phi,
+        mesh.divScheme("div(phi,Yi_h)")
+    )
+);
+
+{
+    label inertIndex = -1;
+    volScalarField Yt = 0.0*Y[0];
+
+    for (label i=0; i<Y.size(); i++)
+    {
+        if (Y[i].name() != inertSpecie)
+        {
+            volScalarField& Yi = Y[i];
+
+            solve
+            (
+                fvm::ddt(rho, Yi)
+              + mvConvection->fvmDiv(phi, Yi)
+              - fvm::laplacian(turbulence->muEff(), Yi)
+             ==
+                kappa*chemistry.RR(i),
+                mesh.solver("Yi")
+            );
+
+            Yi.max(0.0);
+            Yt += Yi;
+        }
+        else
+        {
+            inertIndex = i;
+        }
+    }
+
+    Y[inertIndex] = scalar(1) - Yt;
+    Y[inertIndex].max(0.0);
+}
diff --git a/applications/solvers/combustion/rhoReactingFoam/chemistry.H b/applications/solvers/combustion/rhoReactingFoam/chemistry.H
new file mode 100644
index 0000000000..d059bd9ed3
--- /dev/null
+++ b/applications/solvers/combustion/rhoReactingFoam/chemistry.H
@@ -0,0 +1,24 @@
+{
+    Info << "Solving chemistry" << endl;
+
+    chemistry.solve
+    (
+        runTime.value() - runTime.deltaT().value(),
+        runTime.deltaT().value()
+    );
+
+    // turbulent time scale
+    if (turbulentReaction)
+    {
+        volScalarField tk =
+                Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon());
+        volScalarField tc = chemistry.tc();
+
+        // Chalmers PaSR model
+        kappa = (runTime.deltaT() + tc)/(runTime.deltaT() + tc + tk);
+    }
+    else
+    {
+        kappa = 1.0;
+    }
+}
diff --git a/applications/solvers/combustion/rhoReactingFoam/createFields.H b/applications/solvers/combustion/rhoReactingFoam/createFields.H
new file mode 100644
index 0000000000..d44b4b9171
--- /dev/null
+++ b/applications/solvers/combustion/rhoReactingFoam/createFields.H
@@ -0,0 +1,85 @@
+Info<< nl << "Reading thermophysicalProperties" << endl;
+autoPtr<rhoChemistryModel> pChemistry
+(
+    rhoChemistryModel::New(mesh)
+);
+rhoChemistryModel& chemistry = pChemistry();
+
+hReactionThermo& thermo = chemistry.thermo();
+
+basicMultiComponentMixture& composition = thermo.composition();
+PtrList<volScalarField>& Y = composition.Y();
+
+word inertSpecie(thermo.lookup("inertSpecie"));
+
+volScalarField rho
+(
+    IOobject
+    (
+        "rho",
+        runTime.timeName(),
+        mesh
+    ),
+    thermo.rho()
+);
+
+Info<< "Reading field U\n" << endl;
+volVectorField U
+(
+    IOobject
+    (
+        "U",
+        runTime.timeName(),
+        mesh,
+        IOobject::MUST_READ,
+        IOobject::AUTO_WRITE
+    ),
+    mesh
+);
+
+
+volScalarField& p = thermo.p();
+const volScalarField& psi = thermo.psi();
+volScalarField& h = thermo.h();
+
+
+#include "compressibleCreatePhi.H"
+
+volScalarField kappa
+(
+    IOobject
+    (
+        "kappa",
+        runTime.timeName(),
+        mesh,
+        IOobject::NO_READ,
+        IOobject::AUTO_WRITE
+    ),
+    mesh,
+    dimensionedScalar("zero", dimless, 0.0)
+);
+
+Info << "Creating turbulence model.\n" << nl;
+autoPtr<compressible::turbulenceModel> turbulence
+(
+    compressible::turbulenceModel::New
+    (
+        rho,
+        U,
+        phi,
+        thermo
+    )
+);
+
+Info<< "Creating field DpDt\n" << endl;
+volScalarField DpDt =
+    fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
+
+multivariateSurfaceInterpolationScheme<scalar>::fieldTable fields;
+
+forAll (Y, i)
+{
+    fields.add(Y[i]);
+}
+fields.add(h);
+
diff --git a/applications/solvers/combustion/rhoReactingFoam/pEqn.H b/applications/solvers/combustion/rhoReactingFoam/pEqn.H
new file mode 100644
index 0000000000..a58cd28dec
--- /dev/null
+++ b/applications/solvers/combustion/rhoReactingFoam/pEqn.H
@@ -0,0 +1,93 @@
+{
+    rho = thermo.rho();
+
+    // Thermodynamic density needs to be updated by psi*d(p) after the
+    // pressure solution - done in 2 parts. Part 1:
+    thermo.rho() -= psi*p;
+
+    volScalarField rUA = 1.0/UEqn.A();
+    U = rUA*UEqn.H();
+
+    if (transonic)
+    {
+        surfaceScalarField phiv =
+            (fvc::interpolate(U) & mesh.Sf())
+          + fvc::ddtPhiCorr(rUA, rho, U, phi);
+
+        phi = fvc::interpolate(rho)*phiv;
+
+        surfaceScalarField phid
+        (
+            "phid",
+            fvc::interpolate(thermo.psi())*phiv
+        );
+
+        for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+        {
+            fvScalarMatrix pEqn
+            (
+                fvc::ddt(rho) + fvc::div(phi)
+              + correction(fvm::ddt(psi, p) + fvm::div(phid, p))
+              - fvm::laplacian(rho*rUA, p)
+            );
+
+            if (ocorr == nOuterCorr && corr == nCorr && nonOrth == nNonOrthCorr)
+            {
+                pEqn.solve(mesh.solver(p.name() + "Final"));
+            }
+            else
+            {
+                pEqn.solve();
+            }
+
+            if (nonOrth == nNonOrthCorr)
+            {
+                phi += pEqn.flux();
+            }
+        }
+    }
+    else
+    {
+        phi =
+            fvc::interpolate(rho)
+           *(
+                (fvc::interpolate(U) & mesh.Sf())
+              + fvc::ddtPhiCorr(rUA, rho, U, phi)
+            );
+
+        for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+        {
+            fvScalarMatrix pEqn
+            (
+                fvc::ddt(rho) + psi*correction(fvm::ddt(p))
+              + fvc::div(phi)
+              - fvm::laplacian(rho*rUA, p)
+            );
+
+            if (ocorr == nOuterCorr && corr == nCorr && nonOrth == nNonOrthCorr)
+            {
+                pEqn.solve(mesh.solver(p.name() + "Final"));
+            }
+            else
+            {
+                pEqn.solve();
+            }
+
+            if (nonOrth == nNonOrthCorr)
+            {
+                phi += pEqn.flux();
+            }
+        }
+    }
+
+    // Second part of thermodynamic density update
+    thermo.rho() += psi*p;
+
+    #include "rhoEqn.H"
+    #include "compressibleContinuityErrs.H"
+
+    U -= rUA*fvc::grad(p);
+    U.correctBoundaryConditions();
+
+    DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
+}
diff --git a/applications/solvers/combustion/rhoReactingFoam/readChemistryProperties.H b/applications/solvers/combustion/rhoReactingFoam/readChemistryProperties.H
new file mode 100644
index 0000000000..ab51afe283
--- /dev/null
+++ b/applications/solvers/combustion/rhoReactingFoam/readChemistryProperties.H
@@ -0,0 +1,23 @@
+Info<< "Reading chemistry properties\n" << endl;
+
+IOdictionary chemistryProperties
+(
+    IOobject
+    (
+        "chemistryProperties",
+        runTime.constant(),
+        mesh,
+        IOobject::MUST_READ,
+        IOobject::NO_WRITE,
+        false
+    )
+);
+
+Switch turbulentReaction(chemistryProperties.lookup("turbulentReaction"));
+
+dimensionedScalar Cmix("Cmix", dimless, 1.0);
+
+if (turbulentReaction)
+{
+    chemistryProperties.lookup("Cmix") >> Cmix;
+}
diff --git a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
new file mode 100644
index 0000000000..16f49a197f
--- /dev/null
+++ b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
@@ -0,0 +1,102 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Application
+    rhoReactingFoam
+
+Description
+    Chemical reaction code using density based thermodynamics package.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fvCFD.H"
+#include "hReactionThermo.H"
+#include "turbulenceModel.H"
+#include "rhoChemistryModel.H"
+#include "chemistrySolver.H"
+#include "multivariateScheme.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    #include "setRootCase.H"
+    #include "createTime.H"
+    #include "createMesh.H"
+    #include "readChemistryProperties.H"
+    #include "readEnvironmentalProperties.H"
+    #include "createFields.H"
+    #include "initContinuityErrs.H"
+    #include "readTimeControls.H"
+    #include "compressibleCourantNo.H"
+    #include "setInitialDeltaT.H"
+
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+    Info << "\nStarting time loop\n" << endl;
+
+    while (runTime.run())
+    {
+        #include "readTimeControls.H"
+        #include "readPISOControls.H"
+        #include "compressibleCourantNo.H"
+        #include "setDeltaT.H"
+
+        runTime++;
+        Info<< "Time = " << runTime.timeName() << nl << endl;
+
+        #include "chemistry.H"
+        #include "rhoEqn.H"
+        #include "UEqn.H"
+
+        for (label ocorr=1; ocorr <= nOuterCorr; ocorr++)
+        {
+            #include "YEqn.H"
+            #include "hEqn.H"
+
+            // --- PISO loop
+            for (int corr=1; corr<=nCorr; corr++)
+            {
+                #include "pEqn.H"
+            }
+        }
+
+        turbulence->correct();
+
+        rho = thermo.rho();
+
+        runTime.write();
+
+        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
+            << nl << endl;
+    }
+
+    Info<< "End\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //

From e478718282921894289b83df5a549cf21280ea1a Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Mon, 6 Jul 2009 15:49:48 +0100
Subject: [PATCH 16/84] Modification to MD tuts.

---
 .../molecularDynamics/mdEquilibrationFoam/Allrun       | 10 +++++-----
 .../periodicCubeArgon/system/mdEquilibrationDict       |  5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/Allrun b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/Allrun
index 0d8c6de9d1..59649516d9 100755
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/Allrun
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/Allrun
@@ -5,11 +5,11 @@
 
 application="mdEquilibrationFoam"
 
-# cd periodicCubeArgon
-#     runApplication blockMesh
-#     runApplication mdInitialise
-#     runApplication $application
-# cd ..
+cd periodicCubeArgon
+    runApplication blockMesh
+    runApplication mdInitialise
+    runApplication $application
+cd ..
 
 cd periodicCubeWater
     runApplication blockMesh
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdEquilibrationDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdEquilibrationDict
index e044b83785..bbdbb899ec 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdEquilibrationDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdEquilibrationDict
@@ -14,6 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-equilibrationTargetTemperature  300.0;
+targetTemperature  300.0;
+
+// ************************************************************************* //
 
-// ************************************************************************* //
\ No newline at end of file

From f7104f4a7e61249f7fc11fcfc82e693b3828cc3d Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Mon, 6 Jul 2009 16:41:51 +0100
Subject: [PATCH 17/84] Caching deltaT in the DsmcCloud as it is expensive to
 repeated lookup in the parcel and in submodels.  Approx 20% speed in
 solution.

---
 .../dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C    |  5 ++++-
 .../dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H    | 10 ++++++++++
 .../dsmc/clouds/Templates/DsmcCloud/DsmcCloudI.H   | 14 ++++++++++++++
 .../dsmc/parcels/Templates/DsmcParcel/DsmcParcel.C |  4 ++--
 .../InflowBoundaryModel/FreeStream/FreeStream.C    |  2 +-
 5 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
index 10cec60dd2..23aa3dc478 100644
--- a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
+++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
@@ -299,7 +299,7 @@ void Foam::DsmcCloud<ParcelType>::collisions()
     // Temporary storage for subCells
     List<DynamicList<label> > subCells(8);
 
-    scalar deltaT = mesh_.time().deltaT().value();
+    scalar deltaT = cachedDeltaT();
 
     label collisionCandidates = 0;
 
@@ -778,6 +778,9 @@ Foam::DsmcCloud<ParcelType>::~DsmcCloud()
 template<class ParcelType>
 void Foam::DsmcCloud<ParcelType>::evolve()
 {
+    // cache the value of deltaT for this timestep
+    storeDeltaT();
+
     typename ParcelType::trackData td(*this);
 
     // Reset the surface data collection fields
diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H
index fc5cf53d68..76b1dd7e79 100644
--- a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H
+++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H
@@ -116,6 +116,10 @@ class DsmcCloud
         //- Random number generator
         Random rndGen_;
 
+        //- In-cloud cache of deltaT, lookup in submodels and parcel is
+        //  expensive
+        scalar cachedDeltaT_;
+
 
         // References to the macroscopic fields
 
@@ -243,6 +247,12 @@ public:
                 //- Return refernce to the random object
                 inline Random& rndGen();
 
+                //- Store (cache) the current value of deltaT
+                inline void storeDeltaT();
+
+                //- Return the cached value of deltaT
+                inline scalar cachedDeltaT() const;
+
 
             // References to the surface data collection fields
 
diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudI.H b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudI.H
index 449650c0a8..3529702fdd 100644
--- a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudI.H
+++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudI.H
@@ -120,6 +120,20 @@ inline Foam::Random& Foam::DsmcCloud<ParcelType>::rndGen()
 }
 
 
+template<class ParcelType>
+inline void Foam::DsmcCloud<ParcelType>::storeDeltaT()
+{
+    cachedDeltaT_ = mesh().time().deltaT().value();
+}
+
+
+template<class ParcelType>
+inline Foam::scalar Foam::DsmcCloud<ParcelType>::cachedDeltaT() const
+{
+    return cachedDeltaT_;
+}
+
+
 template<class ParcelType>
 inline const Foam::volScalarField& Foam::DsmcCloud<ParcelType>::q() const
 {
diff --git a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.C b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.C
index fae05b0f2f..c52d92d20f 100644
--- a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.C
+++ b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.C
@@ -44,7 +44,7 @@ bool Foam::DsmcParcel<ParcelType>::move
     const polyMesh& mesh = td.cloud().pMesh();
     const polyBoundaryMesh& pbMesh = mesh.boundaryMesh();
 
-    const scalar deltaT = mesh.time().deltaT().value();
+    const scalar deltaT = td.cloud().cachedDeltaT();
     scalar tEnd = (1.0 - p.stepFraction())*deltaT;
     const scalar dtMax = tEnd;
 
@@ -145,7 +145,7 @@ void Foam::DsmcParcel<ParcelType>::hitWallPatch
 
     const scalar fA = mag(wpp.faceAreas()[wppLocalFace]);
 
-    const scalar deltaT = td.cloud().mesh().time().deltaT().value();
+    const scalar deltaT = td.cloud().cachedDeltaT();
 
     scalar deltaQ = td.cloud().nParticle()*(preIE - postIE)/(deltaT*fA);
 
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
index 807337d7e0..0f0e135e4c 100644
--- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
@@ -126,7 +126,7 @@ void Foam::FreeStream<CloudType>::inflow()
 
     const polyMesh& mesh(cloud.mesh());
 
-    const scalar deltaT = mesh.time().deltaT().value();
+    const scalar deltaT = cloud.cachedDeltaT();
 
     Random& rndGen(cloud.rndGen());
 

From 3deed0eb44d158f89c7817ece3ea30be2b133ed1 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 6 Jul 2009 17:07:31 +0100
Subject: [PATCH 18/84] updates to
 ../../applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam

---
 .../UEqn.H                                    |  31 +---
 .../YEqn.H                                    |   1 -
 .../createFields.H                            |   8 +-
 .../createPorousZones.H                       |  18 ---
 .../hEqn.H                                    |  55 +++++--
 .../pEqn.H                                    | 139 ++++--------------
 .../porousExplicitSourceReactingParcelFoam.C  |  27 ++--
 .../readAdditionalSolutionControls.H          |  20 +++
 8 files changed, 109 insertions(+), 190 deletions(-)
 create mode 100644 applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/readAdditionalSolutionControls.H

diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/UEqn.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/UEqn.H
index 3fbe9f63b5..b408709aed 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/UEqn.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/UEqn.H
@@ -9,35 +9,10 @@
       + parcels.SU()
     );
 
-    UEqn.relax();
+    pZones.addResistance(UEqn);
 
-    tmp<volScalarField> trAU;
-    tmp<volTensorField> trTU;
-
-    if (pressureImplicitPorosity)
+    if (momentumPredictor)
     {
-        tmp<volTensorField> tTU = tensor(I)*UEqn.A();
-        pZones.addResistance(UEqn, tTU());
-        trTU = inv(tTU());
-        trTU().rename("rAU");
-
-        volVectorField gradp = fvc::grad(p);
-
-        for (int UCorr=0; UCorr<nUCorr; UCorr++)
-        {
-            U = trTU() & (UEqn.H() - gradp);
-        }
-        U.correctBoundaryConditions();
+        solve(UEqn == -fvc::grad(p));
     }
-    else
-    {
-        pZones.addResistance(UEqn);
 
-        trAU = 1.0/UEqn.A();
-        trAU().rename("rAU");
-
-        solve
-        (
-            UEqn == -fvc::grad(p)
-        );
-    }
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/YEqn.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/YEqn.H
index 1623b74664..e802fdfe0d 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/YEqn.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/YEqn.H
@@ -43,5 +43,4 @@ tmp<fv::convectionScheme<scalar> > mvConvection
 
     Y[inertIndex] = scalar(1) - Yt;
     Y[inertIndex].max(0.0);
-
 }
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createFields.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createFields.H
index da3cca5a5b..a3054db0f5 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createFields.H
@@ -73,13 +73,7 @@
         )
     );
 
-    Info<< "Creating field DpDt\n" << endl;
-    volScalarField DpDt
-    (
-        "DpDt",
-        fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p)
-    );
-
+    Info<< "Creating multi-variate interpolation scheme\n" << endl;
     multivariateSurfaceInterpolationScheme<scalar>::fieldTable fields;
 
     forAll (Y, i)
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createPorousZones.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createPorousZones.H
index caed85ecba..90506856d2 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createPorousZones.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createPorousZones.H
@@ -1,21 +1,3 @@
     Info<< "Creating porous zones" << nl << endl;
 
     porousZones pZones(mesh);
-    Switch pressureImplicitPorosity(false);
-
-    label nUCorr = 0;
-    if (pZones.size())
-    {
-        // nUCorrectors for pressureImplicitPorosity
-        if (mesh.solutionDict().subDict("PISO").found("nUCorrectors"))
-        {
-            mesh.solutionDict().subDict("PISO").lookup("nUCorrectors")
-                >> nUCorr;
-        }
-
-        if (nUCorr > 0)
-        {
-            pressureImplicitPorosity = true;
-        }
-    }
-
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/hEqn.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/hEqn.H
index d686e452f4..6e6b0c763a 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/hEqn.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/hEqn.H
@@ -1,20 +1,51 @@
 {
-    fvScalarMatrix hEqn
+    tmp<volScalarField> pWork
     (
-        fvm::ddt(rho, h)
-      + mvConvection->fvmDiv(phi, h)
-      - fvm::laplacian(turbulence->alphaEff(), h)
-     ==
-        DpDt
-     +  parcels.Sh()
-     +  radiation->Sh(thermo)
+        new volScalarField
+        (
+            IOobject
+            (
+                "pWork",
+                runTime.timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh,
+            dimensionedScalar("zero", dimensionSet(1, -1, -3, 0, 0), 0.0)
+        )
     );
 
-    hEqn.relax();
+    if (dpdt)
+    {
+        pWork() += fvc::ddt(p);
+    }
+    if (eWork)
+    {
+        pWork() = -p*fvc::div(phi/fvc::interpolate(rho));
+    }
+    if (hWork)
+    {
+        pWork() += fvc::div(phi/fvc::interpolate(rho)*fvc::interpolate(p));
+    }
 
-    hEqn.solve();
+    {
+        solve
+        (
+            fvm::ddt(rho, h)
+          + mvConvection->fvmDiv(phi, h)
+          - fvm::laplacian(turbulence->alphaEff(), h)
+         ==
+            pWork()
+          + parcels.Sh()
+          + radiation->Sh(thermo)
+        );
 
-    thermo.correct();
+        thermo.correct();
 
-    radiation->correct();
+        radiation->correct();
+
+        Info<< "T gas min/max   = " << min(T).value() << ", "
+            << max(T).value() << endl;
+    }
 }
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H
index be4c14c8e5..32657588b0 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H
@@ -5,65 +5,13 @@
     // pressure solution - done in 2 parts. Part 1:
     thermo.rho() -= psi*p;
 
-    if (pressureImplicitPorosity)
+    volScalarField rAU = 1.0/UEqn.A();
+    U = rAU*UEqn.H();
+
+    if (pZones.size() > 0)
     {
-        U = trTU()&UEqn.H();
-    }
-    else
-    {
-        U = trAU()*UEqn.H();
-    }
-
-    if (transonic)
-    {
-        surfaceScalarField phiv = fvc::interpolate(U) & mesh.Sf();
-
-        phi = fvc::interpolate(rho)*phiv;
-
-        surfaceScalarField phid("phid", fvc::interpolate(psi)*phiv);
-
-        for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
-        {
-            tmp<fvScalarMatrix> lapTerm;
-
-            if (pressureImplicitPorosity)
-            {
-                lapTerm = fvm::laplacian(rho*trTU(), p);
-            }
-            else
-            {
-                lapTerm = fvm::laplacian(rho*trAU(), p);
-            }
-
-            fvScalarMatrix pEqn
-            (
-                fvc::ddt(rho) + fvc::div(phi)
-              + correction(psi*fvm::ddt(p) + fvm::div(phid, p))
-              - lapTerm()
-            ==
-                parcels.Srho()
-              + pointMassSources.Su()
-            );
-
-            if
-            (
-                oCorr == nOuterCorr-1
-             && corr == nCorr-1
-             && nonOrth == nNonOrthCorr
-            )
-            {
-                pEqn.solve(mesh.solver("pFinal"));
-            }
-            else
-            {
-                pEqn.solve();
-            }
-
-            if (nonOrth == nNonOrthCorr)
-            {
-                phi == pEqn.flux();
-            }
-        }
+        // ddtPhiCorr not well defined for cases with porosity
+        phi = fvc::interpolate(rho)*(fvc::interpolate(U) & mesh.Sf());
     }
     else
     {
@@ -71,50 +19,34 @@
             fvc::interpolate(rho)
            *(
                 (fvc::interpolate(U) & mesh.Sf())
-//            + fvc::ddtPhiCorr(trAU(), rho, U, phi)
+              + fvc::ddtPhiCorr(rAU, rho, U, phi)
             );
+    }
 
-        for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    {
+        fvScalarMatrix pEqn
+        (
+            fvc::ddt(rho) + psi*correction(fvm::ddt(p))
+          + fvc::div(phi)
+          - fvm::laplacian(rho*rAU, p)
+        ==
+            parcels.Srho()
+          + pointMassSources.Su()
+        );
+
+        if (corr == nCorr-1 && nonOrth == nNonOrthCorr)
         {
-            tmp<fvScalarMatrix> lapTerm;
+            pEqn.solve(mesh.solver("pFinal"));
+        }
+        else
+        {
+            pEqn.solve();
+        }
 
-            if (pressureImplicitPorosity)
-            {
-                lapTerm = fvm::laplacian(rho*trTU(), p);
-            }
-            else
-            {
-                lapTerm = fvm::laplacian(rho*trAU(), p);
-            }
-
-            fvScalarMatrix pEqn
-            (
-                fvc::ddt(rho) + psi*correction(fvm::ddt(p))
-              + fvc::div(phi)
-              - lapTerm()
-            ==
-                parcels.Srho()
-              + pointMassSources.Su()
-            );
-
-            if
-            (
-                oCorr == nOuterCorr-1
-             && corr == nCorr-1
-             && nonOrth == nNonOrthCorr
-            )
-            {
-                pEqn.solve(mesh.solver("pFinal"));
-            }
-            else
-            {
-                pEqn.solve();
-            }
-
-            if (nonOrth == nNonOrthCorr)
-            {
-                phi += pEqn.flux();
-            }
+        if (nonOrth == nNonOrthCorr)
+        {
+            phi += pEqn.flux();
         }
     }
 
@@ -124,15 +56,6 @@
     #include "rhoEqn.H"
     #include "compressibleContinuityErrs.H"
 
-    if (pressureImplicitPorosity)
-    {
-        U -= trTU()&fvc::grad(p);
-    }
-    else
-    {
-        U -= trAU()*fvc::grad(p);
-    }
+    U -= rAU*fvc::grad(p);
     U.correctBoundaryConditions();
-
-    DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
 }
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
index c7e4fee7b6..760627de80 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
@@ -23,15 +23,16 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Application
-    trackedReactingParcelFoam
+    porousExplicitSourceReactingParcelFoam
 
 Description
-    - reacting parcel cloud tracking
+    - reacting parcel cloud
     - porous media
     - point mass sources
     - polynomial based, incompressible thermodynamics (f(T))
 
-    Note: ddtPhiCorr not used here - not well defined for porous calcs
+    Note: ddtPhiCorr not used here when porous zones are active
+    - not well defined for porous calcs
 
 \*---------------------------------------------------------------------------*/
 
@@ -74,6 +75,7 @@ int main(int argc, char *argv[])
     {
         #include "readTimeControls.H"
         #include "readPISOControls.H"
+        #include "readAdditionalSolutionControls.H"
         #include "compressibleCourantNo.H"
         #include "setDeltaT.H"
 
@@ -88,23 +90,16 @@ int main(int argc, char *argv[])
         #include "chemistry.H"
         #include "rhoEqn.H"
         #include "UEqn.H"
+        #include "YEqn.H"
+        #include "hEqn.H"
 
-        // --- PIMPLE loop
-        for (int oCorr=1; oCorr<=nOuterCorr; oCorr++)
+        // --- PISO loop
+        for (int corr=0; corr<nCorr; corr++)
         {
-            #include "YEqn.H"
-            #include "hEqn.H"
-
-            // --- PISO loop
-            for (int corr=1; corr<=nCorr; corr++)
-            {
-                #include "pEqn.H"
-            }
-
-            Info<< "T gas min/max   = " << min(T).value() << ", "
-                << max(T).value() << endl;
+            #include "pEqn.H"
         }
 
+
         turbulence->correct();
 
         rho = thermo.rho();
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/readAdditionalSolutionControls.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/readAdditionalSolutionControls.H
new file mode 100644
index 0000000000..8159205cae
--- /dev/null
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/readAdditionalSolutionControls.H
@@ -0,0 +1,20 @@
+dictionary additional = mesh.solutionDict().subDict("additional");
+
+bool dpdt = true;
+if (additional.found("dpdt"))
+{
+    additional.lookup("dpdt") >> dpdt;
+}
+
+bool eWork = true;
+if (additional.found("eWork"))
+{
+    additional.lookup("eWork") >> eWork;
+}
+
+bool hWork = true;
+if (additional.found("hWork"))
+{
+    additional.lookup("hWork") >> hWork;
+}
+

From 222852c523727e40a150cd9237e3dc2fdb445686 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 6 Jul 2009 19:45:31 +0100
Subject: [PATCH 19/84] renamed output field to pStatic

---
 .../utilities/staticPressure/staticPressure.C               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.C b/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.C
index f8678015f0..b746987f3c 100644
--- a/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.C
+++ b/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.C
@@ -127,11 +127,11 @@ void Foam::staticPressure::write()
     {
         const volScalarField& p = obr_.lookupObject<volScalarField>(pName_);
 
-        volScalarField pDyn
+        volScalarField pStatic
         (
             IOobject
             (
-                "pDyn",
+                "pStatic",
                 obr_.time().timeName(),
                 obr_,
                 IOobject::NO_READ
@@ -139,7 +139,7 @@ void Foam::staticPressure::write()
             dimensionedScalar("rho", dimDensity, rho_)*p
         );
 
-        pDyn.write();
+        pStatic.write();
     }
 }
 

From aa4e0f75854af25751372362256d7fb691bd7ce7 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 6 Jul 2009 19:45:58 +0100
Subject: [PATCH 20/84] minor update to fvSolution

---
 .../filter/system/fvSolution                               | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution
index 1f65036d64..e01611490e 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution
@@ -131,6 +131,13 @@ PISO
 //    nUCorrectors    2;
 }
 
+additional
+{
+    dpdt            true;
+    hWork           true;
+    eWork           true;
+}
+
 relaxationFactors
 {
 /*

From 9f8271c3ed834de2154a26201c18336ca13a4d90 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 6 Jul 2009 19:47:41 +0100
Subject: [PATCH 21/84] adding Sergio's faceZonesIntegration function object

---
 .../functionObjects/zones/Make/files          |   4 +
 .../functionObjects/zones/Make/options        |   9 +
 .../IOfaceZonesIntegration.H                  |  50 +++
 .../faceZonesIntegration.C                    | 322 ++++++++++++++++++
 .../faceZonesIntegration.H                    | 178 ++++++++++
 .../faceZonesIntegrationFunctionObject.C      |  43 +++
 .../faceZonesIntegrationFunctionObject.H      |  55 +++
 7 files changed, 661 insertions(+)
 create mode 100644 src/postProcessing/functionObjects/zones/Make/files
 create mode 100644 src/postProcessing/functionObjects/zones/Make/options
 create mode 100644 src/postProcessing/functionObjects/zones/faceZoneIntegration/IOfaceZonesIntegration.H
 create mode 100644 src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.C
 create mode 100644 src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.H
 create mode 100644 src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegrationFunctionObject.C
 create mode 100644 src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegrationFunctionObject.H

diff --git a/src/postProcessing/functionObjects/zones/Make/files b/src/postProcessing/functionObjects/zones/Make/files
new file mode 100644
index 0000000000..90e33f7524
--- /dev/null
+++ b/src/postProcessing/functionObjects/zones/Make/files
@@ -0,0 +1,4 @@
+faceZoneIntegration/faceZonesIntegration.C
+faceZoneIntegration/faceZonesIntegrationFunctionObject.C
+
+LIB = $(FOAM_LIBBIN)/libzoneFunctionObjects
diff --git a/src/postProcessing/functionObjects/zones/Make/options b/src/postProcessing/functionObjects/zones/Make/options
new file mode 100644
index 0000000000..5166bcc9e3
--- /dev/null
+++ b/src/postProcessing/functionObjects/zones/Make/options
@@ -0,0 +1,9 @@
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude
+
+LIB_LIBS = \
+    -lfiniteVolume \
+    -lmeshTools \
+    -lsampling
diff --git a/src/postProcessing/functionObjects/zones/faceZoneIntegration/IOfaceZonesIntegration.H b/src/postProcessing/functionObjects/zones/faceZoneIntegration/IOfaceZonesIntegration.H
new file mode 100644
index 0000000000..ef1ecbf004
--- /dev/null
+++ b/src/postProcessing/functionObjects/zones/faceZoneIntegration/IOfaceZonesIntegration.H
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Typedef
+    Foam::IOfaceZonesIntegration
+
+Description
+    Instance of the generic IOOutputFilter for faceZonesIntegration.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef IOfaceZonesIntegration_H
+#define IOfaceZonesIntegration_H
+
+#include "faceZonesIntegration.H"
+#include "IOOutputFilter.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef IOOutputFilter<faceZonesIntegration> IOfaceZonesIntegration;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.C b/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.C
new file mode 100644
index 0000000000..0b8314667c
--- /dev/null
+++ b/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.C
@@ -0,0 +1,322 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "faceZonesIntegration.H"
+#include "volFields.H"
+#include "dictionary.H"
+#include "Time.H"
+#include "IOmanip.H"
+#include "ListListOps.H"
+#include "processorPolyPatch.H"
+#include "cyclicPolyPatch.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(faceZonesIntegration, 0);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::faceZonesIntegration::faceZonesIntegration
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    const bool loadFromFiles
+)
+:
+    name_(name),
+    obr_(obr),
+    active_(true),
+    log_(false),
+    faceZonesSet_(),
+    fItems_(),
+    faceZonesIntegrationFilePtr_(NULL)
+{
+    // Check if the available mesh is an fvMesh otherise deactivate
+    if (!isA<fvMesh>(obr_))
+    {
+        active_ = false;
+        WarningIn
+        (
+            "Foam::faceZonesIntegration::faceZonesIntegration"
+            "("
+                "const word&, "
+                "const objectRegistry&, "
+                "const dictionary&, "
+                "const bool"
+            ")"
+        )   << "No fvMesh available, deactivating."
+            << endl;
+    }
+
+    read(dict);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::faceZonesIntegration::~faceZonesIntegration()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::faceZonesIntegration::read(const dictionary& dict)
+{
+    if (active_)
+    {
+        log_ = dict.lookupOrDefault<Switch>("log", false);
+
+        dict.lookup("fields") >> fItems_;
+
+        dict.lookup("faceZones") >> faceZonesSet_;
+    }
+}
+
+
+void Foam::faceZonesIntegration::makeFile()
+{
+    // Create the face Zone file if not already created
+    if (faceZonesIntegrationFilePtr_.empty())
+    {
+        if (debug)
+        {
+            Info<< "Creating faceZonesIntegration file." << endl;
+        }
+
+        // File update
+        if (Pstream::master())
+        {
+            fileName faceZonesIntegrationDir;
+            if (Pstream::parRun())
+            {
+                // Put in undecomposed case (Note: gives problems for
+                // distributed data running)
+                faceZonesIntegrationDir =
+                    obr_.time().path()/".."/name_/obr_.time().timeName();
+            }
+            else
+            {
+                faceZonesIntegrationDir =
+                    obr_.time().path()/name_/obr_.time().timeName();
+            }
+
+            // Create directory if does not exist.
+            mkDir(faceZonesIntegrationDir);
+
+            // Open new file at start up
+            faceZonesIntegrationFilePtr_.resize(fItems_.size());
+
+            forAll(fItems_, Ifields)
+            {
+                const word& fieldName = fItems_[Ifields];
+
+                OFstream* sPtr = new OFstream
+                    (
+                        faceZonesIntegrationDir/fieldName
+                    );
+
+                faceZonesIntegrationFilePtr_.insert(fieldName, sPtr);
+            }
+
+            // Add headers to output data
+            writeFileHeader();
+        }
+    }
+}
+
+
+void Foam::faceZonesIntegration::writeFileHeader()
+{
+    forAllIter(HashPtrTable<OFstream>, faceZonesIntegrationFilePtr_, iter)
+    {
+        unsigned int w = IOstream::defaultPrecision() + 7;
+
+        OFstream& os = *faceZonesIntegrationFilePtr_[iter.key()];
+
+        os  << "#Time " << setw(w);
+
+        forAll (faceZonesSet_, zoneI)
+        {
+            const word name = faceZonesSet_[zoneI];
+            os  << name << setw(w);
+        }
+
+        os  << nl << endl;
+    }
+}
+
+
+void Foam::faceZonesIntegration::execute()
+{
+    // Do nothing - only valid on write
+}
+
+
+void Foam::faceZonesIntegration::end()
+{
+    // Do nothing - only valid on write
+}
+
+
+void Foam::faceZonesIntegration::write()
+{
+    if (active_)
+    {
+        makeFile();
+        scalar dm = 0.0;
+        forAll(fItems_, fieldI)
+        {
+            const word& fieldName = fItems_[fieldI];
+
+            const surfaceScalarField& fD =
+                obr_.lookupObject<surfaceScalarField>(fieldName);
+
+            const fvMesh& mesh = fD.mesh();
+
+            unsigned int w = IOstream::defaultPrecision() + 7;
+
+            if
+            (
+                Pstream::master()
+             && faceZonesIntegrationFilePtr_.found(fieldName)
+            )
+            {
+                OFstream& os = *faceZonesIntegrationFilePtr_(fieldName);
+
+                os  << obr_.time().value();
+
+                const faceZoneMesh& faceZoneList =  mesh.faceZones();
+
+                forAll(faceZonesSet_, zoneI)
+                {
+                    const word name = faceZonesSet_[zoneI];
+
+                    label zoneID = faceZoneList.findZoneID(name);
+
+                    const faceZone& fz = mesh.faceZones()[zoneID];
+
+                    dm = calcFaceZonesIntegral(fD, fz);
+
+                    reduce(dm, sumOp<scalar>());
+
+                    os  << ' ' << setw(w) << dm;
+
+                    if (log_)
+                    {
+                        Info<< "faceZonesIntegration output:" << nl
+                            << "    Integration" << dm << endl;
+                    }
+                }
+
+                os  << endl;
+            }
+        }
+    }
+}
+
+
+Foam::scalar Foam::faceZonesIntegration::calcFaceZonesIntegral
+(
+    const surfaceScalarField& fD,
+    const faceZone& fz
+) const
+{
+    scalar dm = 0.0;
+    const fvMesh& mesh = fD.mesh();
+
+    forAll (fz, i)
+    {
+        label faceI = fz[i];
+
+        if (mesh.isInternalFace(faceI))
+        {
+            if (fz.flipMap()[faceI])
+            {
+                dm -= fD[faceI];
+            }
+            else
+            {
+                dm += fD[faceI];
+            }
+        }
+        else
+        {
+            label patchI = mesh.boundaryMesh().whichPatch(faceI);
+            const polyPatch& pp = mesh.boundaryMesh()[patchI];
+            if (isA<processorPolyPatch>(pp))
+            {
+                if (refCast<const processorPolyPatch>(pp).owner())
+                {
+                    if (fz.flipMap()[faceI])
+                    {
+                        dm -= fD.boundaryField()[patchI][pp.whichFace(faceI)];
+                    }
+                    else
+                    {
+                        dm += fD.boundaryField()[patchI][pp.whichFace(faceI)];
+                    }
+                }
+            }
+            else if (isA<cyclicPolyPatch>(pp))
+            {
+                label patchFaceI = faceI - pp.start();
+                if (patchFaceI < pp.size()/2)
+                {
+                    if (fz.flipMap()[patchFaceI])
+                    {
+                        dm -= fD.boundaryField()[patchI][patchFaceI];
+                    }
+                    else
+                    {
+                        dm += fD.boundaryField()[patchI][patchFaceI];
+                    }
+                }
+            }
+            else if (!isA<emptyPolyPatch>(pp))
+            {
+                label patchFaceI = faceI - pp.start();
+                if (fz.flipMap()[patchFaceI])
+                {
+                    dm -= fD.boundaryField()[patchI][patchFaceI];
+                }
+                else
+                {
+                    dm += fD.boundaryField()[patchI][patchFaceI];
+                }
+            }
+        }
+    }
+
+    return dm;
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.H b/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.H
new file mode 100644
index 0000000000..5fc957bba7
--- /dev/null
+++ b/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.H
@@ -0,0 +1,178 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::faceZonesIntegration
+
+Description
+    Integrates surfaceScalarFields on faceZones
+
+SourceFiles
+    faceZonesIntegration.C
+    IOfaceZonesIntegration.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef faceZonesIntegration_H
+#define faceZonesIntegration_H
+
+#include "fvCFD.H"
+#include "primitiveFieldsFwd.H"
+#include "volFieldsFwd.H"
+#include "HashPtrTable.H"
+#include "OFstream.H"
+#include "Switch.H"
+#include "pointFieldFwd.H"
+#include "polyMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class objectRegistry;
+class dictionary;
+class mapPolyMesh;
+
+/*---------------------------------------------------------------------------*\
+                           Class faceZonesIntegration Declaration
+\*---------------------------------------------------------------------------*/
+
+class faceZonesIntegration
+{
+
+protected:
+
+    // Private data
+
+        //- Name of this set of face zone integration,
+        //  Also used as the name of the probes directory.
+        word name_;
+
+        const objectRegistry& obr_;
+
+        //- on/off switch
+        bool active_;
+
+        //- Switch to send output to Info as well as to file
+        Switch log_;
+
+        //- Current open files
+        HashPtrTable<OFstream> faceZonesIntegrationFilePtr_;
+
+        // Read from dictionary
+
+            //- faceZones to integrate over
+            wordList faceZonesSet_;
+
+            //- Names of the surface fields
+            wordList fItems_;
+
+
+    // Private Member Functions
+
+        //- If the integration file has not been created create it
+        void makeFile();
+
+        scalar calcFaceZonesIntegral
+        (
+            const surfaceScalarField& fD,
+            const faceZone& fz
+        ) const;
+
+
+        //- Disallow default bitwise copy construct
+        faceZonesIntegration(const faceZonesIntegration&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const faceZonesIntegration&);
+
+        //- Output file header information
+        virtual void writeFileHeader();
+
+
+public:
+
+    //- Runtime type information
+    TypeName("faceZonesIntegration");
+
+
+    // Constructors
+
+        //- Construct for given objectRegistry and dictionary.
+        //  Allow the possibility to load fields from files
+        faceZonesIntegration
+        (
+            const word& name,
+            const objectRegistry&,
+            const dictionary&,
+            const bool loadFromFiles = false
+        );
+
+
+    // Destructor
+
+        virtual ~faceZonesIntegration();
+
+
+    // Member Functions
+
+        //- Return name of the set of zones
+        virtual const word& name() const
+        {
+            return name_;
+        };
+
+        //- Read the zone integration data
+        virtual void read(const dictionary&);
+
+        //- Execute, currently does nothing
+        virtual void execute();
+
+        //- Execute at the final time-loop, currently does nothing
+        virtual void end();
+
+        //- Write the integration
+        virtual void write();
+
+        //- Update for changes of mesh
+        virtual void updateMesh(const mapPolyMesh&)
+        {}
+
+        //- Update for changes of mesh
+        virtual void movePoints(const pointField&)
+        {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegrationFunctionObject.C b/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegrationFunctionObject.C
new file mode 100644
index 0000000000..43665119b1
--- /dev/null
+++ b/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegrationFunctionObject.C
@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "faceZonesIntegrationFunctionObject.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineNamedTemplateTypeNameAndDebug(faceZonesIntegrationFunctionObject, 0);
+
+    addToRunTimeSelectionTable
+    (
+        functionObject,
+        faceZonesIntegrationFunctionObject,
+        dictionary
+    );
+}
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegrationFunctionObject.H b/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegrationFunctionObject.H
new file mode 100644
index 0000000000..2cc95e2af2
--- /dev/null
+++ b/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegrationFunctionObject.H
@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Typedef
+    Foam::faceZonesIntegrationFunctionObject
+
+Description
+    FunctionObject wrapper around faceZonesIntegration to allow them to be
+    created via the functions list within controlDict.
+
+SourceFiles
+    faceZonesIntegrationFunctionObject.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef faceZonesIntegrationFunctionObject_H
+#define faceZonesIntegrationFunctionObject_H
+
+#include "faceZonesIntegration.H"
+#include "OutputFilterFunctionObject.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef OutputFilterFunctionObject<faceZonesIntegration>
+        faceZonesIntegrationFunctionObject;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 2db6c4f8c4b027a5c29b2ae6e05f95ff384b7702 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 6 Jul 2009 19:51:57 +0100
Subject: [PATCH 22/84] liquid updates

---
 .../liquidMixture/liquidMixture.C             |  30 ++--
 src/thermophysicalModels/liquids/Ar/Ar.C      | 112 +++++++++++++-
 src/thermophysicalModels/liquids/Ar/Ar.H      | 134 ++++-------------
 src/thermophysicalModels/liquids/Ar/ArI.H     | 105 +++++++++++++
 .../liquids/C10H22/C10H22.C                   | 119 ++++++++++++++-
 .../liquids/C10H22/C10H22.H                   | 133 ++++-------------
 .../liquids/C10H22/C10H22I.H                  | 105 +++++++++++++
 .../liquids/C12H26/C12H26.C                   | 111 +++++++++++++-
 .../liquids/C12H26/C12H26.H                   | 134 ++++-------------
 .../liquids/C12H26/C12H26I.H                  | 105 +++++++++++++
 .../liquids/C13H28/C13H28.C                   | 119 ++++++++++++++-
 .../liquids/C13H28/C13H28.H                   | 134 ++++-------------
 .../liquids/C13H28/C13H28I.H                  | 105 +++++++++++++
 .../liquids/C14H30/C14H30.C                   | 119 ++++++++++++++-
 .../liquids/C14H30/C14H30.H                   | 138 ++++-------------
 .../liquids/C14H30/C14H30I.H                  | 105 +++++++++++++
 .../liquids/C16H34/C16H34.C                   | 119 ++++++++++++++-
 .../liquids/C16H34/C16H34.H                   | 134 ++++-------------
 .../liquids/C16H34/C16H34I.H                  | 105 +++++++++++++
 .../liquids/C2H5OH/C2H5OH.C                   | 119 ++++++++++++++-
 .../liquids/C2H5OH/C2H5OH.H                   | 134 ++++-------------
 .../liquids/C2H5OH/C2H5OHI.H                  | 105 +++++++++++++
 src/thermophysicalModels/liquids/C2H6/C2H6.C  | 110 +++++++++++++-
 src/thermophysicalModels/liquids/C2H6/C2H6.H  | 134 ++++-------------
 src/thermophysicalModels/liquids/C2H6/C2H6I.H | 105 +++++++++++++
 .../liquids/C2H6O/C2H6O.C                     | 119 ++++++++++++++-
 .../liquids/C2H6O/C2H6O.H                     | 134 ++++-------------
 .../liquids/C2H6O/C2H6OI.H                    | 105 +++++++++++++
 .../liquids/C3H6O/C3H6O.C                     | 119 ++++++++++++++-
 .../liquids/C3H6O/C3H6O.H                     | 133 ++++-------------
 .../liquids/C3H6O/C3H6OI.H                    | 104 +++++++++++++
 src/thermophysicalModels/liquids/C3H8/C3H8.C  | 108 +++++++++++++-
 src/thermophysicalModels/liquids/C3H8/C3H8.H  | 134 ++++-------------
 src/thermophysicalModels/liquids/C3H8/C3H8I.H | 105 +++++++++++++
 .../liquids/C4H10O/C4H10O.C                   | 119 ++++++++++++++-
 .../liquids/C4H10O/C4H10O.H                   | 134 ++++-------------
 .../liquids/C4H10O/C4H10OI.H                  | 105 +++++++++++++
 .../liquids/C6H14/C6H14.C                     | 119 ++++++++++++++-
 .../liquids/C6H14/C6H14.H                     | 134 ++++-------------
 .../liquids/C6H14/C6H14I.H                    | 105 +++++++++++++
 src/thermophysicalModels/liquids/C6H6/C6H6.C  | 119 ++++++++++++++-
 src/thermophysicalModels/liquids/C6H6/C6H6.H  | 138 ++++-------------
 src/thermophysicalModels/liquids/C6H6/C6H6I.H | 105 +++++++++++++
 .../liquids/C7H16/C7H16.C                     | 110 +++++++++++++-
 .../liquids/C7H16/C7H16.H                     | 134 ++++-------------
 .../liquids/C7H16/C7H16I.H                    | 105 +++++++++++++
 src/thermophysicalModels/liquids/C7H8/C7H8.C  | 119 ++++++++++++++-
 src/thermophysicalModels/liquids/C7H8/C7H8.H  | 134 ++++-------------
 src/thermophysicalModels/liquids/C7H8/C7H8I.H | 105 +++++++++++++
 .../liquids/C8H10/C8H10.C                     | 119 ++++++++++++++-
 .../liquids/C8H10/C8H10.H                     | 134 ++++-------------
 .../liquids/C8H10/C8H10I.H                    | 105 +++++++++++++
 .../liquids/C8H18/C8H18.C                     | 119 ++++++++++++++-
 .../liquids/C8H18/C8H18.H                     | 136 ++++-------------
 .../liquids/C8H18/C8H18I.H                    | 105 +++++++++++++
 .../liquids/C9H20/C9H20.C                     | 119 ++++++++++++++-
 .../liquids/C9H20/C9H20.H                     | 134 ++++-------------
 .../liquids/C9H20/C9H20I.H                    | 105 +++++++++++++
 .../liquids/CH3OH/CH3OH.C                     | 119 ++++++++++++++-
 .../liquids/CH3OH/CH3OH.H                     | 134 ++++-------------
 .../liquids/CH3OH/CH3OHI.H                    | 105 +++++++++++++
 .../liquids/CH4N2O/CH4N2O.C                   | 103 ++++++++++++-
 .../liquids/CH4N2O/CH4N2O.H                   | 134 ++++-------------
 .../liquids/CH4N2O/CH4N2OI.H                  | 106 +++++++++++++
 src/thermophysicalModels/liquids/H2O/H2O.C    | 126 +++++++++++++++-
 src/thermophysicalModels/liquids/H2O/H2O.H    | 133 ++++-------------
 src/thermophysicalModels/liquids/H2O/H2OI.H   | 105 +++++++++++++
 .../liquids/IC8H18/IC8H18.C                   | 119 ++++++++++++++-
 .../liquids/IC8H18/IC8H18.H                   | 138 ++++-------------
 .../liquids/IC8H18/IC8H18I.H                  | 105 +++++++++++++
 src/thermophysicalModels/liquids/IDEA/IDEA.C  | 139 +++++++++++++++++-
 src/thermophysicalModels/liquids/IDEA/IDEA.H  | 134 ++++-------------
 src/thermophysicalModels/liquids/IDEA/IDEAI.H | 105 +++++++++++++
 src/thermophysicalModels/liquids/MB/MB.C      | 103 ++++++++++++-
 src/thermophysicalModels/liquids/MB/MB.H      | 137 ++++-------------
 src/thermophysicalModels/liquids/MB/MBI.H     | 105 +++++++++++++
 src/thermophysicalModels/liquids/N2/N2.C      | 119 ++++++++++++++-
 src/thermophysicalModels/liquids/N2/N2.H      | 138 ++++-------------
 src/thermophysicalModels/liquids/N2/N2I.H     | 105 +++++++++++++
 .../liquids/aC10H7CH3/aC10H7CH3.C             | 111 +++++++++++++-
 .../liquids/aC10H7CH3/aC10H7CH3.H             | 135 ++++-------------
 .../liquids/aC10H7CH3/aC10H7CH3I.H            | 105 +++++++++++++
 .../liquids/bC10H7CH3/bC10H7CH3.C             | 111 +++++++++++++-
 .../liquids/bC10H7CH3/bC10H7CH3.H             | 138 ++++-------------
 .../liquids/bC10H7CH3/bC10H7CH3I.H            | 105 +++++++++++++
 .../liquids/iC3H8O/iC3H8O.C                   | 122 +++++++++++++--
 .../liquids/iC3H8O/iC3H8O.H                   | 134 ++++-------------
 .../liquids/iC3H8O/iC3H8OI.H                  | 106 +++++++++++++
 .../liquids/liquid/liquid.C                   |  22 +--
 .../liquids/liquid/liquid.H                   |  68 +++------
 .../liquids/liquid/liquidI.H                  |  93 ++++++++++++
 .../liquids/nC3H8O/nC3H8O.C                   | 124 ++++++++++++++--
 .../liquids/nC3H8O/nC3H8O.H                   | 138 ++++-------------
 .../liquids/nC3H8O/nC3H8OI.H                  | 106 +++++++++++++
 94 files changed, 7352 insertions(+), 3573 deletions(-)
 create mode 100644 src/thermophysicalModels/liquids/Ar/ArI.H
 create mode 100644 src/thermophysicalModels/liquids/C10H22/C10H22I.H
 create mode 100644 src/thermophysicalModels/liquids/C12H26/C12H26I.H
 create mode 100644 src/thermophysicalModels/liquids/C13H28/C13H28I.H
 create mode 100644 src/thermophysicalModels/liquids/C14H30/C14H30I.H
 create mode 100644 src/thermophysicalModels/liquids/C16H34/C16H34I.H
 create mode 100644 src/thermophysicalModels/liquids/C2H5OH/C2H5OHI.H
 create mode 100644 src/thermophysicalModels/liquids/C2H6/C2H6I.H
 create mode 100644 src/thermophysicalModels/liquids/C2H6O/C2H6OI.H
 create mode 100644 src/thermophysicalModels/liquids/C3H6O/C3H6OI.H
 create mode 100644 src/thermophysicalModels/liquids/C3H8/C3H8I.H
 create mode 100644 src/thermophysicalModels/liquids/C4H10O/C4H10OI.H
 create mode 100644 src/thermophysicalModels/liquids/C6H14/C6H14I.H
 create mode 100644 src/thermophysicalModels/liquids/C6H6/C6H6I.H
 create mode 100644 src/thermophysicalModels/liquids/C7H16/C7H16I.H
 create mode 100644 src/thermophysicalModels/liquids/C7H8/C7H8I.H
 create mode 100644 src/thermophysicalModels/liquids/C8H10/C8H10I.H
 create mode 100644 src/thermophysicalModels/liquids/C8H18/C8H18I.H
 create mode 100644 src/thermophysicalModels/liquids/C9H20/C9H20I.H
 create mode 100644 src/thermophysicalModels/liquids/CH3OH/CH3OHI.H
 create mode 100644 src/thermophysicalModels/liquids/CH4N2O/CH4N2OI.H
 create mode 100644 src/thermophysicalModels/liquids/H2O/H2OI.H
 create mode 100644 src/thermophysicalModels/liquids/IC8H18/IC8H18I.H
 create mode 100644 src/thermophysicalModels/liquids/IDEA/IDEAI.H
 create mode 100644 src/thermophysicalModels/liquids/MB/MBI.H
 create mode 100644 src/thermophysicalModels/liquids/N2/N2I.H
 create mode 100644 src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3I.H
 create mode 100644 src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3I.H
 create mode 100644 src/thermophysicalModels/liquids/iC3H8O/iC3H8OI.H
 create mode 100644 src/thermophysicalModels/liquids/liquid/liquidI.H
 create mode 100644 src/thermophysicalModels/liquids/nC3H8O/nC3H8OI.H

diff --git a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C
index 72852bdb80..9cfc15a869 100644
--- a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C
+++ b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C
@@ -34,7 +34,6 @@ const Foam::scalar Foam::liquidMixture::TrMax = 0.999;
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::liquidMixture::liquidMixture
 (
     const dictionary& thermophysicalProperties
@@ -72,6 +71,7 @@ Foam::liquidMixture::liquidMixture
     }
 }
 
+
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
 Foam::autoPtr<Foam::liquidMixture> Foam::liquidMixture::New
@@ -85,7 +85,6 @@ Foam::autoPtr<Foam::liquidMixture> Foam::liquidMixture::New
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Critical Temperature
 Foam::scalar Foam::liquidMixture::Tc
 (
     const scalarField& x
@@ -104,9 +103,8 @@ Foam::scalar Foam::liquidMixture::Tc
 
     return vTc/vc;
 }
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// Pseudocritical temperature
+
 Foam::scalar Foam::liquidMixture::Tpc
 (
     const scalarField& x
@@ -121,9 +119,7 @@ Foam::scalar Foam::liquidMixture::Tpc
     return Tpc;
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// Pseudocritical pressure
 Foam::scalar Foam::liquidMixture::Ppc
 (
     const scalarField& x
@@ -140,7 +136,6 @@ Foam::scalar Foam::liquidMixture::Ppc
     return specie::RR*Zc*Tpc(x)/Vc;
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 Foam::scalar Foam::liquidMixture::omega
 (
@@ -156,7 +151,6 @@ Foam::scalar Foam::liquidMixture::omega
     return omega;
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 Foam::scalarField Foam::liquidMixture::Xs
 (
@@ -178,9 +172,6 @@ Foam::scalarField Foam::liquidMixture::Xs
     return xs;
 }
 
-//-----------------------------------------------------------------------------
-// Physical properties
-//-----------------------------------------------------------------------------
 
 Foam::scalar Foam::liquidMixture::W
 (
@@ -196,6 +187,7 @@ Foam::scalar Foam::liquidMixture::W
     return W;
 }
 
+
 Foam::scalarField Foam::liquidMixture::Y
 (
     const scalarField& X
@@ -211,6 +203,7 @@ Foam::scalarField Foam::liquidMixture::Y
     return Y;
 }
 
+
 Foam::scalarField Foam::liquidMixture::X
 (
     const scalarField& Y
@@ -250,6 +243,7 @@ Foam::scalar Foam::liquidMixture::rho
     return W(x)/v;
 }
 
+
 Foam::scalar Foam::liquidMixture::pv
 (
     const scalar p,
@@ -271,6 +265,7 @@ Foam::scalar Foam::liquidMixture::pv
     return pv/W(x);
 }
 
+
 Foam::scalar Foam::liquidMixture::hl
 (
     const scalar p,
@@ -292,6 +287,7 @@ Foam::scalar Foam::liquidMixture::hl
     return hl/W(x);
 }
 
+
 Foam::scalar Foam::liquidMixture::cp
 (
     const scalar p,
@@ -313,6 +309,7 @@ Foam::scalar Foam::liquidMixture::cp
     return cp/W(x);
 }
 
+
 Foam::scalar Foam::liquidMixture::sigma
 (
     const scalar p,
@@ -346,6 +343,7 @@ Foam::scalar Foam::liquidMixture::sigma
     return sigma;
 }
 
+
 Foam::scalar Foam::liquidMixture::mu
 (
     const scalar p,
@@ -367,6 +365,7 @@ Foam::scalar Foam::liquidMixture::mu
     return exp(mu);
 }
 
+
 Foam::scalar Foam::liquidMixture::K
 (
     const scalar p,
@@ -402,7 +401,12 @@ Foam::scalar Foam::liquidMixture::K
         {
             scalar Tj = min(TrMax*properties_[j].Tc(), T);
 
-            scalar Kij = 2.0/(1.0/properties_[i].K(p, Ti) + 1.0/properties_[j].K(p, Tj));
+            scalar Kij =
+                2.0
+               /(
+                    1.0/properties_[i].K(p, Ti)
+                  + 1.0/properties_[j].K(p, Tj)
+                );
             K += phii[i]*phii[j]*Kij;
         }
     }
@@ -410,6 +414,7 @@ Foam::scalar Foam::liquidMixture::K
     return K;
 }
 
+
 Foam::scalar Foam::liquidMixture::D
 (
     const scalar p,
@@ -432,4 +437,5 @@ Foam::scalar Foam::liquidMixture::D
     return 1.0/Dinv;
 }
 
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/Ar/Ar.C b/src/thermophysicalModels/liquids/Ar/Ar.C
index 7bd5bc4516..901a6ea6da 100644
--- a/src/thermophysicalModels/liquids/Ar/Ar.C
+++ b/src/thermophysicalModels/liquids/Ar/Ar.C
@@ -27,19 +27,117 @@ License
 #include "Ar.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(Ar, 0);
+    addToRunTimeSelectionTable(liquid, Ar,);
+    addToRunTimeSelectionTable(liquid, Ar, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Ar, 0);
-addToRunTimeSelectionTable(liquid, Ar,);
-addToRunTimeSelectionTable(liquid, Ar, Istream);
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+Foam::Ar::Ar()
+:
+    liquid
+    (
+        39.948,
+        150.86,
+        4.8981e+6,
+        0.07459,
+        0.291,
+        83.78,
+        6.88e+4,
+        87.28,
+        0.0,
+        0.0,
+        1.4138e+4
+    ),
+    rho_(151.922244, 0.286, 150.86, 0.2984),
+    pv_(39.233, -1051.7, -3.5895, 5.0444e-05, 2),
+    hl_(150.86, 218509.061780314, 0.352, 0.0, 0.0, 0.0),
+    cp_(4562.43116050866, -70.7770101131471, 0.367477721037349, 0.0, 0.0, 0.0),
+    h_
+    (
+       -1460974.49982473,
+        4562.43116050866,
+       -35.3885050565735,
+        0.122492573679116,
+        0.0,
+        0.0
+    ),
+    cpg_(520.326424351657, 0.0, 0.0, 0.0, 0.0, 0.0),
+    B_
+    (
+        0.000952488234705117,
+       -0.379993992189847,
+       -2022.62941824372,
+        4633523580654.85,
+        -302893761890458.0
+    ),
+    mu_(-8.868, 204.3, -0.3831, -1.3e-22, 10.0),
+    mug_(8.386e-07, 0.6175, 75.377, -432.5),
+    K_(0.1819, -0.0003176, -4.11e-06, 0.0, 0.0, 0.0),
+    Kg_(0.0001236, 0.8262, -132.8, 16000),
+    sigma_(150.86, 0.03823, 1.2927, 0.0, 0.0, 0.0),
+    D_(147.18, 20.1, 39.948, 28) // note: Same as nHeptane
+{}
+
+
+Foam::Ar::Ar
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc0& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc0& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::Ar::Ar(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
 
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/Ar/Ar.H b/src/thermophysicalModels/liquids/Ar/Ar.H
index 63d873d9eb..39e8f0f960 100644
--- a/src/thermophysicalModels/liquids/Ar/Ar.H
+++ b/src/thermophysicalModels/liquids/Ar/Ar.H
@@ -87,26 +87,9 @@ public:
     // Constructors
 
         //- Construct null
-        Ar()
-        :
-            liquid(39.948, 150.86, 4.8981e+6, 0.07459, 0.291, 83.78, 6.88e+4, 87.28, 0.0, 0.0, 1.4138e+4),
-            rho_(151.922244, 0.286, 150.86, 0.2984),
-            pv_(39.233, -1051.7, -3.5895, 5.0444e-05, 2),
-            hl_(150.86, 218509.061780314, 0.352, 0, 0, 0),
-            cp_(4562.43116050866, -70.7770101131471, 0.367477721037349, 0, 0, 0),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(-1460974.49982473, 4562.43116050866, -35.3885050565735, 0.122492573679116, 0, 0),
-            cpg_(520.326424351657, 0, 0, 0, 0, 0),
-            B_(0.000952488234705117, -0.379993992189847, -2022.62941824372, 4633523580654.85, -302893761890458.0),
-            mu_(-8.868, 204.3, -0.3831, -1.3e-22, 10),
-            mug_(8.386e-07, 0.6175, 75.377, -432.5),
-            K_(0.1819, -0.0003176, -4.11e-06, 0, 0, 0),
-            Kg_(0.0001236, 0.8262, -132.8, 16000),
-            sigma_(150.86, 0.03823, 1.2927, 0, 0, 0),
-            D_(147.18, 20.1, 39.948, 28) // NN: Same as nHeptane
-        {}
+        Ar();
+
+        //- Construct from components
         Ar
         (
             const liquid& l,
@@ -123,125 +106,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        Ar(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        Ar(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        inline scalar K(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -260,9 +174,7 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const Ar& l)
         {
             l.writeData(os);
@@ -277,6 +189,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "ArI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/Ar/ArI.H b/src/thermophysicalModels/liquids/Ar/ArI.H
new file mode 100644
index 0000000000..72ba64c1a8
--- /dev/null
+++ b/src/thermophysicalModels/liquids/Ar/ArI.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::Ar::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::Ar::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::Ar::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::Ar::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::Ar::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::Ar::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::Ar::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::Ar::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::Ar::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::Ar::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::Ar::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::Ar::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::Ar::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C10H22/C10H22.C b/src/thermophysicalModels/liquids/C10H22/C10H22.C
index d1148a21ae..d26c3afc39 100644
--- a/src/thermophysicalModels/liquids/C10H22/C10H22.C
+++ b/src/thermophysicalModels/liquids/C10H22/C10H22.C
@@ -27,19 +27,124 @@ License
 #include "C10H22.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(C10H22, 0);
+    addToRunTimeSelectionTable(liquid, C10H22,);
+    addToRunTimeSelectionTable(liquid, C10H22, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(C10H22, 0);
-addToRunTimeSelectionTable(liquid, C10H22,);
-addToRunTimeSelectionTable(liquid, C10H22, Istream);
+Foam::C10H22::C10H22()
+:
+    liquid
+    (
+        142.285,
+        617.70,
+        2.11e+6,
+        0.6,
+        0.247,
+        243.51,
+        1.393,
+        447.30,
+        0.0,
+        0.4923,
+        1.57e+4
+    ),
+    rho_(60.94208835, 0.25745, 617.7, 0.28912),
+    pv_(112.73, -9749.6, -13.245, 7.1266e-06, 2.0),
+    hl_(617.70, 464743.296904101, 0.39797, 0.0, 0.0, 0.0),
+    cp_
+    (
+        1958.18252099659,
+       -1.39094071757388,
+        0.00754612221948905,
+        0.0,
+        0.0,
+        0.0
+    ),
+    h_
+    (
+       -2699436.15229142,
+        1958.18252099659,
+       -0.695470358786942,
+        0.00251537407316302,
+        0.0,
+        0.0
+    ),
+    cpg_(1175.10630073444, 3762.16748076045, 1614.1, 2658.04547211582, 742),
+    B_
+    (
+        0.00337351091119935,
+       -4.13606494008504,
+       -534560.916470464,
+       -1.13364022911762e+19,
+        2.80704220402713e+21
+    ),
+    mu_(-16.468, 1533.5, 0.7511, 0.0, 0.0),
+    mug_(2.64e-08, 0.9487, 71.0, 0.0),
+    K_(0.2063, -0.000254, 0.0, 0.0, 0.0, 0.0),
+    Kg_(-668.4, 0.9323, -4071000000.0, 0.0),
+    sigma_(617.70, 0.055435, 1.3095, 0.0, 0.0, 0.0),
+    D_(147.18, 20.1, 142.285, 28.0) // note: Same as nHeptane
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::C10H22::C10H22
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc0& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::C10H22::C10H22(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C10H22/C10H22.H b/src/thermophysicalModels/liquids/C10H22/C10H22.H
index 6ee211c320..88ee972321 100644
--- a/src/thermophysicalModels/liquids/C10H22/C10H22.H
+++ b/src/thermophysicalModels/liquids/C10H22/C10H22.H
@@ -87,26 +87,9 @@ public:
     // Constructors
 
         //- Construct null
-        C10H22()
-        :
-            liquid(142.285, 617.70, 2.11e+6, 0.6, 0.247, 243.51, 1.393, 447.30, 0.0, 0.4923, 1.57e+4),
-            rho_(60.94208835, 0.25745, 617.7, 0.28912),
-            pv_(112.73, -9749.6, -13.245, 7.1266e-06, 2),
-            hl_(617.70, 464743.296904101, 0.39797, 0, 0, 0),
-            cp_(1958.18252099659, -1.39094071757388, 0.00754612221948905, 0, 0, 0),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(-2699436.15229142, 1958.18252099659, -0.695470358786942, 0.00251537407316302, 0, 0),
-            cpg_(1175.10630073444, 3762.16748076045, 1614.1, 2658.04547211582, 742),
-            B_(0.00337351091119935, -4.13606494008504, -534560.916470464, -1.13364022911762e+19, 2.80704220402713e+21),
-            mu_(-16.468, 1533.5, 0.7511, 0, 0),
-            mug_(2.64e-08, 0.9487, 71, 0),
-            K_(0.2063, -0.000254, 0, 0, 0, 0),
-            Kg_(-668.4, 0.9323, -4071000000.0, 0),
-            sigma_(617.70, 0.055435, 1.3095, 0, 0, 0),
-            D_(147.18, 20.1, 142.285, 28) // NN: Same as nHeptane
-        {}
+        C10H22();
+
+        //- Construct from components
         C10H22
         (
             const liquid& l,
@@ -123,125 +106,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        C10H22(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        C10H22(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        inline scalar K(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -261,8 +175,7 @@ public:
         }
 
 
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const C10H22& l)
         {
             l.writeData(os);
@@ -277,6 +190,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "C10H22I.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C10H22/C10H22I.H b/src/thermophysicalModels/liquids/C10H22/C10H22I.H
new file mode 100644
index 0000000000..bdbc395f1f
--- /dev/null
+++ b/src/thermophysicalModels/liquids/C10H22/C10H22I.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::C10H22::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C10H22::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C10H22::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C10H22::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C10H22::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C10H22::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C10H22::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C10H22::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C10H22::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C10H22::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C10H22::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C10H22::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C10H22::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C12H26/C12H26.C b/src/thermophysicalModels/liquids/C12H26/C12H26.C
index d12ca93da7..8eb5d25e46 100644
--- a/src/thermophysicalModels/liquids/C12H26/C12H26.C
+++ b/src/thermophysicalModels/liquids/C12H26/C12H26.C
@@ -27,19 +27,116 @@ License
 #include "C12H26.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(C12H26, 0);
+    addToRunTimeSelectionTable(liquid, C12H26,);
+    addToRunTimeSelectionTable(liquid, C12H26, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(C12H26, 0);
-addToRunTimeSelectionTable(liquid, C12H26,);
-addToRunTimeSelectionTable(liquid, C12H26, Istream);
+Foam::C12H26::C12H26()
+:
+    liquid
+    (
+        170.338,
+        658.0,
+        1.82e+6,
+        0.716,
+        0.238,
+        263.57,
+        6.152e-1,
+        489.47,
+        0.0,
+        0.5764,
+        1.59e+4
+    ),
+    rho_(60.53982858, 0.25511, 658.0, 0.29368),
+    pv_(137.47, -11976.0, -16.698, 8.0906e-06, 2.0),
+    hl_(658.0, 454020.829174935, 0.40681, 0.0, 0.0, 0.0),
+    cp_(2983.53861146661, -8.0352006011577, 0.018207916025784, 0.0, 0.0, 0.0),
+    h_
+    (
+       -2755166.83820769,
+        2983.53861146661,
+       -4.01760030057885,
+        0.00606930534192801,
+        0.0,
+        0.0
+    ),
+    cpg_(1250.16144371778, 3894.02247296552, 1715.5, 2650.67101879792, 777.5),
+    B_
+    (
+        0.00516619896910848,
+       -6.40491258556517,
+       -295295.236529723,
+       -3.22147729807794e+19,
+        8.78195117941974e+21
+    ),
+    mu_(-20.607, 1943, 1.3205, 0.0, 0.0),
+    mug_(6.344e-08, 0.8287, 219.5, 0.0),
+    K_(0.2047, -0.0002326, 0.0, 0.0, 0.0, 0.0),
+    Kg_(5.719e-06, 1.4699, 579.4, 0.0),
+    sigma_(658.0, 0.055493, 1.3262, 0.0, 0.0, 0.0),
+    D_(147.18, 20.1, 170.338, 28.0) // note: Same as nHeptane
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::C12H26::C12H26
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc0& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::C12H26::C12H26(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C12H26/C12H26.H b/src/thermophysicalModels/liquids/C12H26/C12H26.H
index 2feca3b736..9c3cba2ac2 100644
--- a/src/thermophysicalModels/liquids/C12H26/C12H26.H
+++ b/src/thermophysicalModels/liquids/C12H26/C12H26.H
@@ -87,26 +87,9 @@ public:
     // Constructors
 
         //- Construct null
-        C12H26()
-        :
-            liquid(170.338, 658.0, 1.82e+6, 0.716, 0.238, 263.57, 6.152e-1, 489.47, 0, 0.5764, 1.59e+4),
-            rho_(60.53982858, 0.25511, 658, 0.29368),
-            pv_(137.47, -11976, -16.698, 8.0906e-06, 2),
-            hl_(658.0, 454020.829174935, 0.40681, 0, 0, 0),
-            cp_(2983.53861146661, -8.0352006011577, 0.018207916025784, 0, 0, 0),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(-2755166.83820769, 2983.53861146661, -4.01760030057885, 0.00606930534192801, 0, 0),
-            cpg_(1250.16144371778, 3894.02247296552, 1715.5, 2650.67101879792, 777.5),
-            B_(0.00516619896910848, -6.40491258556517, -295295.236529723, -3.22147729807794e+19, 8.78195117941974e+21),
-            mu_(-20.607, 1943, 1.3205, 0, 0),
-            mug_(6.344e-08, 0.8287, 219.5, 0),
-            K_(0.2047, -0.0002326, 0, 0, 0, 0),
-            Kg_(5.719e-06, 1.4699, 579.4, 0),
-            sigma_(658.0, 0.055493, 1.3262, 0, 0, 0),
-            D_(147.18, 20.1, 170.338, 28) // NN: Same as nHeptane
-        {}
+        C12H26();
+
+        //- Construct from conponents
         C12H26
         (
             const liquid& l,
@@ -123,125 +106,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        C12H26(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        C12H26(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        inline scalar K(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -260,9 +174,7 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const C12H26& l)
         {
             l.writeData(os);
@@ -277,6 +189,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "C12H26I.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C12H26/C12H26I.H b/src/thermophysicalModels/liquids/C12H26/C12H26I.H
new file mode 100644
index 0000000000..0edb1e981a
--- /dev/null
+++ b/src/thermophysicalModels/liquids/C12H26/C12H26I.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::C12H26::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C12H26::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C12H26::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C12H26::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C12H26::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C12H26::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C12H26::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C12H26::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C12H26::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C12H26::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C12H26::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C12H26::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C12H26::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C13H28/C13H28.C b/src/thermophysicalModels/liquids/C13H28/C13H28.C
index 2b8fe56e6a..db63784caf 100644
--- a/src/thermophysicalModels/liquids/C13H28/C13H28.C
+++ b/src/thermophysicalModels/liquids/C13H28/C13H28.C
@@ -27,19 +27,124 @@ License
 #include "C13H28.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(C13H28, 0);
+    addToRunTimeSelectionTable(liquid, C13H28,);
+    addToRunTimeSelectionTable(liquid, C13H28, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(C13H28, 0);
-addToRunTimeSelectionTable(liquid, C13H28,);
-addToRunTimeSelectionTable(liquid, C13H28, Istream);
+Foam::C13H28::C13H28()
+:
+    liquid
+    (
+        184.365,
+        675.80,
+        1.7225e+6,
+        0.77,
+        0.236,
+        267.76,
+        3.801e-1,
+        508.62,
+        0.0,
+        0.6186,
+        1.5901e+4
+    ),
+    rho_(59.513022, 0.2504, 675.8, 0.312),
+    pv_(118.27, -11432, -13.769, 5.9641e-06, 2.0),
+    hl_(675.80, 444227.48352453, 0.4162, 0.0, 0.0, 0.0),
+    cp_
+    (
+        4275.05220622135,
+       -16.6539202126217,
+        0.0325755973205326,
+        0.0,
+        0.0,
+        0.0
+    ),
+    h_
+    (
+       -2860442.0545124,
+        4275.05220622135,
+       -8.32696010631085,
+        0.0108585324401775,
+        0.0,
+        0.0
+    ),
+    cpg_(1136.87522035093, 3641.14663846175, -1443, 2277.00485450058, -683.0),
+    B_
+    (
+        0.00246321156401703,
+       -2.66601578390692,
+       -1249532.17801643,
+       -1.0460770753668e+19,
+        1.90117430097904e+21
+    ),
+    mu_(-23.341, 2121.9, 1.7208, 0.0, 0.0),
+    mug_(3.5585e-08, 0.8987, 165.3, 0.0),
+    K_(0.1981, -0.0002046, 0.0, 0.0, 0.0, 0.0),
+    Kg_(5.3701e-06, 1.4751, 599.09, 0.0),
+    sigma_(675.80, 0.05561, 1.3361, 0.0, 0.0, 0.0),
+    D_(147.18, 20.1, 184.365, 28.0) // note: Same as nHeptane
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::C13H28::C13H28
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc0& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::C13H28::C13H28(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C13H28/C13H28.H b/src/thermophysicalModels/liquids/C13H28/C13H28.H
index 632b7c0ab7..d97300f1d1 100644
--- a/src/thermophysicalModels/liquids/C13H28/C13H28.H
+++ b/src/thermophysicalModels/liquids/C13H28/C13H28.H
@@ -87,26 +87,9 @@ public:
     // Constructors
 
         //- Construct null
-        C13H28()
-        :
-            liquid(184.365, 675.80, 1.7225e+6, 0.77, 0.236, 267.76, 3.801e-1, 508.62, 0.0, 0.6186, 1.5901e+4),
-            rho_(59.513022, 0.2504, 675.8, 0.312),
-            pv_(118.27, -11432, -13.769, 5.9641e-06, 2),
-            hl_(675.80, 444227.48352453, 0.4162, 0, 0, 0),
-            cp_(4275.05220622135, -16.6539202126217, 0.0325755973205326, 0, 0, 0),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(-2860442.0545124, 4275.05220622135, -8.32696010631085, 0.0108585324401775, 0, 0),
-            cpg_(1136.87522035093, 3641.14663846175, -1443, 2277.00485450058, -683),
-            B_(0.00246321156401703, -2.66601578390692, -1249532.17801643, -1.0460770753668e+19, 1.90117430097904e+21),
-            mu_(-23.341, 2121.9, 1.7208, 0, 0),
-            mug_(3.5585e-08, 0.8987, 165.3, 0),
-            K_(0.1981, -0.0002046, 0, 0, 0, 0),
-            Kg_(5.3701e-06, 1.4751, 599.09, 0),
-            sigma_(675.80, 0.05561, 1.3361, 0, 0, 0),
-            D_(147.18, 20.1, 184.365, 28) // NN: Same as nHeptane
-        {}
+        C13H28();
+
+        //- Construct from components
         C13H28
         (
             const liquid& l,
@@ -123,125 +106,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        C13H28(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        C13H28(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        inline scalar K(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -260,9 +174,7 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const C13H28& l)
         {
             l.writeData(os);
@@ -277,6 +189,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "C13H28I.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C13H28/C13H28I.H b/src/thermophysicalModels/liquids/C13H28/C13H28I.H
new file mode 100644
index 0000000000..333905a9f3
--- /dev/null
+++ b/src/thermophysicalModels/liquids/C13H28/C13H28I.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::C13H28::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C13H28::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C13H28::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C13H28::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C13H28::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C13H28::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C13H28::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C13H28::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C13H28::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C13H28::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C13H28::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C13H28::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C13H28::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C14H30/C14H30.C b/src/thermophysicalModels/liquids/C14H30/C14H30.C
index 4177874ca4..0ccb3eb6c6 100644
--- a/src/thermophysicalModels/liquids/C14H30/C14H30.C
+++ b/src/thermophysicalModels/liquids/C14H30/C14H30.C
@@ -27,19 +27,124 @@ License
 #include "C14H30.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(C14H30, 0);
+    addToRunTimeSelectionTable(liquid, C14H30,);
+    addToRunTimeSelectionTable(liquid, C14H30, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(C14H30, 0);
-addToRunTimeSelectionTable(liquid, C14H30,);
-addToRunTimeSelectionTable(liquid, C14H30, Istream);
+Foam::C14H30::C14H30()
+:
+    liquid
+    (
+        198.392,
+        692.40,
+        1.6212e+6,
+        0.8428,
+        0.237,
+        279.01,
+        1.8849e-1,
+        526.73,
+        0.0,
+        0.6617,
+        1.6173e+4
+    ),
+    rho_(60.92023144, 0.2582, 692.4, 0.26628),
+    pv_(249.21, -16915, -35.195, 0.028451, 1.0),
+    hl_(692.40, 455764.345336506, 0.428, 0.0, 0.0, 0.0),
+    cp_
+    (
+        2565.72845679261,
+       -4.78114036856325,
+        0.0120362716238558,
+        0.0,
+        0.0,
+        0.0
+    ),
+    h_
+    (
+       -2690601.01887934,
+        2565.72845679261,
+       -2.39057018428162,
+        0.00401209054128527,
+        0.0,
+        0.0
+    ),
+    cpg_(1134.11831122223, 3629.17859591113, -1440.3, 2275.29335860317, -682),
+    B_
+    (
+        0.00247837614419936,
+       -2.62692044034034,
+       -1427174.48284205,
+       -1.68288035807895e+19,
+        3.48854792531957e+21
+    ),
+    mu_(-18.964, 2010.9, 1.0648, 0.0, 0.0),
+    mug_(4.4565e-08, 0.8684, 228.16, -4347.2),
+    K_(0.1957, -0.0001993, 0.0, 0.0, 0.0, 0.0),
+    Kg_(-0.000628, 0.944, -5490, 0.0),
+    sigma_(692.40, 0.056436, 1.3658, 0.0, 0.0, 0.0),
+    D_(147.18, 20.1, 198.392, 28.0) // note: Same as nHeptane
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::C14H30::C14H30
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc0& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::C14H30::C14H30(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C14H30/C14H30.H b/src/thermophysicalModels/liquids/C14H30/C14H30.H
index fa86f3c9c3..183ee026de 100644
--- a/src/thermophysicalModels/liquids/C14H30/C14H30.H
+++ b/src/thermophysicalModels/liquids/C14H30/C14H30.H
@@ -87,26 +87,9 @@ public:
     // Constructors
 
         //- Construct null
-        C14H30()
-        :
-            liquid(198.392, 692.40, 1.6212e+6, 0.8428, 0.237, 279.01, 1.8849e-1, 526.73, 0.0, 0.6617, 1.6173e+4),
-            rho_(60.92023144, 0.2582, 692.4, 0.26628),
-            pv_(249.21, -16915, -35.195, 0.028451, 1),
-            hl_(692.40, 455764.345336506, 0.428, 0, 0, 0),
-            cp_(2565.72845679261, -4.78114036856325, 0.0120362716238558, 0, 0, 0),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(-2690601.01887934, 2565.72845679261, -2.39057018428162, 0.00401209054128527, 0, 0),
-            cpg_(1134.11831122223, 3629.17859591113, -1440.3, 2275.29335860317, -682),
-            B_(0.00247837614419936, -2.62692044034034, -1427174.48284205, -1.68288035807895e+19, 3.48854792531957e+21),
-            mu_(-18.964, 2010.9, 1.0648, 0, 0),
-            mug_(4.4565e-08, 0.8684, 228.16, -4347.2),
-            K_(0.1957, -0.0001993, 0, 0, 0, 0),
-            Kg_(-0.000628, 0.944, -5490, 0),
-            sigma_(692.40, 0.056436, 1.3658, 0, 0, 0),
-            D_(147.18, 20.1, 198.392, 28) // NN: Same as nHeptane
-        {}
+        C14H30();
+
+        //- Construct from components
         C14H30
         (
             const liquid& l,
@@ -123,125 +106,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        C14H30(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        C14H30(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
-        //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        //- Liquid thermal conductivity [W/(m K)]
+        inline scalar K(scalar p, scalar T) const;
 
-        //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        //- Vapour thermal conductivity [W/(m K)]
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -260,9 +174,7 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const C14H30& l)
         {
             l.writeData(os);
@@ -277,6 +189,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "C14H30I.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C14H30/C14H30I.H b/src/thermophysicalModels/liquids/C14H30/C14H30I.H
new file mode 100644
index 0000000000..6c64cab8c4
--- /dev/null
+++ b/src/thermophysicalModels/liquids/C14H30/C14H30I.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::C14H30::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C14H30::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C14H30::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C14H30::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C14H30::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C14H30::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C14H30::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C14H30::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C14H30::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C14H30::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C14H30::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C14H30::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C14H30::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C16H34/C16H34.C b/src/thermophysicalModels/liquids/C16H34/C16H34.C
index 7c394c898b..af1a86a186 100644
--- a/src/thermophysicalModels/liquids/C16H34/C16H34.C
+++ b/src/thermophysicalModels/liquids/C16H34/C16H34.C
@@ -27,19 +27,124 @@ License
 #include "C16H34.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(C16H34, 0);
+    addToRunTimeSelectionTable(liquid, C16H34,);
+    addToRunTimeSelectionTable(liquid, C16H34, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(C16H34, 0);
-addToRunTimeSelectionTable(liquid, C16H34,);
-addToRunTimeSelectionTable(liquid, C16H34, Istream);
+Foam::C16H34::C16H34()
+:
+    liquid
+    (
+        226.446,
+        720.60,
+        1.4186e+6,
+        0.93,
+        0.22,
+        291.32,
+        8.7467e-2,
+        560.01,
+        0.0,
+        0.7471,
+        1.6052e+4
+    ),
+    rho_(61.94656776, 0.25442, 720.6, 0.3238),
+    pv_(233.1, -17346, -32.251, 0.02407, 1.0),
+    hl_(720.60, 430654.548987397, 0.4122, 0.0, 0.0, 0.0),
+    cp_
+    (
+        3769.90540791182,
+       -12.5871068599136,
+        0.0247211255663602,
+        0.0,
+        0.0,
+        0.0
+    ),
+    h_
+    (
+       -2777201.30410301,
+        3769.90540791182,
+       -6.29355342995681,
+        0.00824037518878673,
+        0.0,
+        0.0
+    ),
+    cpg_(1128.74592618108, 3600.8584828171, -1429.7, 2259.69988429913, 679.0),
+    B_
+    (
+        0.0025091191718997,
+       -2.46668079807106,
+       -1704070.72767901,
+       -3.00623548219001e+19,
+        7.07320950690231e+21
+    ),
+    mu_(-18.388, 2056.8, 0.98681, 0.0, 0.0),
+    mug_(1.2463e-07, 0.7322, 395.0, 6000.0),
+    K_(0.1963, -0.00019, 0.0, 0.0, 0.0, 0.0),
+    Kg_(3.075e-06, 1.552, 678.0, 0.0),
+    sigma_(720.60, 0.05699, 1.3929, 0.0, 0.0, 0.0),
+    D_(147.18, 20.1, 226.446, 28.0) // note: Same as nHeptane
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::C16H34::C16H34
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc0& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::C16H34::C16H34(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C16H34/C16H34.H b/src/thermophysicalModels/liquids/C16H34/C16H34.H
index 9cbc69541b..5f2b883163 100644
--- a/src/thermophysicalModels/liquids/C16H34/C16H34.H
+++ b/src/thermophysicalModels/liquids/C16H34/C16H34.H
@@ -87,26 +87,9 @@ public:
     // Constructors
 
         //- Construct null
-        C16H34()
-        :
-            liquid(226.446, 720.60, 1.4186e+6, 0.93, 0.22, 291.32, 8.7467e-2, 560.01, 0, 0.7471, 1.6052e+4),
-            rho_(61.94656776, 0.25442, 720.6, 0.3238),
-            pv_(233.1, -17346, -32.251, 0.02407, 1),
-            hl_(720.60, 430654.548987397, 0.4122, 0, 0, 0),
-            cp_(3769.90540791182, -12.5871068599136, 0.0247211255663602, 0, 0, 0),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(-2777201.30410301, 3769.90540791182, -6.29355342995681, 0.00824037518878673, 0, 0),
-            cpg_(1128.74592618108, 3600.8584828171, -1429.7, 2259.69988429913, 679),
-            B_(0.0025091191718997, -2.46668079807106, -1704070.72767901, -3.00623548219001e+19, 7.07320950690231e+21),
-            mu_(-18.388, 2056.8, 0.98681, 0, 0),
-            mug_(1.2463e-07, 0.7322, 395, 6000),
-            K_(0.1963, -0.00019, 0, 0, 0, 0),
-            Kg_(3.075e-06, 1.552, 678, 0),
-            sigma_(720.60, 0.05699, 1.3929, 0, 0, 0),
-            D_(147.18, 20.1, 226.446, 28) // NN: Same as nHeptane
-        {}
+        C16H34();
+
+        //- Construct from components
         C16H34
         (
             const liquid& l,
@@ -123,125 +106,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        C16H34(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        C16H34(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        inline scalar K(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -260,9 +174,7 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const C16H34& l)
         {
             l.writeData(os);
@@ -277,6 +189,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "C16H34I.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C16H34/C16H34I.H b/src/thermophysicalModels/liquids/C16H34/C16H34I.H
new file mode 100644
index 0000000000..66a19bb3d4
--- /dev/null
+++ b/src/thermophysicalModels/liquids/C16H34/C16H34I.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::C16H34::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C16H34::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C16H34::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C16H34::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C16H34::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C16H34::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C16H34::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C16H34::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C16H34::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C16H34::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C16H34::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C16H34::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C16H34::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.C b/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.C
index e5943b893e..c5bfbe37e4 100644
--- a/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.C
+++ b/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.C
@@ -27,19 +27,124 @@ License
 #include "C2H5OH.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(C2H5OH, 0);
+    addToRunTimeSelectionTable(liquid, C2H5OH,);
+    addToRunTimeSelectionTable(liquid, C2H5OH, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(C2H5OH, 0);
-addToRunTimeSelectionTable(liquid, C2H5OH,);
-addToRunTimeSelectionTable(liquid, C2H5OH, Istream);
+Foam::C2H5OH::C2H5OH()
+:
+    liquid
+    (
+        46.069,
+        516.25,
+        6.3835e+6,
+        0.16692,
+        0.248,
+        159.05,
+        7.1775e-5,
+        351.44,
+        5.6372e-30,
+        0.6371,
+        2.6421e+4
+    ),
+    rho_(70.1308387, 0.26395, 516.25, 0.2367),
+    pv_(59.796, -6595, -5.0474, 6.3e-07, 2),
+    hl_(516.25, 958345.091059064, -0.4134, 0.75362, 0.0, 0.0),
+    cp_
+    (
+        2052.57331394213,
+       -1.21990926653498,
+        0.00714146172046278,
+        5.20523562482363e-05,
+        0.0,
+        0.0
+    ),
+    h_
+    (
+       -6752827.25039109,
+        2052.57331394213,
+       -0.60995463326749,
+        0.00238048724015426,
+        1.30130890620591e-05,
+        0.0
+    ),
+    cpg_(909.505307256507, 3358.00646855803, 1530, 2029.56434912848, 640),
+    B_
+    (
+       -0.00358158414552085,
+        3.90718270420456,
+       -1180837.43949293,
+        9.81136990166923e+18,
+       -3.58592545963663e+21
+    ),
+    mu_(8.049, 776, -3.068, 0.0, 0.0),
+    mug_(1.0613e-07, 0.8066, 52.7, 0.0),
+    K_(0.253, -0.000281, 0.0, 0.0, 0.0, 0.0),
+    Kg_(-3.12, 0.7152, -3550000.0, 0.0),
+    sigma_(516.25, 0.04064, -4.34e-05, -6.42e-08, 0.0, 0.0),
+    D_(147.18, 20.1, 46.069, 28) // note: Same as nHeptane
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::C2H5OH::C2H5OH
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc0& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::C2H5OH::C2H5OH(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H b/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H
index 8e48670064..88a7099446 100644
--- a/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H
+++ b/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H
@@ -87,26 +87,9 @@ public:
     // Constructors
 
         //- Construct null
-        C2H5OH()
-        :
-            liquid(46.069, 516.25, 6.3835e+6, 0.16692, 0.248, 159.05, 7.1775e-5, 351.44, 5.6372e-30, 0.6371, 2.6421e+4),
-            rho_(70.1308387, 0.26395, 516.25, 0.2367),
-            pv_(59.796, -6595, -5.0474, 6.3e-07, 2),
-            hl_(516.25, 958345.091059064, -0.4134, 0.75362, 0, 0),
-            cp_(2052.57331394213, -1.21990926653498, 0.00714146172046278, 5.20523562482363e-05, 0, 0),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(-6752827.25039109, 2052.57331394213, -0.60995463326749, 0.00238048724015426, 1.30130890620591e-05, 0),
-            cpg_(909.505307256507, 3358.00646855803, 1530, 2029.56434912848, 640),
-            B_(-0.00358158414552085, 3.90718270420456, -1180837.43949293, 9.81136990166923e+18, -3.58592545963663e+21),
-            mu_(8.049, 776, -3.068, 0, 0),
-            mug_(1.0613e-07, 0.8066, 52.7, 0),
-            K_(0.253, -0.000281, 0, 0, 0, 0),
-            Kg_(-3.12, 0.7152, -3550000.0, 0),
-            sigma_(516.25, 0.04064, -4.34e-05, -6.42e-08, 0, 0),
-            D_(147.18, 20.1, 46.069, 28) // NN: Same as nHeptane
-        {}
+        C2H5OH();
+
+        //- Construct from components
         C2H5OH
         (
             const liquid& l,
@@ -123,125 +106,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        C2H5OH(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        C2H5OH(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        inline scalar K(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -260,9 +174,7 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const C2H5OH& l)
         {
             l.writeData(os);
@@ -277,6 +189,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "C2H5OHI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C2H5OH/C2H5OHI.H b/src/thermophysicalModels/liquids/C2H5OH/C2H5OHI.H
new file mode 100644
index 0000000000..cf051eea9c
--- /dev/null
+++ b/src/thermophysicalModels/liquids/C2H5OH/C2H5OHI.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::C2H5OH::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H5OH::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H5OH::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H5OH::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H5OH::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H5OH::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H5OH::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H5OH::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H5OH::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H5OH::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H5OH::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H5OH::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H5OH::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C2H6/C2H6.C b/src/thermophysicalModels/liquids/C2H6/C2H6.C
index 8859c637be..659144b764 100644
--- a/src/thermophysicalModels/liquids/C2H6/C2H6.C
+++ b/src/thermophysicalModels/liquids/C2H6/C2H6.C
@@ -27,19 +27,115 @@ License
 #include "C2H6.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(C2H6, 0);
+    addToRunTimeSelectionTable(liquid, C2H6,);
+    addToRunTimeSelectionTable(liquid, C2H6, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(C2H6, 0);
-addToRunTimeSelectionTable(liquid, C2H6,);
-addToRunTimeSelectionTable(liquid, C2H6, Istream);
+Foam::C2H6::C2H6()
+:
+    liquid
+    (
+        30.070,
+        305.32,
+        4.872e+6,
+        0.14550,
+        0.279,
+        90.35,
+        1.13,
+        184.55,
+        0.0,
+        0.0995,
+        1.24e+4
+    ),
+    rho_(57.499854, 0.27937, 305.32, 0.29187),
+    pv_(51.857, -2598.7, -5.1283, 1.4913e-05, 2.0),
+    hl_(305.32, 701396.740937812, 0.60646, -0.55492, 0.32799, 0.0),
+    cp_
+    (
+        305.32,
+        8.02554965861611,
+        2983.63817758563,
+        167.548325566287,
+       -343.93389207094
+    ),
+    h_(0.0, 0.0, 0.0, 0.0, 0.0, 0.0),
+    cpg_(1341.07083471899, 4463.58496840705, 1655.5, 2435.08480212837, 752.87),
+    B_
+    (
+        0.00269205187894912,
+       -2.05221150648487,
+       -47721.9820419022,
+        2.24808779514466e+15,
+       -3.23910874625873e+17
+    ),
+    mu_(-3.4134, 197.05, -1.2193, -9.2023e-26, 10.0),
+    mug_(2.5906e-07, 0.67988, 98.902, 0.0),
+    K_(0.35758, -0.0011458, 6.1866e-07, 0.0, 0.0, 0.0),
+    Kg_(7.3869e-05, 1.1689, 500.73, 0.0),
+    sigma_(305.32, 0.048643, 1.1981, 0.0, 0.0, 0.0),
+    D_(147.18, 20.1, 30.070, 28) // note: Same as nHeptane
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::C2H6::C2H6
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc14& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::C2H6::C2H6(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C2H6/C2H6.H b/src/thermophysicalModels/liquids/C2H6/C2H6.H
index 48200af590..728c362732 100644
--- a/src/thermophysicalModels/liquids/C2H6/C2H6.H
+++ b/src/thermophysicalModels/liquids/C2H6/C2H6.H
@@ -87,26 +87,9 @@ public:
     // Constructors
 
         //- Construct null
-        C2H6()
-        :
-            liquid(30.070, 305.32, 4.872e+6, 0.14550, 0.279, 90.35, 1.13, 184.55, 0.0, 0.0995, 1.24e+4),
-            rho_(57.499854, 0.27937, 305.32, 0.29187),
-            pv_(51.857, -2598.7, -5.1283, 1.4913e-05, 2),
-            hl_(305.32, 701396.740937812, 0.60646, -0.55492, 0.32799, 0),
-            cp_(305.32, 8.02554965861611, 2983.63817758563, 167.548325566287, -343.93389207094),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(0, 0, 0, 0, 0, 0),
-            cpg_(1341.07083471899, 4463.58496840705, 1655.5, 2435.08480212837, 752.87),
-            B_(0.00269205187894912, -2.05221150648487, -47721.9820419022, 2.24808779514466e+15, -3.23910874625873e+17),
-            mu_(-3.4134, 197.05, -1.2193, -9.2023e-26, 10),
-            mug_(2.5906e-07, 0.67988, 98.902, 0),
-            K_(0.35758, -0.0011458, 6.1866e-07, 0, 0, 0),
-            Kg_(7.3869e-05, 1.1689, 500.73, 0),
-            sigma_(305.32, 0.048643, 1.1981, 0, 0, 0),
-            D_(147.18, 20.1, 30.070, 28) // NN: Same as nHeptane
-        {}
+        C2H6();
+
+        //- Construct from components
         C2H6
         (
             const liquid& l,
@@ -123,125 +106,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        C2H6(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        C2H6(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        inline scalar K(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -260,9 +174,7 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const C2H6& l)
         {
             l.writeData(os);
@@ -277,6 +189,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "C2H6I.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C2H6/C2H6I.H b/src/thermophysicalModels/liquids/C2H6/C2H6I.H
new file mode 100644
index 0000000000..a788413b0e
--- /dev/null
+++ b/src/thermophysicalModels/liquids/C2H6/C2H6I.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::C2H6::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H6::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H6::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H6::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H6::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H6::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H6::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H6::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H6::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H6::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H6::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H6::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H6::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C2H6O/C2H6O.C b/src/thermophysicalModels/liquids/C2H6O/C2H6O.C
index d4de1a8c1b..8cc2a83df0 100644
--- a/src/thermophysicalModels/liquids/C2H6O/C2H6O.C
+++ b/src/thermophysicalModels/liquids/C2H6O/C2H6O.C
@@ -27,19 +27,124 @@ License
 #include "C2H6O.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(C2H6O, 0);
+    addToRunTimeSelectionTable(liquid, C2H6O,);
+    addToRunTimeSelectionTable(liquid, C2H6O, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(C2H6O, 0);
-addToRunTimeSelectionTable(liquid, C2H6O,);
-addToRunTimeSelectionTable(liquid, C2H6O, Istream);
+Foam::C2H6O::C2H6O()
+:
+    liquid
+    (
+        46.069,
+        400.10,
+        5.3702e+6,
+        0.17,
+        0.274,
+        131.65,
+        3.0849,
+        248.31,
+        4.3363e-30,
+        0.2036,
+        1.7572e+4
+    ),
+    rho_(69.472052, 0.26325, 400.1, 0.2806),
+    pv_(51.566, -3664.4, -4.653, 5.9e-06, 2),
+    hl_(400.10, 608435.173326966, 0.2477, -0.089, 0.203, 0),
+    cp_
+    (
+        1491.24139877141,
+        11.3099915344375,
+       -0.067273003538171,
+        0.000136556035511949,
+        0.0,
+        0.0
+    ),
+    h_
+    (
+       -5024829.22619402,
+        1491.24139877141,
+        5.65499576721874,
+       -0.0224243345127237,
+        3.41390088779874e-05,
+        0.0
+    ),
+    cpg_(950.747791356443, 3160.47667628991, 1284, 1291.5409494454, 520),
+    B_
+    (
+        0.00235082159369641,
+       -2.26616596843865,
+       -123293.320888233,
+       -8.87364605266014e+16,
+        1.46389111984198e+19
+    ),
+    mu_(-10.62, 448.99, 8.3967e-05, 0.0, 0.0),
+    mug_(7.27, 0.1091, 440600000, 0.0),
+    K_(0.31276, -0.0005677, 0.0, 0.0, 0.0, 0.0),
+    Kg_(0.2247, 0.1026, 997.06, 1762900),
+    sigma_(400.10, 0.06096, 1.2286, 0, 0, 0),
+    D_(147.18, 20.1, 46.069, 28) // note: Same as nHeptane
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::C2H6O::C2H6O
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc0& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::C2H6O::C2H6O(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C2H6O/C2H6O.H b/src/thermophysicalModels/liquids/C2H6O/C2H6O.H
index 8017e40437..690f68d9e4 100644
--- a/src/thermophysicalModels/liquids/C2H6O/C2H6O.H
+++ b/src/thermophysicalModels/liquids/C2H6O/C2H6O.H
@@ -87,26 +87,9 @@ public:
     // Constructors
 
         //- Construct null
-        C2H6O()
-        :
-            liquid(46.069, 400.10, 5.3702e+6, 0.17, 0.274, 131.65, 3.0849, 248.31, 4.3363e-30, 0.2036, 1.7572e+4),
-            rho_(69.472052, 0.26325, 400.1, 0.2806),
-            pv_(51.566, -3664.4, -4.653, 5.9e-06, 2),
-            hl_(400.10, 608435.173326966, 0.2477, -0.089, 0.203, 0),
-            cp_(1491.24139877141, 11.3099915344375, -0.067273003538171, 0.000136556035511949, 0, 0),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(-5024829.22619402, 1491.24139877141, 5.65499576721874, -0.0224243345127237, 3.41390088779874e-05, 0),
-            cpg_(950.747791356443, 3160.47667628991, 1284, 1291.5409494454, 520),
-            B_(0.00235082159369641, -2.26616596843865, -123293.320888233, -8.87364605266014e+16, 1.46389111984198e+19),
-            mu_(-10.62, 448.99, 8.3967e-05, 0, 0),
-            mug_(7.27, 0.1091, 440600000, 0),
-            K_(0.31276, -0.0005677, 0, 0, 0, 0),
-            Kg_(0.2247, 0.1026, 997.06, 1762900),
-            sigma_(400.10, 0.06096, 1.2286, 0, 0, 0),
-            D_(147.18, 20.1, 46.069, 28) // NN: Same as nHeptane
-        {}
+        C2H6O();
+
+        //- Construct from components
         C2H6O
         (
             const liquid& l,
@@ -123,125 +106,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        C2H6O(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        C2H6O(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        inline scalar K(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -260,9 +174,7 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const C2H6O& l)
         {
             l.writeData(os);
@@ -277,6 +189,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "C2H6OI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C2H6O/C2H6OI.H b/src/thermophysicalModels/liquids/C2H6O/C2H6OI.H
new file mode 100644
index 0000000000..5e2b7cadc7
--- /dev/null
+++ b/src/thermophysicalModels/liquids/C2H6O/C2H6OI.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::C2H6O::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H6O::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H6O::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H6O::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H6O::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H6O::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H6O::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H6O::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H6O::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H6O::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H6O::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H6O::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C2H6O::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C3H6O/C3H6O.C b/src/thermophysicalModels/liquids/C3H6O/C3H6O.C
index 9e128206ce..2e2b29b6e0 100644
--- a/src/thermophysicalModels/liquids/C3H6O/C3H6O.C
+++ b/src/thermophysicalModels/liquids/C3H6O/C3H6O.C
@@ -27,19 +27,124 @@ License
 #include "C3H6O.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(C3H6O, 0);
+    addToRunTimeSelectionTable(liquid, C3H6O,);
+    addToRunTimeSelectionTable(liquid, C3H6O, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(C3H6O, 0);
-addToRunTimeSelectionTable(liquid, C3H6O,);
-addToRunTimeSelectionTable(liquid, C3H6O, Istream);
+Foam::C3H6O::C3H6O()
+:
+    liquid
+    (
+        58.08,
+        508.20,
+        4.7015e+6,
+        0.209,
+        0.233,
+        178.45,
+        2.5938,
+        329.44,
+        9.6066e-30,
+        0.3064,
+        1.9774e+4
+    ),
+    rho_(71.426784, 0.2576, 508.2, 0.29903),
+    pv_(70.72, -5.685, -7.351, 6.3e-06, 2.0),
+    hl_(508.20, 846590.909090909, 1.036, -1.294, 0.672, 0.0),
+    cp_
+    (
+        2334.71074380165,
+       -3.04752066115702,
+        0.00488464187327824,
+        1.18629476584022e-05,
+        0.0,
+        0.0
+    ),
+    h_
+    (
+        2571201.780143,
+        2334.71074380165,
+       -1.52376033057851,
+        0.00162821395775941,
+        2.96573691460055e-06,
+        0.0
+    ),
+    cpg_(828.512396694215, 2830.57851239669, 1250.0, 1234.50413223141, -524.4),
+    B_
+    (
+        0.00190599173553719,
+       -1.70798898071625,
+       -525826.446280992,
+        1.70282369146006e+17,
+       -2.83298898071625e+20
+    ),
+    mu_(-14.918, 1023.4, 0.5961, 0.0, 0.0),
+    mug_(3.1005e-08, 0.9762, 23.139, 0.0),
+    K_(0.2502, -0.000298, 0.0, 0.0, 0.0, 0.0),
+    Kg_(-26.8, 0.9098, -126500000, 0.0),
+    sigma_(508.20, 0.0622, 1.124, 0.0, 0.0, 0.0),
+    D_(147.18, 20.1, 58.08, 28) // note: Same as nHeptane
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::C3H6O::C3H6O
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc0& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::C3H6O::C3H6O(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C3H6O/C3H6O.H b/src/thermophysicalModels/liquids/C3H6O/C3H6O.H
index 86cb9c5998..b08db3fc0b 100644
--- a/src/thermophysicalModels/liquids/C3H6O/C3H6O.H
+++ b/src/thermophysicalModels/liquids/C3H6O/C3H6O.H
@@ -87,26 +87,9 @@ public:
     // Constructors
 
         //- Construct null
-        C3H6O()
-        :
-            liquid(58.08, 508.20, 4.7015e+6, 0.209, 0.233, 178.45, 2.5938, 329.44, 9.6066e-30, 0.3064, 1.9774e+4),
-            rho_(71.426784, 0.2576, 508.2, 0.29903),
-            pv_(70.72, -5.685, -7.351, 6.3e-06, 2),
-            hl_(508.20, 846590.909090909, 1.036, -1.294, 0.672, 0),
-            cp_(2334.71074380165, -3.04752066115702, 0.00488464187327824, 1.18629476584022e-05, 0, 0),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(2571201.780143, 2334.71074380165, -1.52376033057851, 0.00162821395775941, 2.96573691460055e-06, 0),
-            cpg_(828.512396694215, 2830.57851239669, 1250, 1234.50413223141, -524.4),
-            B_(0.00190599173553719, -1.70798898071625, -525826.446280992, 1.70282369146006e+17, -2.83298898071625e+20),
-            mu_(-14.918, 1023.4, 0.5961, 0, 0),
-            mug_(3.1005e-08, 0.9762, 23.139, 0),
-            K_(0.2502, -0.000298, 0, 0, 0, 0),
-            Kg_(-26.8, 0.9098, -126500000, 0),
-            sigma_(508.20, 0.0622, 1.124, 0, 0, 0),
-            D_(147.18, 20.1, 58.08, 28) // NN: Same as nHeptane
-        {}
+        C3H6O();
+
+        //- Construct from compoents
         C3H6O
         (
             const liquid& l,
@@ -123,125 +106,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        C3H6O(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        C3H6O(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        inline scalar K(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -260,8 +174,7 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
-    // Ostream Operator
+        //- Ostream Operator
 
         friend Ostream& operator<<(Ostream& os, const C3H6O& l)
         {
@@ -277,6 +190,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "C3H6OI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C3H6O/C3H6OI.H b/src/thermophysicalModels/liquids/C3H6O/C3H6OI.H
new file mode 100644
index 0000000000..a02afbde38
--- /dev/null
+++ b/src/thermophysicalModels/liquids/C3H6O/C3H6OI.H
@@ -0,0 +1,104 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::C3H6O::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C3H6O::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C3H6O::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C3H6O::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C3H6O::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C3H6O::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C3H6O::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C3H6O::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C3H6O::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C3H6O::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C3H6O::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C3H6O::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C3H6O::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C3H8/C3H8.C b/src/thermophysicalModels/liquids/C3H8/C3H8.C
index 6293a16b52..936af6e463 100644
--- a/src/thermophysicalModels/liquids/C3H8/C3H8.C
+++ b/src/thermophysicalModels/liquids/C3H8/C3H8.C
@@ -27,19 +27,113 @@ License
 #include "C3H8.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(C3H8, 0);
+    addToRunTimeSelectionTable(liquid, C3H8,);
+    addToRunTimeSelectionTable(liquid, C3H8, Istream);
+}
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+Foam::C3H8::C3H8()
+:
+    liquid
+    (
+        44.096,
+        369.83,
+        4.248e+6,
+        0.2, 0.276,
+        85.47,
+        1.685e-4,
+        231.11,
+        0.0,
+        0.1523,
+        1.31e+4
+    ),
+    rho_(60.6628672, 0.27453, 369.83, 0.29359),
+    pv_(59.078, -3492.6, -6.0669, 1.0919e-05, 2.0),
+    hl_(369.83, 662395.682148041, 0.78237, -0.77319, 0.39246, 0.0),
+    cp_
+    (
+        369.83,
+        9.48470319647089,
+        2576.87772133527,
+        95.3560311677331,
+       -131.535634282099
+    ),
+    h_(0.0, 0.0, 0.0, 0.0, 0.0, 0.0),
+    cpg_(1177.43105950653, 4364.34143686502, 1626.5, 2648.76632801161, 723.6),
+    B_
+    (
+        0.00255578737300435,
+       -2.24963715529753,
+       -102276.850507983,
+        7.00743831640058e+15,
+       -1.59878447024673e+18
+    ),
+    mu_(-6.9281, 420.76, -0.63276, -1.713e-26, 10.0),
+    mug_(2.4993e-07, 0.68612, 179.34, -8254.6),
+    K_(0.26755, -0.00066457, 2.774e-07, 0.0, 0.0, 0.0),
+    Kg_(-1.12, 0.10972, -9834.6, -7535800),
+    sigma_(369.83, 0.05092, 1.2197, 0.0, 0.0, 0.0),
+    D_(147.18, 20.1, 44.096, 28) // note: Same as nHeptane
+{}
 
-defineTypeNameAndDebug(C3H8, 0);
-addToRunTimeSelectionTable(liquid, C3H8,);
-addToRunTimeSelectionTable(liquid, C3H8, Istream);
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+Foam::C3H8::C3H8
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc14& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::C3H8::C3H8(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
 
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C3H8/C3H8.H b/src/thermophysicalModels/liquids/C3H8/C3H8.H
index 878ea72ad1..27477b01c6 100644
--- a/src/thermophysicalModels/liquids/C3H8/C3H8.H
+++ b/src/thermophysicalModels/liquids/C3H8/C3H8.H
@@ -87,26 +87,9 @@ public:
     // Constructors
 
         //- Construct null
-        C3H8()
-        :
-            liquid(44.096, 369.83, 4.248e+6, 0.2, 0.276, 85.47, 1.685e-4, 231.11, 0.0, 0.1523, 1.31e+4),
-            rho_(60.6628672, 0.27453, 369.83, 0.29359),
-            pv_(59.078, -3492.6, -6.0669, 1.0919e-05, 2),
-            hl_(369.83, 662395.682148041, 0.78237, -0.77319, 0.39246, 0),
-            cp_(369.83, 9.48470319647089, 2576.87772133527, 95.3560311677331, -131.535634282099),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(0, 0, 0, 0, 0, 0),
-            cpg_(1177.43105950653, 4364.34143686502, 1626.5, 2648.76632801161, 723.6),
-            B_(0.00255578737300435, -2.24963715529753, -102276.850507983, 7.00743831640058e+15, -1.59878447024673e+18),
-            mu_(-6.9281, 420.76, -0.63276, -1.713e-26, 10),
-            mug_(2.4993e-07, 0.68612, 179.34, -8254.6),
-            K_(0.26755, -0.00066457, 2.774e-07, 0, 0, 0),
-            Kg_(-1.12, 0.10972, -9834.6, -7535800),
-            sigma_(369.83, 0.05092, 1.2197, 0, 0, 0),
-            D_(147.18, 20.1, 44.096, 28) // NN: Same as nHeptane
-        {}
+        C3H8();
+
+        //- Construct from components
         C3H8
         (
             const liquid& l,
@@ -123,125 +106,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        C3H8(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        C3H8(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        inline scalar K(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -260,9 +174,7 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const C3H8& l)
         {
             l.writeData(os);
@@ -277,6 +189,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "C3H8I.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C3H8/C3H8I.H b/src/thermophysicalModels/liquids/C3H8/C3H8I.H
new file mode 100644
index 0000000000..7ba1f47a74
--- /dev/null
+++ b/src/thermophysicalModels/liquids/C3H8/C3H8I.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::C3H8::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C3H8::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C3H8::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C3H8::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C3H8::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C3H8::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C3H8::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C3H8::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C3H8::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C3H8::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C3H8::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C3H8::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C3H8::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C4H10O/C4H10O.C b/src/thermophysicalModels/liquids/C4H10O/C4H10O.C
index 330dbf21c2..83a7dd2aa6 100644
--- a/src/thermophysicalModels/liquids/C4H10O/C4H10O.C
+++ b/src/thermophysicalModels/liquids/C4H10O/C4H10O.C
@@ -27,19 +27,124 @@ License
 #include "C4H10O.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(C4H10O, 0);
+    addToRunTimeSelectionTable(liquid, C4H10O,);
+    addToRunTimeSelectionTable(liquid, C4H10O, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(C4H10O, 0);
-addToRunTimeSelectionTable(liquid, C4H10O,);
-addToRunTimeSelectionTable(liquid, C4H10O, Istream);
+Foam::C4H10O::C4H10O()
+:
+    liquid
+    (
+        74.123,
+        466.70,
+        3.6376e+6,
+        0.28,
+        0.262,
+        156.85,
+        4.0709e-1,
+        307.58,
+        3.836e-30,
+        0.2846,
+        1.5532e+4
+    ),
+    rho_(75.2793188, 0.27608, 466.7, 0.29358),
+    pv_(101.03, -6311.5, -12.27, 1.377e-05, 2),
+    hl_(466.70, 566355.921913576, 0.40717, 0, 0, 0),
+    cp_
+    (
+        599.004357621791,
+        17.5519069654493,
+       -0.0742009902459426,
+        0.00011822241409549,
+        0.0,
+        0.0
+    ),
+    h_
+    (
+       -4312350.92187216,
+        599.004357621791,
+        8.77595348272466,
+       -0.0247336634153142,
+        2.95556035238725e-05,
+        0.0
+    ),
+    cpg_(1163.06679438231, 3441.57683849817, 1541.3, 1938.66950878944, -688.9),
+    B_
+    (
+        0.00215992337061371,
+       -1.810504162001,
+       -276972.0599544,
+       -2.12349742994752e+17,
+        3.1016013922804e+19
+    ),
+    mu_(10.197, -63.8, -3.226, 0.0, 0.0),
+    mug_(1.948e-06, 0.41, 495.8, 0.0),
+    K_(0.249, -0.0004005, 0.0, 0.0, 0.0, 0.0),
+    Kg_(-0.0044894, 0.6155, -3266.3, 0.0),
+    sigma_(466.70, 0.057356, 1.288, 0.0, 0.0, 0.0),
+    D_(147.18, 20.1, 74.123, 28) // note: Same as nHeptane
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::C4H10O::C4H10O
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc0& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::C4H10O::C4H10O(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C4H10O/C4H10O.H b/src/thermophysicalModels/liquids/C4H10O/C4H10O.H
index 1c9257ea64..b2da446849 100644
--- a/src/thermophysicalModels/liquids/C4H10O/C4H10O.H
+++ b/src/thermophysicalModels/liquids/C4H10O/C4H10O.H
@@ -87,26 +87,9 @@ public:
     // Constructors
 
         //- Construct null
-        C4H10O()
-        :
-            liquid(74.123, 466.70, 3.6376e+6, 0.28, 0.262, 156.85, 4.0709e-1, 307.58, 3.836e-30, 0.2846, 1.5532e+4),
-            rho_(75.2793188, 0.27608, 466.7, 0.29358),
-            pv_(101.03, -6311.5, -12.27, 1.377e-05, 2),
-            hl_(466.70, 566355.921913576, 0.40717, 0, 0, 0),
-            cp_(599.004357621791, 17.5519069654493, -0.0742009902459426, 0.00011822241409549, 0, 0),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(-4312350.92187216, 599.004357621791, 8.77595348272466, -0.0247336634153142, 2.95556035238725e-05, 0),
-            cpg_(1163.06679438231, 3441.57683849817, 1541.3, 1938.66950878944, -688.9),
-            B_(0.00215992337061371, -1.810504162001, -276972.0599544, -2.12349742994752e+17, 3.1016013922804e+19),
-            mu_(10.197, -63.8, -3.226, 0, 0),
-            mug_(1.948e-06, 0.41, 495.8, 0),
-            K_(0.249, -0.0004005, 0, 0, 0, 0),
-            Kg_(-0.0044894, 0.6155, -3266.3, 0),
-            sigma_(466.70, 0.057356, 1.288, 0, 0, 0),
-            D_(147.18, 20.1, 74.123, 28) // NN: Same as nHeptane
-        {}
+        C4H10O();
+
+        //- Construct from components
         C4H10O
         (
             const liquid& l,
@@ -123,125 +106,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        C4H10O(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        C4H10O(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        inline scalar K(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -260,9 +174,7 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const C4H10O& l)
         {
             l.writeData(os);
@@ -277,6 +189,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "C4H10OI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C4H10O/C4H10OI.H b/src/thermophysicalModels/liquids/C4H10O/C4H10OI.H
new file mode 100644
index 0000000000..bc067ebaff
--- /dev/null
+++ b/src/thermophysicalModels/liquids/C4H10O/C4H10OI.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::C4H10O::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C4H10O::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C4H10O::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C4H10O::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C4H10O::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C4H10O::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C4H10O::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C4H10O::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C4H10O::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C4H10O::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C4H10O::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C4H10O::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C4H10O::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C6H14/C6H14.C b/src/thermophysicalModels/liquids/C6H14/C6H14.C
index d78e28c0df..6e82c98871 100644
--- a/src/thermophysicalModels/liquids/C6H14/C6H14.C
+++ b/src/thermophysicalModels/liquids/C6H14/C6H14.C
@@ -27,19 +27,124 @@ License
 #include "C6H14.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(C6H14, 0);
+    addToRunTimeSelectionTable(liquid, C6H14,);
+    addToRunTimeSelectionTable(liquid, C6H14, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(C6H14, 0);
-addToRunTimeSelectionTable(liquid, C6H14,);
-addToRunTimeSelectionTable(liquid, C6H14, Istream);
+Foam::C6H14::C6H14()
+:
+    liquid
+    (
+        86.177,
+        507.60,
+        3.025e+6,
+        0.371,
+        0.266,
+        177.83,
+        9.017e-1,
+        341.88,
+        0.0,
+        0.3013,
+        1.49e+4
+    ),
+    rho_(61.03399848, 0.26411, 507.6, 0.27537),
+    pv_(104.65, -6995.5, -12.702, 1.2381e-05, 2.0),
+    hl_(507.60, 527286.863084118, 0.39002, 0.0, 0.0, 0.0),
+    cp_
+    (
+        1997.28465831951,
+       -2.13258758137322,
+        0.0102964828202421,
+        0.0,
+        0.0,
+        0.0
+    ),
+    h_
+    (
+       -2902186.5403246,
+        1997.28465831951,
+       -1.06629379068661,
+        0.00343216094008069,
+        0.0,
+        0.0
+    ),
+    cpg_(1211.4601343746, 4088.0977523005, 1694.6, 2748.99335089409, 761.6),
+    B_
+    (
+        0.0022859927822969,
+       -2.32080485512376,
+       -430509.300625457,
+        1.93787205402834e+17,
+       -7.17128700233241e+19
+    ),
+    mu_(-20.715, 1207.5, 1.4993, 0.0, 0.0),
+    mug_(1.7514e-07, 0.70737, 157.14, 0.0),
+    K_(0.22492, -0.0003533, 0.0, 0.0, 0.0, 0.0),
+    Kg_(-650.5, 0.8053, -1412100000, 0.0),
+    sigma_(507.60, 0.055003, 1.2674, 0.0, 0.0, 0.0),
+    D_(147.18, 20.1, 86.177, 28) // note: Same as nHeptane
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::C6H14::C6H14
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc0& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::C6H14::C6H14(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C6H14/C6H14.H b/src/thermophysicalModels/liquids/C6H14/C6H14.H
index 46f1c0766c..919d68bfd6 100644
--- a/src/thermophysicalModels/liquids/C6H14/C6H14.H
+++ b/src/thermophysicalModels/liquids/C6H14/C6H14.H
@@ -87,26 +87,9 @@ public:
     // Constructors
 
         //- Construct null
-        C6H14()
-        :
-            liquid(86.177, 507.60, 3.025e+6, 0.371, 0.266, 177.83, 9.017e-1, 341.88, 0.0, 0.3013, 1.49e+4),
-            rho_(61.03399848, 0.26411, 507.6, 0.27537),
-            pv_(104.65, -6995.5, -12.702, 1.2381e-05, 2),
-            hl_(507.60, 527286.863084118, 0.39002, 0, 0, 0),
-            cp_(1997.28465831951, -2.13258758137322, 0.0102964828202421, 0, 0, 0),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(-2902186.5403246, 1997.28465831951, -1.06629379068661, 0.00343216094008069, 0, 0),
-            cpg_(1211.4601343746, 4088.0977523005, 1694.6, 2748.99335089409, 761.6),
-            B_(0.0022859927822969, -2.32080485512376, -430509.300625457, 1.93787205402834e+17, -7.17128700233241e+19),
-            mu_(-20.715, 1207.5, 1.4993, 0, 0),
-            mug_(1.7514e-07, 0.70737, 157.14, 0),
-            K_(0.22492, -0.0003533, 0, 0, 0, 0),
-            Kg_(-650.5, 0.8053, -1412100000, 0),
-            sigma_(507.60, 0.055003, 1.2674, 0, 0, 0),
-            D_(147.18, 20.1, 86.177, 28) // NN: Same as nHeptane
-        {}
+        C6H14();
+
+        //- Construct from components
         C6H14
         (
             const liquid& l,
@@ -123,125 +106,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        C6H14(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        C6H14(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        inline scalar K(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -260,9 +174,7 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const C6H14& l)
         {
             l.writeData(os);
@@ -277,6 +189,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "C6H14I.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C6H14/C6H14I.H b/src/thermophysicalModels/liquids/C6H14/C6H14I.H
new file mode 100644
index 0000000000..144648c0a7
--- /dev/null
+++ b/src/thermophysicalModels/liquids/C6H14/C6H14I.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::C6H14::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C6H14::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C6H14::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C6H14::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C6H14::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C6H14::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C6H14::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C6H14::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C6H14::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C6H14::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C6H14::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C6H14::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C6H14::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C6H6/C6H6.C b/src/thermophysicalModels/liquids/C6H6/C6H6.C
index 3e17819e6a..4b3abbd24d 100644
--- a/src/thermophysicalModels/liquids/C6H6/C6H6.C
+++ b/src/thermophysicalModels/liquids/C6H6/C6H6.C
@@ -27,19 +27,124 @@ License
 #include "C6H6.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(C6H6, 0);
+    addToRunTimeSelectionTable(liquid, C6H6,);
+    addToRunTimeSelectionTable(liquid, C6H6, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(C6H6, 0);
-addToRunTimeSelectionTable(liquid, C6H6,);
-addToRunTimeSelectionTable(liquid, C6H6, Istream);
+Foam::C6H6::C6H6()
+:
+    liquid
+    (
+        78.114,
+        562.16,
+        4.898e+6,
+        0.25894,
+        0.271,
+        278.68,
+        4.7961e+3,
+        353.24,
+        0.0,
+        0.2108,
+        1.8706e+4
+    ),
+    rho_(80.5511568, 0.2667, 562.16, 0.2818),
+    pv_(78.05, -6275.5, -8.4443, 6.26e-06, 2),
+    hl_(562.16, 649435.440510024, 0.7616, -0.5052, 0.1564, 0),
+    cp_
+    (
+        1386.69124612745,
+       -0.416058581048212,
+        0.00542796425736744,
+        0.0,
+        0.0,
+        0.0
+    ),
+    h_
+    (
+        186141.395065592,
+        1386.69124612745,
+       -0.208029290524106,
+        0.00180932141912248,
+        0.0,
+        0.0
+    ),
+    cpg_(568.656066774202, 2970.65826868423, 1494.6, 2203.57426325627, -678.15),
+    B_
+    (
+        0.00184089919860716,
+       -2.30176408838364,
+       -309176.332027549,
+       -5.12072099751645e+15,
+       -2.90216862534245e+19
+    ),
+    mu_(6.764, 336.4, -2.687, 0.0, 0.0),
+    mug_(3.134e-08, 0.9676, 7.9, 0.0),
+    K_(0.2407, -0.0003202, 0.0, 0.0, 0.0, 0.0),
+    Kg_(1.652e-05, 1.3117, 491, 0.0),
+    sigma_(562.16, 0.07195, 1.2389, 0.0, 0.0, 0.0),
+    D_(147.18, 20.1, 78.114, 28) // note: Same as nHeptane
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::C6H6::C6H6
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc0& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::C6H6::C6H6(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C6H6/C6H6.H b/src/thermophysicalModels/liquids/C6H6/C6H6.H
index 58b04a2939..cc9c5ac1f1 100644
--- a/src/thermophysicalModels/liquids/C6H6/C6H6.H
+++ b/src/thermophysicalModels/liquids/C6H6/C6H6.H
@@ -87,26 +87,9 @@ public:
     // Constructors
 
         //- Construct null
-        C6H6()
-        :
-            liquid(78.114, 562.16, 4.898e+6, 0.25894, 0.271, 278.68, 4.7961e+3, 353.24, 0.0, 0.2108, 1.8706e+4),
-            rho_(80.5511568, 0.2667, 562.16, 0.2818),
-            pv_(78.05, -6275.5, -8.4443, 6.26e-06, 2),
-            hl_(562.16, 649435.440510024, 0.7616, -0.5052, 0.1564, 0),
-            cp_(1386.69124612745, -0.416058581048212, 0.00542796425736744, 0, 0, 0),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(186141.395065592, 1386.69124612745, -0.208029290524106, 0.00180932141912248, 0, 0),
-            cpg_(568.656066774202, 2970.65826868423, 1494.6, 2203.57426325627, -678.15),
-            B_(0.00184089919860716, -2.30176408838364, -309176.332027549, -5.12072099751645e+15, -2.90216862534245e+19),
-            mu_(6.764, 336.4, -2.687, 0, 0),
-            mug_(3.134e-08, 0.9676, 7.9, 0),
-            K_(0.2407, -0.0003202, 0, 0, 0, 0),
-            Kg_(1.652e-05, 1.3117, 491, 0),
-            sigma_(562.16, 0.07195, 1.2389, 0, 0, 0),
-            D_(147.18, 20.1, 78.114, 28) // NN: Same as nHeptane
-        {}
+        C6H6();
+
+        //- Comstruct from components
         C6H6
         (
             const liquid& l,
@@ -123,125 +106,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        C6H6(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        C6H6(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
-        //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        //- Liquid thermal conductivity [W/(m K)]
+        inline scalar K(scalar p, scalar T) const;
 
-        //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        //- Vapour thermal conductivity [W/(m K)]
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -260,9 +174,7 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const C6H6& l)
         {
             l.writeData(os);
@@ -277,6 +189,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "C6H6I.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C6H6/C6H6I.H b/src/thermophysicalModels/liquids/C6H6/C6H6I.H
new file mode 100644
index 0000000000..3aca0ee525
--- /dev/null
+++ b/src/thermophysicalModels/liquids/C6H6/C6H6I.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::C6H6::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C6H6::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C6H6::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C6H6::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C6H6::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C6H6::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C6H6::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C6H6::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C6H6::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C6H6::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C6H6::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C6H6::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C6H6::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C7H16/C7H16.C b/src/thermophysicalModels/liquids/C7H16/C7H16.C
index 0cc7e69f0a..846671927b 100644
--- a/src/thermophysicalModels/liquids/C7H16/C7H16.C
+++ b/src/thermophysicalModels/liquids/C7H16/C7H16.C
@@ -27,19 +27,115 @@ License
 #include "C7H16.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(C7H16, 0);
+    addToRunTimeSelectionTable(liquid, C7H16,);
+    addToRunTimeSelectionTable(liquid, C7H16, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(C7H16, 0);
-addToRunTimeSelectionTable(liquid, C7H16,);
-addToRunTimeSelectionTable(liquid, C7H16, Istream);
+Foam::C7H16::C7H16()
+:
+    liquid
+    (
+        100.204,
+        540.20,
+        2.74e+6,
+        0.428,
+        0.261,
+        182.57,
+        1.8269e-1,
+        371.58,
+        0.0,
+        0.3495,
+        1.52e+4
+    ),
+    rho_(61.38396836, 0.26211, 540.2, 0.28141),
+    pv_(87.829, -6996.4, -9.8802, 7.2099e-06, 2.0),
+    hl_(540.20, 499121.791545248, 0.38795, 0.0, 0.0, 0.0),
+    cp_
+    (
+        540.20,
+        6.11976102401216,
+        3137.69909384855,
+        182.274175063868,
+       -254.530511150515
+    ),
+    h_(-3.1469964e+6,7.3072e+3,-3.52884e+1,1.10637e-1,-1.634831e-4,9.64941e-8),
+    cpg_(1199.05392998284, 3992.85457666361, 1676.6, 2734.42177956968, 756.4),
+    B_
+    (
+        0.00274040956448844,
+       -2.90407568560137,
+       -440900.562851782,
+       -8.78208454752305e+17,
+        1.28238393676899e+20
+    ),
+    mu_(-24.451, 1533.1, 2.0087, 0.0, 0.0),
+    mug_(6.672e-08, 0.82837, 85.752, 0.0),
+    K_(0.215, -0.000303, 0.0, 0.0, 0.0, 0.0),
+    Kg_(-0.070028, 0.38068, -7049.9, -2400500.0),
+    sigma_(540.20, 0.054143, 1.2512, 0.0, 0.0, 0.0),
+    D_(147.18, 20.1, 100.204, 28.0) // note: Same as C7H16
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::C7H16::C7H16
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc14& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::C7H16::C7H16(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C7H16/C7H16.H b/src/thermophysicalModels/liquids/C7H16/C7H16.H
index 64264aebfb..617cffb04b 100644
--- a/src/thermophysicalModels/liquids/C7H16/C7H16.H
+++ b/src/thermophysicalModels/liquids/C7H16/C7H16.H
@@ -87,26 +87,9 @@ public:
     // Constructors
 
         //- Construct null
-        C7H16()
-        :
-            liquid(100.204, 540.20, 2.74e+6, 0.428, 0.261, 182.57, 1.8269e-1, 371.58, 0, 0.3495, 1.52e+4),
-            rho_(61.38396836, 0.26211, 540.2, 0.28141),
-            pv_(87.829, -6996.4, -9.8802, 7.2099e-06, 2),
-            hl_(540.20, 499121.791545248, 0.38795, 0, 0, 0),
-            cp_(540.20, 6.11976102401216, 3137.69909384855, 182.274175063868, -254.530511150515),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(-3.1469964e+6,7.3072e+3,-3.52884e+1,1.10637e-1,-1.634831e-4,9.64941e-8),
-            cpg_(1199.05392998284, 3992.85457666361, 1676.6, 2734.42177956968, 756.4),
-            B_(0.00274040956448844, -2.90407568560137, -440900.562851782, -8.78208454752305e+17, 1.28238393676899e+20),
-            mu_(-24.451, 1533.1, 2.0087, 0, 0),
-            mug_(6.672e-08, 0.82837, 85.752, 0),
-            K_(0.215, -0.000303, 0, 0, 0, 0),
-            Kg_(-0.070028, 0.38068, -7049.9, -2400500),
-            sigma_(540.20, 0.054143, 1.2512, 0, 0, 0),
-            D_(147.18, 20.1, 100.204, 28) // NN: Same as C7H16
-        {}
+        C7H16();
+
+        //- Construct from components
         C7H16
         (
             const liquid& l,
@@ -123,125 +106,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        C7H16(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        C7H16(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        inline scalar K(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -260,9 +174,7 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const C7H16& l)
         {
             l.writeData(os);
@@ -277,6 +189,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "C7H16I.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C7H16/C7H16I.H b/src/thermophysicalModels/liquids/C7H16/C7H16I.H
new file mode 100644
index 0000000000..27eb0761e1
--- /dev/null
+++ b/src/thermophysicalModels/liquids/C7H16/C7H16I.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::C7H16::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C7H16::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C7H16::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C7H16::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C7H16::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C7H16::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C7H16::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C7H16::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C7H16::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C7H16::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C7H16::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C7H16::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C7H16::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C7H8/C7H8.C b/src/thermophysicalModels/liquids/C7H8/C7H8.C
index cfa8bda4b7..9d58afe014 100644
--- a/src/thermophysicalModels/liquids/C7H8/C7H8.C
+++ b/src/thermophysicalModels/liquids/C7H8/C7H8.C
@@ -27,19 +27,124 @@ License
 #include "C7H8.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(C7H8, 0);
+    addToRunTimeSelectionTable(liquid, C7H8,);
+    addToRunTimeSelectionTable(liquid, C7H8, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(C7H8, 0);
-addToRunTimeSelectionTable(liquid, C7H8,);
-addToRunTimeSelectionTable(liquid, C7H8, Istream);
+Foam::C7H8::C7H8()
+:
+    liquid
+    (
+        92.141,
+        591.79,
+        4.1086e+6,
+        0.31579,
+        0.264,
+        178.18,
+        4.1009e-2,
+        383.78,
+        1.2008e-30,
+        0.2641,
+        1.8346e+4
+    ),
+    rho_(81.32088237, 0.27108, 591.79, 0.29889),
+    pv_(83.359, -6995, -9.1635, 6.225e-06, 2.0),
+    hl_(591.79, 544383.065085033, 0.3834, 0.0, 0.0, 0.0),
+    cp_
+    (
+        2066.83235476064,
+       -8.14664481609707,
+        0.0322581695445024,
+       -3.01223125427334e-05,
+        0.0,
+        0.0
+    ),
+    h_
+    (
+       -353094.830249075,
+        2066.83235476064,
+       -4.07332240804853,
+        0.0107527231815008,
+       -7.53057813568336e-06,
+        0.0
+    ),
+    cpg_(630.989461803106, 3107.19440856947, 1440.6, 2059.88647833212, -650.43),
+    B_
+    (
+        0.00191120131103418,
+       -2.24970425760519,
+       -482293.441573241,
+       -7.62309938029759e+17,
+        1.00986531511488e+20
+    ),
+    mu_(-13.362, 1183, 0.333, 0.0, 0.0),
+    mug_(2.919e-08, 0.9648, 0.0, 0.0),
+    K_(0.2043, -0.000239, 0.0, 0.0, 0.0, 0.0),
+    Kg_(2.392e-05, 1.2694, 537, 0.0),
+    sigma_(591.79, 0.06685, 1.2456, 0.0, 0.0, 0.0),
+    D_(147.18, 20.1, 92.141, 28) // note: Same as nHeptane
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::C7H8::C7H8
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc0& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::C7H8::C7H8(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C7H8/C7H8.H b/src/thermophysicalModels/liquids/C7H8/C7H8.H
index 1e8e6ac734..8d0afcf8cb 100644
--- a/src/thermophysicalModels/liquids/C7H8/C7H8.H
+++ b/src/thermophysicalModels/liquids/C7H8/C7H8.H
@@ -87,26 +87,9 @@ public:
     // Constructors
 
         //- Construct null
-        C7H8()
-        :
-            liquid(92.141, 591.79, 4.1086e+6, 0.31579, 0.264, 178.18, 4.1009e-2, 383.78, 1.2008e-30, 0.2641, 1.8346e+4),
-            rho_(81.32088237, 0.27108, 591.79, 0.29889),
-            pv_(83.359, -6995, -9.1635, 6.225e-06, 2),
-            hl_(591.79, 544383.065085033, 0.3834, 0, 0, 0),
-            cp_(2066.83235476064, -8.14664481609707, 0.0322581695445024, -3.01223125427334e-05, 0, 0),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(-353094.830249075, 2066.83235476064, -4.07332240804853, 0.0107527231815008, -7.53057813568336e-06, 0),
-            cpg_(630.989461803106, 3107.19440856947, 1440.6, 2059.88647833212, -650.43),
-            B_(0.00191120131103418, -2.24970425760519, -482293.441573241, -7.62309938029759e+17, 1.00986531511488e+20),
-            mu_(-13.362, 1183, 0.333, 0, 0),
-            mug_(2.919e-08, 0.9648, 0, 0),
-            K_(0.2043, -0.000239, 0, 0, 0, 0),
-            Kg_(2.392e-05, 1.2694, 537, 0),
-            sigma_(591.79, 0.06685, 1.2456, 0, 0, 0),
-            D_(147.18, 20.1, 92.141, 28) // NN: Same as nHeptane
-        {}
+        C7H8();
+
+        //- Construct from components
         C7H8
         (
             const liquid& l,
@@ -123,125 +106,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        C7H8(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        C7H8(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        inline scalar K(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -260,9 +174,7 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const C7H8& l)
         {
             l.writeData(os);
@@ -277,6 +189,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "C7H8I.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C7H8/C7H8I.H b/src/thermophysicalModels/liquids/C7H8/C7H8I.H
new file mode 100644
index 0000000000..02813a18f8
--- /dev/null
+++ b/src/thermophysicalModels/liquids/C7H8/C7H8I.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::C7H8::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C7H8::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C7H8::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C7H8::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C7H8::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C7H8::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C7H8::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C7H8::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C7H8::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C7H8::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C7H8::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C7H8::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C7H8::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C8H10/C8H10.C b/src/thermophysicalModels/liquids/C8H10/C8H10.C
index 7b0bbede52..09263031d6 100644
--- a/src/thermophysicalModels/liquids/C8H10/C8H10.C
+++ b/src/thermophysicalModels/liquids/C8H10/C8H10.C
@@ -27,19 +27,124 @@ License
 #include "C8H10.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(C8H10, 0);
+    addToRunTimeSelectionTable(liquid, C8H10,);
+    addToRunTimeSelectionTable(liquid, C8H10, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(C8H10, 0);
-addToRunTimeSelectionTable(liquid, C8H10,);
-addToRunTimeSelectionTable(liquid, C8H10, Istream);
+Foam::C8H10::C8H10()
+:
+    liquid
+    (
+        106.167,
+        617.17,
+        3.6094e+6,
+        0.37381,
+        0.263,
+        178.15,
+        4.038e-3,
+        409.35,
+        1.9680e-30,
+        0.3036,
+        1.8043e+4
+    ),
+    rho_(76.3765398, 0.26438, 617.17, 0.2921),
+    pv_(88.246, -7691.1, -9.797, 5.931e-06, 2.0),
+    hl_(617.17, 516167.924119547, 0.3882, 0.0, 0.0, 0.0),
+    cp_
+    (
+        818.521762883005,
+        6.66873887366131,
+       -0.0248005500767658,
+        4.23860521631015e-05,
+        0.0,
+        0.0
+    ),
+    h_
+    (
+       -524002.612929508,
+        818.521762883005,
+        3.33436943683065,
+       -0.00826685002558862,
+        1.05965130407754e-05,
+        0.0
+    ),
+    cpg_(738.835984816374, 3201.5598067196, 1559, 2285.07916772632, -702.0),
+    B_
+    (
+        0.00165776559571242,
+       -2.77958310962917,
+       -388067.855359952,
+       -5.86905535618412e+18,
+        1.58052878954854e+21
+    ),
+    mu_(-10.452, 1048.4, -0.0715, 0.0, 0.0),
+    mug_(1.2e-06, 0.4518, 439.0, 0.0),
+    K_(0.20149, -0.00023988, 0.0, 0.0, 0.0, 0.0),
+    Kg_(1.708e-05, 1.319, 565.6, 0.0),
+    sigma_(617.17, 0.066, 1.268, 0.0, 0.0, 0.0),
+    D_(147.18, 20.1, 106.167, 28.0) // note: Same as nHeptane
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::C8H10::C8H10
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc0& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::C8H10::C8H10(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C8H10/C8H10.H b/src/thermophysicalModels/liquids/C8H10/C8H10.H
index a08832ab7c..6301c555cc 100644
--- a/src/thermophysicalModels/liquids/C8H10/C8H10.H
+++ b/src/thermophysicalModels/liquids/C8H10/C8H10.H
@@ -86,26 +86,9 @@ public:
     // Constructors
 
         //- Construct null
-        C8H10()
-        :
-            liquid(106.167, 617.17, 3.6094e+6, 0.37381, 0.263, 178.15, 4.038e-3, 409.35, 1.9680e-30, 0.3036, 1.8043e+4),
-            rho_(76.3765398, 0.26438, 617.17, 0.2921),
-            pv_(88.246, -7691.1, -9.797, 5.931e-06, 2),
-            hl_(617.17, 516167.924119547, 0.3882, 0, 0, 0),
-            cp_(818.521762883005, 6.66873887366131, -0.0248005500767658, 4.23860521631015e-05, 0, 0),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(-524002.612929508, 818.521762883005, 3.33436943683065, -0.00826685002558862, 1.05965130407754e-05, 0),
-            cpg_(738.835984816374, 3201.5598067196, 1559, 2285.07916772632, -702),
-            B_(0.00165776559571242, -2.77958310962917, -388067.855359952, -5.86905535618412e+18, 1.58052878954854e+21),
-            mu_(-10.452, 1048.4, -0.0715, 0, 0),
-            mug_(1.2e-06, 0.4518, 439, 0),
-            K_(0.20149, -0.00023988, 0, 0, 0, 0),
-            Kg_(1.708e-05, 1.319, 565.6, 0),
-            sigma_(617.17, 0.066, 1.268, 0, 0, 0),
-            D_(147.18, 20.1, 106.167, 28) // NN: Same as nHeptane
-        {}
+        C8H10();
+
+        // Construct from components
         C8H10
         (
             const liquid& l,
@@ -122,125 +105,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        C8H10(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        C8H10(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        inline scalar K(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -259,9 +173,7 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const C8H10& l)
         {
             l.writeData(os);
@@ -276,6 +188,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "C8H10I.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C8H10/C8H10I.H b/src/thermophysicalModels/liquids/C8H10/C8H10I.H
new file mode 100644
index 0000000000..58ee6c81a9
--- /dev/null
+++ b/src/thermophysicalModels/liquids/C8H10/C8H10I.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::C8H10::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C8H10::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C8H10::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C8H10::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C8H10::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C8H10::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C8H10::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C8H10::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C8H10::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C8H10::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C8H10::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C8H10::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C8H10::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C8H18/C8H18.C b/src/thermophysicalModels/liquids/C8H18/C8H18.C
index dac83519ca..ea9c3f3ed5 100644
--- a/src/thermophysicalModels/liquids/C8H18/C8H18.C
+++ b/src/thermophysicalModels/liquids/C8H18/C8H18.C
@@ -27,19 +27,124 @@ License
 #include "C8H18.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(C8H18, 0);
+    addToRunTimeSelectionTable(liquid, C8H18,);
+    addToRunTimeSelectionTable(liquid, C8H18, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(C8H18, 0);
-addToRunTimeSelectionTable(liquid, C8H18,);
-addToRunTimeSelectionTable(liquid, C8H18, Istream);
+Foam::C8H18::C8H18()
+:
+    liquid
+    (
+        114.231,
+        568.70,
+        2.49e+6,
+        0.486,
+        0.256,
+        216.38,
+        2.1083,
+        398.83,
+        0.0,
+        0.3996,
+        1.54e+4
+    ),
+    rho_(61.37745861, 0.26115, 568.7, 0.28034),
+    pv_(96.084, -7900.2, -11.003, 7.1802e-06, 2.0),
+    hl_(568.70, 483056.263186, 0.38467, 0.0, 0.0, 0.0),
+    cp_
+    (
+        1968.20477803749,
+       -1.63379467920267,
+        0.00839448135795012,
+        0.0,
+        0.0,
+        0.0
+    ),
+    h_
+    (
+       -2778787.734126,
+        1968.20477803749,
+       -0.816897339601334,
+        0.00279816045265004,
+        0.0,
+        0.0
+    ),
+    cpg_(1186.54305748877, 3878.9820626625, 1635.6, 2673.52995246474, 746.4),
+    B_
+    (
+        0.00239777293379205,
+       -2.81394717721109,
+       -585042.589139551,
+       -1.11265768486663e+18,
+        1.40968738783693e+20
+    ),
+    mu_(-20.463, 1497.4, 1.379, 0.0, 0.0),
+    mug_(3.1191e-08, 0.92925, 55.092, 0.0),
+    K_(0.2156, -0.00029483, 0.0, 0.0, 0.0, 0.0),
+    Kg_(-8758, 0.8448, -27121000000.0, 0.0),
+    sigma_(568.70, 0.052789, 1.2323, 0.0, 0.0, 0.0),
+    D_(147.18, 20.1, 114.231, 28.0) // note: Same as nHeptane
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::C8H18::C8H18
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc0& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::C8H18::C8H18(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C8H18/C8H18.H b/src/thermophysicalModels/liquids/C8H18/C8H18.H
index 4656d86236..20f4f5aa11 100644
--- a/src/thermophysicalModels/liquids/C8H18/C8H18.H
+++ b/src/thermophysicalModels/liquids/C8H18/C8H18.H
@@ -87,26 +87,9 @@ public:
     // Constructors
 
         //- Construct null
-        C8H18()
-        :
-            liquid(114.231, 568.70, 2.49e+6, 0.486, 0.256, 216.38, 2.1083, 398.83, 0.0, 0.3996, 1.54e+4),
-            rho_(61.37745861, 0.26115, 568.7, 0.28034),
-            pv_(96.084, -7900.2, -11.003, 7.1802e-06, 2),
-            hl_(568.70, 483056.263186, 0.38467, 0, 0, 0),
-            cp_(1968.20477803749, -1.63379467920267, 0.00839448135795012, 0, 0, 0),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(-2778787.734126, 1968.20477803749, -0.816897339601334, 0.00279816045265004, 0, 0),
-            cpg_(1186.54305748877, 3878.9820626625, 1635.6, 2673.52995246474, 746.4),
-            B_(0.00239777293379205, -2.81394717721109, -585042.589139551, -1.11265768486663e+18, 1.40968738783693e+20),
-            mu_(-20.463, 1497.4, 1.379, 0, 0),
-            mug_(3.1191e-08, 0.92925, 55.092, 0),
-            K_(0.2156, -0.00029483, 0, 0, 0, 0),
-            Kg_(-8758, 0.8448, -27121000000.0, 0),
-            sigma_(568.70, 0.052789, 1.2323, 0, 0, 0),
-            D_(147.18, 20.1, 114.231, 28) // NN: Same as nHeptane
-        {}
+        C8H18();
+
+        //- Construct from components
         C8H18
         (
             const liquid& l,
@@ -123,125 +106,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        C8H18(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        C8H18(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
-        //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        //- Vapour pressure [Pa];
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        inline scalar K(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -260,9 +174,7 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const C8H18& l)
         {
             l.writeData(os);
@@ -277,6 +189,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "C8H18I.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C8H18/C8H18I.H b/src/thermophysicalModels/liquids/C8H18/C8H18I.H
new file mode 100644
index 0000000000..3844155a37
--- /dev/null
+++ b/src/thermophysicalModels/liquids/C8H18/C8H18I.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::C8H18::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C8H18::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C8H18::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C8H18::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C8H18::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C8H18::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C8H18::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C8H18::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C8H18::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C8H18::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C8H18::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C8H18::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C8H18::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C9H20/C9H20.C b/src/thermophysicalModels/liquids/C9H20/C9H20.C
index c9e321e46b..a2e6309c99 100644
--- a/src/thermophysicalModels/liquids/C9H20/C9H20.C
+++ b/src/thermophysicalModels/liquids/C9H20/C9H20.C
@@ -27,19 +27,124 @@ License
 #include "C9H20.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(C9H20, 0);
+    addToRunTimeSelectionTable(liquid, C9H20,);
+    addToRunTimeSelectionTable(liquid, C9H20, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(C9H20, 0);
-addToRunTimeSelectionTable(liquid, C9H20,);
-addToRunTimeSelectionTable(liquid, C9H20, Istream);
+Foam::C9H20::C9H20()
+:
+    liquid
+    (
+        128.258,
+        594.60,
+        2.29e+6,
+        0.544,
+        0.252,
+        219.66,
+        4.3058e-1,
+        423.97,
+        0.0,
+        0.4435,
+        1.56e+4
+    ),
+    rho_(62.06019846, 0.26147, 594.6, 0.28281),
+    pv_(109.35, -90304.0, -12.882, 7.8544e-06, 2.0),
+    hl_(594.60, 470691.886665939, 0.38522, 0.0, 0.0, 0.0),
+    cp_
+    (
+        2986.79224687739,
+       -8.88677509395125,
+        0.0211300659607978,
+        0.0,
+        0.0,
+        0.0
+    ),
+    h_
+    (
+       -2825628.50868792,
+        2986.79224687739,
+       -4.44338754697563,
+        0.00704335532026592,
+        0.0,
+        0.0
+    ),
+    cpg_(1183.16206396482, 3832.11963386299, 1644.8, 2705.48425829188, 749.6),
+    B_
+    (
+        0.00304542406711472,
+       -3.65357326638494,
+       -520825.211682702,
+       -6.15400208953827e+18,
+        1.41901479829718e+21
+    ),
+    mu_(-21.149, 1658, 1.454, 0.0, 0.0),
+    mug_(1.0344e-07, 0.77301, 220.47, 0.0),
+    K_(0.209, -0.000264, 0.0, 0.0, 0.0, 0.0),
+    Kg_(-0.065771, 0.27198, -3482.3, -1580300.0),
+    sigma_(594.60, 0.054975, 1.2897, 0.0, 0.0, 0.0),
+    D_(147.18, 20.1, 128.258, 28.0) // note: Same as nHeptane
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::C9H20::C9H20
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc0& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::C9H20::C9H20(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C9H20/C9H20.H b/src/thermophysicalModels/liquids/C9H20/C9H20.H
index 015bde640f..be28728d4f 100644
--- a/src/thermophysicalModels/liquids/C9H20/C9H20.H
+++ b/src/thermophysicalModels/liquids/C9H20/C9H20.H
@@ -87,26 +87,9 @@ public:
     // Constructors
 
         //- Construct null
-        C9H20()
-        :
-            liquid(128.258, 594.60, 2.29e+6, 0.544, 0.252, 219.66, 4.3058e-1, 423.97, 0, 0.4435, 1.56e+4),
-            rho_(62.06019846, 0.26147, 594.6, 0.28281),
-            pv_(109.35, -90304, -12.882, 7.8544e-06, 2),
-            hl_(594.60, 470691.886665939, 0.38522, 0, 0, 0),
-            cp_(2986.79224687739, -8.88677509395125, 0.0211300659607978, 0, 0, 0),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(-2825628.50868792, 2986.79224687739, -4.44338754697563, 0.00704335532026592, 0, 0),
-            cpg_(1183.16206396482, 3832.11963386299, 1644.8, 2705.48425829188, 749.6),
-            B_(0.00304542406711472, -3.65357326638494, -520825.211682702, -6.15400208953827e+18, 1.41901479829718e+21),
-            mu_(-21.149, 1658, 1.454, 0, 0),
-            mug_(1.0344e-07, 0.77301, 220.47, 0),
-            K_(0.209, -0.000264, 0, 0, 0, 0),
-            Kg_(-0.065771, 0.27198, -3482.3, -1580300),
-            sigma_(594.60, 0.054975, 1.2897, 0, 0, 0),
-            D_(147.18, 20.1, 128.258, 28) // NN: Same as nHeptane
-        {}
+        C9H20();
+
+        //- Construct from components
         C9H20
         (
             const liquid& l,
@@ -123,125 +106,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        C9H20(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        C9H20(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        inline scalar K(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -260,9 +174,7 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const C9H20& l)
         {
             l.writeData(os);
@@ -277,6 +189,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "C9H20I.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/C9H20/C9H20I.H b/src/thermophysicalModels/liquids/C9H20/C9H20I.H
new file mode 100644
index 0000000000..d478264307
--- /dev/null
+++ b/src/thermophysicalModels/liquids/C9H20/C9H20I.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::C9H20::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C9H20::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C9H20::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C9H20::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C9H20::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C9H20::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C9H20::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C9H20::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C9H20::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C9H20::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C9H20::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C9H20::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::C9H20::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/CH3OH/CH3OH.C b/src/thermophysicalModels/liquids/CH3OH/CH3OH.C
index 8a562084d7..64f322b4b1 100644
--- a/src/thermophysicalModels/liquids/CH3OH/CH3OH.C
+++ b/src/thermophysicalModels/liquids/CH3OH/CH3OH.C
@@ -27,19 +27,124 @@ License
 #include "CH3OH.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(CH3OH, 0);
+    addToRunTimeSelectionTable(liquid, CH3OH,);
+    addToRunTimeSelectionTable(liquid, CH3OH, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(CH3OH, 0);
-addToRunTimeSelectionTable(liquid, CH3OH,);
-addToRunTimeSelectionTable(liquid, CH3OH, Istream);
+Foam::CH3OH::CH3OH()
+:
+    liquid
+    (
+        32.042,
+        512.58,
+        8.0959e+6,
+        0.1178,
+        0.224,
+        175.47,
+        1.054e-1,
+        337.85,
+        5.6706e-30,
+        0.5656,
+        2.9523e+4
+    ),
+    rho_(73.952936, 0.27192, 512.58, 0.2331),
+    pv_(109.93, -7471.3, -13.988, 0.015281, 1.0),
+    hl_(512.58, 1644716.30984333, 0.3766, 0.0, 0.0, 0.0),
+    cp_
+    (
+        3358.09250358904,
+       -11.8781599151114,
+        0.0305536483365583,
+        0.0,
+        0.0,
+        0.0
+    ),
+    h_
+    (
+       -8190474.32066862,
+        3358.09250358904,
+       -5.93907995755571,
+        0.0101845494455194,
+        0.0,
+        0.0
+    ),
+    cpg_(1226.9521253355, 2772.92303851195, 1963, 1733.66206853505, 909.6),
+    B_
+    (
+       -0.0199737844079645,
+        19.3496036452157,
+       -3342487.98452032,
+        2.40808938268523e+19,
+       -6.85787404032208e+21
+    ),
+    mu_(-7.288, 1065.3, -0.6657, 0.0, 0.0),
+    mug_(3.0663e-07, 0.69655, 205.0, 0.0),
+    K_(0.2837, -0.000281, 0.0, 0.0, 0.0, 0.0),
+    Kg_(-7.763, 1.0279, -74360000.0, 6770000000.0),
+    sigma_(512.58, 0.056, -0.00014583, 1.08e-07, 0.0, 0.0),
+    D_(147.18, 20.1, 32.042, 28.0) // note: Same as nHeptane
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::CH3OH::CH3OH
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc0& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::CH3OH::CH3OH(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/CH3OH/CH3OH.H b/src/thermophysicalModels/liquids/CH3OH/CH3OH.H
index 9fe8d3db96..11deb6a861 100644
--- a/src/thermophysicalModels/liquids/CH3OH/CH3OH.H
+++ b/src/thermophysicalModels/liquids/CH3OH/CH3OH.H
@@ -87,26 +87,9 @@ public:
     // Constructors
 
         //- Construct null
-        CH3OH()
-        :
-            liquid(32.042, 512.58, 8.0959e+6, 0.1178, 0.224, 175.47, 1.054e-1, 337.85, 5.6706e-30, 0.5656, 2.9523e+4),
-            rho_(73.952936, 0.27192, 512.58, 0.2331),
-            pv_(109.93, -7471.3, -13.988, 0.015281, 1),
-            hl_(512.58, 1644716.30984333, 0.3766, 0, 0, 0),
-            cp_(3358.09250358904, -11.8781599151114, 0.0305536483365583, 0, 0, 0),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(-8190474.32066862, 3358.09250358904, -5.93907995755571, 0.0101845494455194, 0, 0),
-            cpg_(1226.9521253355, 2772.92303851195, 1963, 1733.66206853505, 909.6),
-            B_(-0.0199737844079645, 19.3496036452157, -3342487.98452032, 2.40808938268523e+19, -6.85787404032208e+21),
-            mu_(-7.288, 1065.3, -0.6657, 0, 0),
-            mug_(3.0663e-07, 0.69655, 205, 0),
-            K_(0.2837, -0.000281, 0, 0, 0, 0),
-            Kg_(-7.763, 1.0279, -74360000.0, 6770000000.0),
-            sigma_(512.58, 0.056, -0.00014583, 1.08e-07, 0, 0),
-            D_(147.18, 20.1, 32.042, 28) // NN: Same as nHeptane
-        {}
+        CH3OH();
+
+        //- Construct from components
         CH3OH
         (
             const liquid& l,
@@ -123,125 +106,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        CH3OH(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        CH3OH(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        inline scalar K(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -260,9 +174,7 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const CH3OH& l)
         {
             l.writeData(os);
@@ -277,6 +189,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "CH3OHI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/CH3OH/CH3OHI.H b/src/thermophysicalModels/liquids/CH3OH/CH3OHI.H
new file mode 100644
index 0000000000..28c56dde54
--- /dev/null
+++ b/src/thermophysicalModels/liquids/CH3OH/CH3OHI.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::CH3OH::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::CH3OH::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::CH3OH::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::CH3OH::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::CH3OH::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::CH3OH::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::CH3OH::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::CH3OH::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::CH3OH::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::CH3OH::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::CH3OH::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::CH3OH::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::CH3OH::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C b/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C
index 32e601952f..d1b0ac2610 100644
--- a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C
+++ b/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C
@@ -30,19 +30,108 @@ Description
 #include "CH4N2O.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(CH4N2O, 0);
+    addToRunTimeSelectionTable(liquid, CH4N2O,);
+    addToRunTimeSelectionTable(liquid, CH4N2O, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(CH4N2O, 0);
-addToRunTimeSelectionTable(liquid, CH4N2O,);
-addToRunTimeSelectionTable(liquid, CH4N2O, Istream);
+Foam::CH4N2O::CH4N2O()
+:
+    liquid
+    (
+        60.056,
+        705.0,
+        9.050e+6,
+        0.218,
+        0.337,
+        405.85,
+        9.3131e+1,
+        465.0,
+        1.52e-29,
+        0.3449,
+        4.7813e+4
+    ),
+    rho_(1230.006936, 0.0, 0.0, 0.0, 0.0, 0.0),
+    pv_(3015.15611544, -185497.059684, -430.223621983, 0.00017405122622, 2.0),
+    hl_(705.0, 2534249.0, 0.5, 0.0, 0.0, 0.0),
+    cp_(2006.46063673904, 0.0, 0.0, 0.0, 0.0, 0.0),
+    h_(-6154107.41641135, 2006.46063673904, 0.0, 0.0, 0.0, 0.0),
+    cpg_(811.875582789397, 2099.04089516451, 1627.3, 1603.63660583455, 724.41),
+    B_
+    (
+       -0.000383641934194752,
+        0.447249234048222,
+       -469062.208605302,
+        5.5628080458239e+18,
+       -2.3040162514986e+21
+    ),
+    mu_(-51.964, 3670.6, 5.7331, -5.3495e-29, 10.0),
+    mug_(2.6986e-06, 0.498, 1257.7, -19570.0),
+    K_(-0.4267, 0.0056903, -8.0065e-06, 1.815e-09, 0.0, 0.0),
+    Kg_(6.977e-05, 1.1243, 844.9, -148850.0),
+    sigma_(705.0, 1.0, 0.0, 0.0, 0.0, 0.0), // note: set to constant
+    D_(147.18, 20.1, 60.056, 28.0) // note: Same as nHeptane
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::CH4N2O::CH4N2O
+(
+    const liquid& l,
+    const NSRDSfunc0& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc0& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::CH4N2O::CH4N2O(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H b/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H
index 2b5b4f4ae5..bcfbbd62ef 100644
--- a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H
+++ b/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H
@@ -26,7 +26,8 @@ Class
     Foam::CH4N2O
 
 Description
-    urea, note that some of the properties are unavailable in the literature and have been copied from water.
+    urea, note that some of the properties are unavailable in the literature
+    and have been copied from water.
 
 SourceFiles
     CH4N2O.C
@@ -86,23 +87,9 @@ public:
     // Constructors
 
         //- Construct null
-        CH4N2O()
-        :
-            liquid(60.056, 705.0, 9.050e+6, 0.218, 0.337, 405.85, 9.3131e+1, 465.0, 1.52e-29, 0.3449, 4.7813e+4),
-            rho_(1230.006936, 0, 0, 0, 0, 0),
-            pv_(3015.15611544, -185497.059684, -430.223621983, 0.00017405122622, 2.0),
-            hl_(705.0, 2534249.0, 0.5, 0.0, 0.0, 0.0),
-            cp_(2006.46063673904, 0, 0, 0, 0, 0),
-            h_(-6154107.41641135, 2006.46063673904, 0, 0, 0, 0),
-            cpg_(811.875582789397, 2099.04089516451, 1627.3, 1603.63660583455, 724.41),
-            B_(-0.000383641934194752, 0.447249234048222, -469062.208605302, 5.5628080458239e+18, -2.3040162514986e+21),
-            mu_(-51.964, 3670.6, 5.7331, -5.3495e-29, 10),
-            mug_(2.6986e-06, 0.498, 1257.7, -19570),
-            K_(-0.4267, 0.0056903, -8.0065e-06, 1.815e-09, 0, 0),
-            Kg_(6.977e-05, 1.1243, 844.9, -148850),
-            sigma_(705.0, 1.0, 0.0, 0.0, 0.0, 0), // set to constant
-            D_(147.18, 20.1, 60.056, 28) // Same as nHeptane
-        {}
+        CH4N2O();
+
+        //- Construct from components
         CH4N2O
         (
             const liquid& l,
@@ -119,125 +106,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        CH4N2O(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        CH4N2O(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        inline scalar K(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -256,9 +174,7 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const CH4N2O& l)
         {
             l.writeData(os);
@@ -273,6 +189,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "CH4N2OI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/CH4N2O/CH4N2OI.H b/src/thermophysicalModels/liquids/CH4N2O/CH4N2OI.H
new file mode 100644
index 0000000000..b04233aad1
--- /dev/null
+++ b/src/thermophysicalModels/liquids/CH4N2O/CH4N2OI.H
@@ -0,0 +1,106 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::CH4N2O::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::CH4N2O::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::CH4N2O::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::CH4N2O::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::CH4N2O::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::CH4N2O::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::CH4N2O::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::CH4N2O::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::CH4N2O::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::CH4N2O::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::CH4N2O::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::CH4N2O::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::CH4N2O::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
+
diff --git a/src/thermophysicalModels/liquids/H2O/H2O.C b/src/thermophysicalModels/liquids/H2O/H2O.C
index ae3de412f2..861b39bc4f 100644
--- a/src/thermophysicalModels/liquids/H2O/H2O.C
+++ b/src/thermophysicalModels/liquids/H2O/H2O.C
@@ -27,19 +27,131 @@ License
 #include "H2O.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(H2O, 0);
+    addToRunTimeSelectionTable(liquid, H2O,);
+    addToRunTimeSelectionTable(liquid, H2O, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(H2O, 0);
-addToRunTimeSelectionTable(liquid, H2O,);
-addToRunTimeSelectionTable(liquid, H2O, Istream);
+Foam::H2O::H2O()
+:
+    liquid
+    (
+        18.015,
+        647.13,
+        2.2055e+7,
+        0.05595,
+        0.229,
+        273.16,
+        6.113e+2,
+        373.15,
+        6.1709e-30,
+        0.3449,
+        4.7813e+4
+    ),
+    rho_(98.343885, 0.30542, 647.13, 0.081),
+    pv_(73.649, -7258.2, -7.3037, 4.1653e-06, 2),
+    hl_(647.13, 2889425.47876769, 0.3199, -0.212, 0.25795, 0),
+    cp_
+    (
+        15341.1046350264,
+       -116.019983347211,
+        0.451013044684985,
+       -0.000783569247849015,
+        5.20127671384957e-07,
+        0
+    ),
+    h_
+    (
+       -17957283.7993676,
+        15341.1046350264,
+       -58.0099916736053,
+        0.150337681561662,
+       -0.000195892311962254,
+        1.04025534276991e-07
+    ),
+    cpg_
+    (
+        1851.73466555648,
+        1487.53816264224,
+        2609.3,
+        493.366638912018,
+        1167.6
+    ),
+    B_
+    (
+       -0.0012789342214821,
+        1.4909797391063,
+       -1563696.91923397,
+        1.85445462114904e+19,
+       -7.68082153760755e+21
+    ),
+    mu_(-51.964, 3670.6, 5.7331, -5.3495e-29, 10),
+    mug_(2.6986e-06, 0.498, 1257.7, -19570),
+    K_(-0.4267, 0.0056903, -8.0065e-06, 1.815e-09, 0, 0),
+    Kg_(6.977e-05, 1.1243, 844.9, -148850),
+    sigma_(647.13, 0.18548, 2.717, -3.554, 2.047, 0),
+    D_(147.18, 20.1, 18.015, 28) // note: Same as nHeptane
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::H2O::H2O
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc0& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::H2O::H2O(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/H2O/H2O.H b/src/thermophysicalModels/liquids/H2O/H2O.H
index 6980563561..92287b2216 100644
--- a/src/thermophysicalModels/liquids/H2O/H2O.H
+++ b/src/thermophysicalModels/liquids/H2O/H2O.H
@@ -86,26 +86,9 @@ public:
     // Constructors
 
         //- Construct null
-        H2O()
-        :
-            liquid(18.015, 647.13, 2.2055e+7, 0.05595, 0.229, 273.16, 6.113e+2, 373.15, 6.1709e-30, 0.3449, 4.7813e+4),
-            rho_(98.343885, 0.30542, 647.13, 0.081),
-            pv_(73.649, -7258.2, -7.3037, 4.1653e-06, 2),
-            hl_(647.13, 2889425.47876769, 0.3199, -0.212, 0.25795, 0),
-            cp_(15341.1046350264, -116.019983347211, 0.451013044684985, -0.000783569247849015, 5.20127671384957e-07, 0),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(-17957283.7993676, 15341.1046350264, -58.0099916736053, 0.150337681561662, -0.000195892311962254, 1.04025534276991e-07),
-            cpg_(1851.73466555648, 1487.53816264224, 2609.3, 493.366638912018, 1167.6),
-            B_(-0.0012789342214821, 1.4909797391063, -1563696.91923397, 1.85445462114904e+19, -7.68082153760755e+21),
-            mu_(-51.964, 3670.6, 5.7331, -5.3495e-29, 10),
-            mug_(2.6986e-06, 0.498, 1257.7, -19570),
-            K_(-0.4267, 0.0056903, -8.0065e-06, 1.815e-09, 0, 0),
-            Kg_(6.977e-05, 1.1243, 844.9, -148850),
-            sigma_(647.13, 0.18548, 2.717, -3.554, 2.047, 0),
-            D_(147.18, 20.1, 18.015, 28) // NN: Same as nHeptane
-        {}
+        H2O();
+
+        //- Construct from components
         H2O
         (
             const liquid& l,
@@ -122,125 +105,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        H2O(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        H2O(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        inline scalar K(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -260,8 +174,7 @@ public:
         }
 
 
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const H2O& l)
         {
             l.writeData(os);
@@ -276,6 +189,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "H2OI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/H2O/H2OI.H b/src/thermophysicalModels/liquids/H2O/H2OI.H
new file mode 100644
index 0000000000..bc5c4bff5a
--- /dev/null
+++ b/src/thermophysicalModels/liquids/H2O/H2OI.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::H2O::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::H2O::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::H2O::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::H2O::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::H2O::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::H2O::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::H2O::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::H2O::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::H2O::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::H2O::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::H2O::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::H2O::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::H2O::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/IC8H18/IC8H18.C b/src/thermophysicalModels/liquids/IC8H18/IC8H18.C
index 713bada8d0..483e6c2466 100644
--- a/src/thermophysicalModels/liquids/IC8H18/IC8H18.C
+++ b/src/thermophysicalModels/liquids/IC8H18/IC8H18.C
@@ -27,19 +27,124 @@ License
 #include "IC8H18.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(IC8H18, 0);
+    addToRunTimeSelectionTable(liquid, IC8H18,);
+    addToRunTimeSelectionTable(liquid, IC8H18, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(IC8H18, 0);
-addToRunTimeSelectionTable(liquid, IC8H18,);
-addToRunTimeSelectionTable(liquid, IC8H18, Istream);
+Foam::IC8H18::IC8H18()
+:
+    liquid
+    (
+        114.231,
+        543.96,
+        2.5676e+6,
+        0.468,
+        0.266,
+        165.78,
+        1.4464e-2,
+        372.39,
+        0.0,
+        0.3031,
+        1.4051e+4
+    ),
+    rho_(67.2363666, 0.27373, 543.96, 0.2846),
+    pv_(120.81, -7550, -16.111, 0.017099, 1.0),
+    hl_(543.96, 375379.713037617, 0.1549, 0.138, 0.0666, 0.0),
+    cp_
+    (
+        1219.89652546156,
+        1.67205049417409,
+        0.00414073237562483,
+        0.0,
+        0.0,
+        0.0
+    ),
+    h_
+    (
+       -2743275.10767575,
+        1219.89652546156,
+        0.836025247087043,
+        0.00138024412520828,
+        0.0,
+        0.0
+    ),
+    cpg_(997.10236275617, 4627.4653990598, 1594, 2933.52942721328, 677.94),
+    B_
+    (
+        0.00234936225718063,
+       -2.83381919093766,
+       -413154.047500241,
+       -3.49703670632315e+17,
+        3.13750207912038e+19
+    ),
+    mu_(-15.811, 1282.5, 0.67791, -3.8617e-28, 10.0),
+    mug_(1.107e-07, 0.746, 72.4, 0.0),
+    K_(0.1508, -0.0001712, 0.0, 0.0, 0.0, 0.0),
+    Kg_(1.758e-05, 1.3114, 392.9, 0.0),
+    sigma_(543.96, 0.047434, 1.1975, 0.0, 0.0, 0.0),
+    D_(147.18, 20.1, 114.231, 28.0) // note: Same as nHeptane
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::IC8H18::IC8H18
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc0& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::IC8H18::IC8H18(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/IC8H18/IC8H18.H b/src/thermophysicalModels/liquids/IC8H18/IC8H18.H
index 742f1c4c5f..48de18edbe 100644
--- a/src/thermophysicalModels/liquids/IC8H18/IC8H18.H
+++ b/src/thermophysicalModels/liquids/IC8H18/IC8H18.H
@@ -87,26 +87,9 @@ public:
     // Constructors
 
         //- Construct null
-        IC8H18()
-        :
-            liquid(114.231, 543.96, 2.5676e+6, 0.468, 0.266, 165.78, 1.4464e-2, 372.39, 0.0, 0.3031, 1.4051e+4),
-            rho_(67.2363666, 0.27373, 543.96, 0.2846),
-            pv_(120.81, -7550, -16.111, 0.017099, 1),
-            hl_(543.96, 375379.713037617, 0.1549, 0.138, 0.0666, 0),
-            cp_(1219.89652546156, 1.67205049417409, 0.00414073237562483, 0, 0, 0),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(-2743275.10767575, 1219.89652546156, 0.836025247087043, 0.00138024412520828, 0, 0),
-            cpg_(997.10236275617, 4627.4653990598, 1594, 2933.52942721328, 677.94),
-            B_(0.00234936225718063, -2.83381919093766, -413154.047500241, -3.49703670632315e+17, 3.13750207912038e+19),
-            mu_(-15.811, 1282.5, 0.67791, -3.8617e-28, 10),
-            mug_(1.107e-07, 0.746, 72.4, 0),
-            K_(0.1508, -0.0001712, 0, 0, 0, 0),
-            Kg_(1.758e-05, 1.3114, 392.9, 0),
-            sigma_(543.96, 0.047434, 1.1975, 0, 0, 0),
-            D_(147.18, 20.1, 114.231, 28) // NN: Same as nHeptane
-        {}
+        IC8H18();
+
+        //- Construct from components
         IC8H18
         (
             const liquid& l,
@@ -123,125 +106,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        IC8H18(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        IC8H18(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
-        //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        //- Liquid thermal conductivity [W/(m K)]
+        inline scalar K(scalar p, scalar T) const;
 
-        //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        //- Vapour thermal conductivity [W/(m K)]
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -260,9 +174,7 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const IC8H18& l)
         {
             l.writeData(os);
@@ -277,6 +189,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "IC8H18I.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/IC8H18/IC8H18I.H b/src/thermophysicalModels/liquids/IC8H18/IC8H18I.H
new file mode 100644
index 0000000000..ac53685cb8
--- /dev/null
+++ b/src/thermophysicalModels/liquids/IC8H18/IC8H18I.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::IC8H18::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::IC8H18::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::IC8H18::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::IC8H18::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::IC8H18::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::IC8H18::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::IC8H18::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::IC8H18::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::IC8H18::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::IC8H18::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::IC8H18::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::IC8H18::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::IC8H18::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/IDEA/IDEA.C b/src/thermophysicalModels/liquids/IDEA/IDEA.C
index cd2560c2dc..f58a625ec5 100644
--- a/src/thermophysicalModels/liquids/IDEA/IDEA.C
+++ b/src/thermophysicalModels/liquids/IDEA/IDEA.C
@@ -27,19 +27,144 @@ License
 #include "IDEA.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(IDEA, 0);
+    addToRunTimeSelectionTable(liquid, IDEA,);
+    addToRunTimeSelectionTable(liquid, IDEA, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(IDEA, 0);
-addToRunTimeSelectionTable(liquid, IDEA,);
-addToRunTimeSelectionTable(liquid, IDEA, Istream);
+Foam::IDEA::IDEA()
+:
+    liquid
+    (
+        142.26,
+        618.074,
+        2.11e+6,
+        0.523,
+        0.247,
+        242.67,
+        3.4929e-2,
+        447.3,
+        1.7012e-30,
+        0.3478,
+        1.57e+4
+    ),
+    rho_(152.012105, 3.87150382e-1, 618.073893, 4.00790044e-1),
+    pv_
+    (
+        8.4817774623e+01,
+       -8.6782398353e+03,
+       -9.1277694857,
+        4.6153144498e-06,
+        2.0
+    ),
+    hl_
+    (
+        618.074,
+        2.1671983789e+05,
+       -4.2413153435e+00,
+        1.1656811532e+01,
+       -1.1656446689e+01,
+        4.3667661492
+    ),
+    cp_(1.6604957e+3, -6.250871e-1, 6.1778552e-3, 0.0, 0.0, 0.0),
+    h_(0.0, 0.0, 0.0, 0.0, 0.0, 0.0),
+    cpg_
+    (
+        1.0457515243e+03,
+        3.4410492875e+03,
+        1.5976862298e+03,
+        2.4697705752e+03,
+        7.3699710536e+02
+    ),
+    B_
+    (
+        0.00337351091119935,
+       -4.13606494008504,
+       -534560.916470464,
+       -1.13364022911762e+19,
+        2.80704220402713e+21
+    ),
+    mu_(-6.9645853822e+01, 4.4390635942e+03, 8.4680722718e+00, 0.0, 0.0),
+    mug_(4.2629382158e-08, 8.8144402122e-01, 9.6918097636e+01, 0.0),
+    K_(2.03684e-01, -2.3168e-04, 0.0, 0.0, 0.0, 0.0),
+    Kg_
+    (
+       -5.664925956707e+02,
+        8.896721676320e-01,
+       -2.849783998688e+09,
+        6.914935658053e+05
+    ),
+    sigma_
+    (
+        618.074,
+        8.3846525429e-03,
+       -1.0044759047e+01,
+        2.7261918781e+01,
+       -2.5529134309e+01,
+        8.6488806234
+    ),
+    D_(147.18, 20.1, 142.2, 28.0) // note: Same as nHeptane
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::IDEA::IDEA
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc0& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::IDEA::IDEA(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/IDEA/IDEA.H b/src/thermophysicalModels/liquids/IDEA/IDEA.H
index a623416f8e..a51aa86cbf 100644
--- a/src/thermophysicalModels/liquids/IDEA/IDEA.H
+++ b/src/thermophysicalModels/liquids/IDEA/IDEA.H
@@ -109,26 +109,9 @@ public:
     // Constructors
 
         //- Construct null
-        IDEA()
-        :
-            liquid(142.26, 618.074, 2.11e+6, 0.523, 0.247, 242.67, 3.4929e-2, 447.3, 1.7012e-30, 0.3478, 1.57e+4),
-            rho_(152.012105, 3.87150382e-1, 618.073893, 4.00790044e-1),
-            pv_(8.4817774623e+01, -8.6782398353e+03, -9.1277694857, 4.6153144498e-06, 2.0),
-            hl_(618.074,2.1671983789e+05, -4.2413153435e+00, 1.1656811532e+01, -1.1656446689e+01, 4.3667661492),
-            cp_(1.6604957e+3, -6.250871e-1, 6.1778552e-3, 0.0, 0.0, 0.0),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // For this fuel I've put it to zero because I was lazy at the time...
-            h_(0.0, 0.0, 0.0, 0.0, 0.0, 0.0),
-            cpg_(1.0457515243e+03, 3.4410492875e+03, 1.5976862298e+03, 2.4697705752e+03, 7.3699710536e+02),
-            B_(0.00337351091119935, -4.13606494008504, -534560.916470464, -1.13364022911762e+19, 2.80704220402713e+21),
-            mu_(-6.9645853822e+01, 4.4390635942e+03, 8.4680722718e+00, 0.0, 0.0),
-            mug_(4.2629382158e-08, 8.8144402122e-01, 9.6918097636e+01, 0.0),
-            K_(2.03684e-01, -2.3168e-04, 0.0, 0.0, 0.0, 0.0),
-            Kg_(-5.664925956707e+02, 8.896721676320e-01, -2.849783998688e+09, 6.914935658053e+05),
-            sigma_(618.074, 8.3846525429e-03, -1.0044759047e+01, 2.7261918781e+01, -2.5529134309e+01, 8.6488806234),
-            D_(147.18, 20.1, 142.2, 28) // NN: Same as nHeptane
-        {}
+        IDEA();
+
+        // Construct from components
         IDEA
         (
             const liquid& l,
@@ -145,125 +128,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        IDEA(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        IDEA(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        inline scalar K(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -281,9 +195,7 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const IDEA& l)
         {
             l.writeData(os);
@@ -298,6 +210,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "IDEAI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/IDEA/IDEAI.H b/src/thermophysicalModels/liquids/IDEA/IDEAI.H
new file mode 100644
index 0000000000..865d7babfe
--- /dev/null
+++ b/src/thermophysicalModels/liquids/IDEA/IDEAI.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::IDEA::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::IDEA::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::IDEA::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::IDEA::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::IDEA::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::IDEA::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::IDEA::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::IDEA::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::IDEA::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::IDEA::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::IDEA::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::IDEA::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::IDEA::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/MB/MB.C b/src/thermophysicalModels/liquids/MB/MB.C
index 0328ef0103..b5df86262c 100644
--- a/src/thermophysicalModels/liquids/MB/MB.C
+++ b/src/thermophysicalModels/liquids/MB/MB.C
@@ -27,19 +27,108 @@ License
 #include "MB.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(MB, 0);
+    addToRunTimeSelectionTable(liquid, MB,);
+    addToRunTimeSelectionTable(liquid, MB, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(MB, 0);
-addToRunTimeSelectionTable(liquid, MB,);
-addToRunTimeSelectionTable(liquid, MB, Istream);
+Foam::MB::MB()
+:
+    liquid
+    (
+        102.133,
+        554.5,
+        3.4734e+6,
+        0.34,
+        0.256,
+        187.35,
+        1.0102e-1,
+        375.90,
+        5.7373e-30,
+        0.3807,
+        1.7713e+4
+    ),
+    rho_(76.6099633, 0.257, 554.5, 0.2772),
+    pv_(107.51, -8112.9, -12.77, 9.2919e-06, 2.0),
+    hl_(554.5, 508307.794738233, 0.392, 0.0, 0.0, 0.0),
+    cp_(1135.77394182096, 2.89818178257762, 0.0, 0.0, 0.0, 0.0),
+    h_(-5255966.14542938, 1135.77394182096, 1.44909089128881, 0.0, 0.0, 0.0),
+    cpg_(875.329227575808, 2849.22600922327, 1570.0, 2029.70636327142, 678.3),
+    B_
+    (
+        0.00220496803188,
+       -2.42184210783978,
+       -401045.695318849,
+       -2.85079259397061e+17,
+       -3.57377145486767e+19
+    ),
+    mu_(-12.206, 1141.7, 0.15014, 0.0, 0.0),
+    mug_(3.733e-07, 0.6177, 256.5, 0.0),
+    K_(0.2298, -0.0003002, 0.0, 0.0, 0.0, 0.0),
+    Kg_(1333.1, 0.9962, 12317000000.0, 0.0),
+    sigma_(554.5, 0.064084, 1.2418, 0.0, 0.0, 0.0),
+    D_(147.18, 20.1, 102.133, 28.0) // note: Same as nHeptane
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::MB::MB
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc0& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::MB::MB(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/MB/MB.H b/src/thermophysicalModels/liquids/MB/MB.H
index 4fb918ea02..e9e4703e3d 100644
--- a/src/thermophysicalModels/liquids/MB/MB.H
+++ b/src/thermophysicalModels/liquids/MB/MB.H
@@ -31,8 +31,7 @@ Description
 SourceFiles
     MB.C
 
-*/
-// ------------------------------------------------------------------------- //
+\*---------------------------------------------------------------------------*/
 
 #ifndef MB_H
 #define MB_H
@@ -88,26 +87,9 @@ public:
     // Constructors
 
         //- Construct null
-        MB()
-        :
-            liquid(102.133, 554.5, 3.4734e+6, 0.34, 0.256, 187.35, 1.0102e-1, 375.90, 5.7373e-30, 0.3807, 1.7713e+4),
-            rho_(76.6099633, 0.257, 554.5, 0.2772),
-            pv_(107.51, -8112.9, -12.77, 9.2919e-06, 2),
-            hl_(554.5, 508307.794738233, 0.392, 0, 0, 0),
-            cp_(1135.77394182096, 2.89818178257762, 0, 0, 0, 0),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(-5255966.14542938, 1135.77394182096, 1.44909089128881, 0, 0, 0),
-            cpg_(875.329227575808, 2849.22600922327, 1570, 2029.70636327142, 678.3),
-            B_(0.00220496803188, -2.42184210783978, -401045.695318849, -2.85079259397061e+17, -3.57377145486767e+19),
-            mu_(-12.206, 1141.7, 0.15014, 0, 0),
-            mug_(3.733e-07, 0.6177, 256.5, 0),
-            K_(0.2298, -0.0003002, 0, 0, 0, 0),
-            Kg_(1333.1, 0.9962, 12317000000.0, 0),
-            sigma_(554.5, 0.064084, 1.2418, 0, 0, 0),
-            D_(147.18, 20.1, 102.133, 28) // NN: Same as nHeptane
-        {}
+        MB();
+
+        //- Construct from components
         MB
         (
             const liquid& l,
@@ -124,125 +106,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        MB(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        MB(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        inline scalar K(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -261,9 +174,7 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const MB& l)
         {
             l.writeData(os);
@@ -278,6 +189,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "MBI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/MB/MBI.H b/src/thermophysicalModels/liquids/MB/MBI.H
new file mode 100644
index 0000000000..058d2c9f26
--- /dev/null
+++ b/src/thermophysicalModels/liquids/MB/MBI.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::MB::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::MB::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::MB::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::MB::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::MB::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::MB::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::MB::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::MB::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::MB::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::MB::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::MB::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::MB::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::MB::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/N2/N2.C b/src/thermophysicalModels/liquids/N2/N2.C
index 3a2c2a1e4e..f3458d825e 100644
--- a/src/thermophysicalModels/liquids/N2/N2.C
+++ b/src/thermophysicalModels/liquids/N2/N2.C
@@ -27,19 +27,124 @@ License
 #include "N2.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(N2, 0);
+    addToRunTimeSelectionTable(liquid, N2,);
+    addToRunTimeSelectionTable(liquid, N2, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(N2, 0);
-addToRunTimeSelectionTable(liquid, N2,);
-addToRunTimeSelectionTable(liquid, N2, Istream);
+Foam::N2::N2()
+:
+    liquid
+    (
+        28.014,
+        126.10,
+        3.3944e+6,
+        0.0901,
+        0.292,
+        63.15,
+        1.2517e+4,
+        77.35,
+        0.0,
+        0.0403,
+        9.0819e+3
+    ),
+    rho_(88.8716136, 0.28479, 126.1, 0.2925),
+    pv_(59.826, -1097.6, -8.6689, 0.046346, 1.0),
+    hl_(126.10, 336617.405582923, 1.201, -1.4811, 0.7085, 0.0),
+    cp_
+    (
+       -1192.26101235097,
+        125.187406296852,
+       -1.66702363104162,
+        0.00759263225530092,
+        0.0,
+        0.0
+    ),
+    h_
+    (
+       -5480656.55276541,
+       -1192.26101235097,
+        62.5937031484258,
+       -0.555674543680541,
+        0.00189815806382523,
+        0.0
+    ),
+    cpg_(1038.94481330763, 307.52123938031, 1701.6, 3.69351038766331, 909.79),
+    B_
+    (
+        0.00166702363104162,
+       -0.533661740558292,
+       -2182.12322410223,
+        2873563218390.8,
+       -165274505604341.0
+    ),
+    mu_(32.165, 496.9, 3.9069, -1.08e-21, 10.0),
+    mug_(7.632e-07, 0.58823, 67.75, 0.0),
+    K_(0.7259, -0.016728, 0.00016215, -5.7605e-07, 0.0, 0.0),
+    Kg_(0.000351, 0.7652, 25.767, 0.0),
+    sigma_(126.10, 0.02898, 1.2457, 0.0, 0.0, 0.0),
+    D_(147.18, 20.1, 28.014, 28.0) // note: Same as nHeptane
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::N2::N2
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc0& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::N2::N2(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/N2/N2.H b/src/thermophysicalModels/liquids/N2/N2.H
index 972b97dd54..3595320ce8 100644
--- a/src/thermophysicalModels/liquids/N2/N2.H
+++ b/src/thermophysicalModels/liquids/N2/N2.H
@@ -87,26 +87,9 @@ public:
     // Constructors
 
         //- Construct null
-        N2()
-        :
-            liquid(28.014, 126.10, 3.3944e+6, 0.0901, 0.292, 63.15, 1.2517e+4, 77.35, 0.0, 0.0403, 9.0819e+3),
-            rho_(88.8716136, 0.28479, 126.1, 0.2925),
-            pv_(59.826, -1097.6, -8.6689, 0.046346, 1),
-            hl_(126.10, 336617.405582923, 1.201, -1.4811, 0.7085, 0),
-            cp_(-1192.26101235097, 125.187406296852, -1.66702363104162, 0.00759263225530092, 0, 0),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(-5480656.55276541, -1192.26101235097, 62.5937031484258, -0.555674543680541, 0.00189815806382523, 0),
-            cpg_(1038.94481330763, 307.52123938031, 1701.6, 3.69351038766331, 909.79),
-            B_(0.00166702363104162, -0.533661740558292, -2182.12322410223, 2873563218390.8, -165274505604341.0),
-            mu_(32.165, 496.9, 3.9069, -1.08e-21, 10),
-            mug_(7.632e-07, 0.58823, 67.75, 0),
-            K_(0.7259, -0.016728, 0.00016215, -5.7605e-07, 0, 0),
-            Kg_(0.000351, 0.7652, 25.767, 0),
-            sigma_(126.10, 0.02898, 1.2457, 0, 0, 0),
-            D_(147.18, 20.1, 28.014, 28) // NN: Same as nHeptane
-        {}
+        N2();
+
+        //- Construct from components
         N2
         (
             const liquid& l,
@@ -123,125 +106,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        N2(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        N2(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
-        //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        //- Liquid thermal conductivity [W/(m K)]
+        inline scalar K(scalar p, scalar T) const;
 
-        //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        //- Vapour thermal conductivity [W/(m K)]
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -260,9 +174,7 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const N2& l)
         {
             l.writeData(os);
@@ -277,6 +189,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "N2I.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/N2/N2I.H b/src/thermophysicalModels/liquids/N2/N2I.H
new file mode 100644
index 0000000000..757f99d293
--- /dev/null
+++ b/src/thermophysicalModels/liquids/N2/N2I.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::N2::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::N2::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::N2::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::N2::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::N2::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::N2::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::N2::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::N2::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::N2::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::N2::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::N2::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::N2::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::N2::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.C b/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.C
index 45364056f1..4edbe582a2 100644
--- a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.C
+++ b/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.C
@@ -27,19 +27,116 @@ License
 #include "aC10H7CH3.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(aC10H7CH3, 0);
+    addToRunTimeSelectionTable(liquid, aC10H7CH3,);
+    addToRunTimeSelectionTable(liquid, aC10H7CH3, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(aC10H7CH3, 0);
-addToRunTimeSelectionTable(liquid, aC10H7CH3,);
-addToRunTimeSelectionTable(liquid, aC10H7CH3, Istream);
+Foam::aC10H7CH3::aC10H7CH3()
+:
+    liquid
+    (
+        142.2,
+        772.04,
+        3.66e+6,
+        0.523,
+        0.298,
+        242.67,
+        3.4929e-2,
+        517.83,
+        1.7012e-30,
+        0.3478,
+        2.0176e+4
+    ),
+    rho_(60.92559, 0.22408, 772.04, 0.25709),
+    pv_(73.716, -9103.2, -7.2253, 2.062e-06, 2),
+    hl_(772.04, 511744.022503516, 0.4164, 0, 0, 0),
+    cp_(965.893108298172, 1.16216596343179, 0.00298523206751055, 0, 0, 0),
+    h_
+    (
+        38161.6838138517,
+        965.893108298172,
+        0.581082981715893,
+        0.00099507735583685,
+        0,
+        0
+    ),
+    cpg_(743.389592123769, 2703.5864978903, 1548.5, 2031.64556962025, 722.06),
+    B_
+    (
+        0.00205555555555556,
+       -3.34423347398031,
+       -931153.305203938,
+        1.87601969057665e+18,
+       -2.06448663853727e+21
+    ),
+    mu_(-93.6, 5784, 12, 0, 0),
+    mug_(2.5672e-06, 0.3566, 825.54, 0),
+    K_(0.19758, -0.0001796, 0, 0, 0, 0),
+    Kg_(0.3911, -0.1051, -213.52, 2318300),
+    sigma_(772.04, 0.076, 1.33, 0, 0, 0),
+    D_(147.18, 20.1, 142.2, 28) // note: Same as nHeptane
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::aC10H7CH3::aC10H7CH3
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc0& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::aC10H7CH3::aC10H7CH3(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.H b/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.H
index 97eb8051ba..7489d6a0e4 100644
--- a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.H
+++ b/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.H
@@ -54,7 +54,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class aC10H7CH3 Declaration
+                          Class aC10H7CH3 Declaration
 \*---------------------------------------------------------------------------*/
 
 class aC10H7CH3
@@ -87,26 +87,9 @@ public:
     // Constructors
 
         //- Construct null
-        aC10H7CH3()
-        :
-            liquid(142.2, 772.04, 3.66e+6, 0.523, 0.298, 242.67, 3.4929e-2, 517.83, 1.7012e-30, 0.3478, 2.0176e+4),
-            rho_(60.92559, 0.22408, 772.04, 0.25709),
-            pv_(73.716, -9103.2, -7.2253, 2.062e-06, 2),
-            hl_(772.04, 511744.022503516, 0.4164, 0, 0, 0),
-            cp_(965.893108298172, 1.16216596343179, 0.00298523206751055, 0, 0, 0),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(38161.6838138517, 965.893108298172, 0.581082981715893, 0.00099507735583685, 0, 0),
-            cpg_(743.389592123769, 2703.5864978903, 1548.5, 2031.64556962025, 722.06),
-            B_(0.00205555555555556, -3.34423347398031, -931153.305203938, 1.87601969057665e+18, -2.06448663853727e+21),
-            mu_(-93.6, 5784, 12, 0, 0),
-            mug_(2.5672e-06, 0.3566, 825.54, 0),
-            K_(0.19758, -0.0001796, 0, 0, 0, 0),
-            Kg_(0.3911, -0.1051, -213.52, 2318300),
-            sigma_(772.04, 0.076, 1.33, 0, 0, 0),
-            D_(147.18, 20.1, 142.2, 28) // NN: Same as nHeptane
-        {}
+        aC10H7CH3();
+
+        //- Constrcut from components
         aC10H7CH3
         (
             const liquid& l,
@@ -123,125 +106,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        aC10H7CH3(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        aC10H7CH3(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        inline scalar K(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -261,8 +175,7 @@ public:
         }
 
 
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const aC10H7CH3& l)
         {
             l.writeData(os);
@@ -277,6 +190,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "aC10H7CH3I.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3I.H b/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3I.H
new file mode 100644
index 0000000000..4cf642cc0b
--- /dev/null
+++ b/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3I.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::aC10H7CH3::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::aC10H7CH3::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::aC10H7CH3::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::aC10H7CH3::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::aC10H7CH3::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::aC10H7CH3::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::aC10H7CH3::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::aC10H7CH3::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::aC10H7CH3::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::aC10H7CH3::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::aC10H7CH3::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::aC10H7CH3::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::aC10H7CH3::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.C b/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.C
index a24626852d..545176895d 100644
--- a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.C
+++ b/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.C
@@ -27,19 +27,116 @@ License
 #include "bC10H7CH3.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(bC10H7CH3, 0);
+    addToRunTimeSelectionTable(liquid, bC10H7CH3,);
+    addToRunTimeSelectionTable(liquid, bC10H7CH3, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(bC10H7CH3, 0);
-addToRunTimeSelectionTable(liquid, bC10H7CH3,);
-addToRunTimeSelectionTable(liquid, bC10H7CH3, Istream);
+Foam::bC10H7CH3::bC10H7CH3()
+:
+    liquid
+    (
+        142.2,
+        761.0,
+        3.25e+6,
+        0.507,
+        0.260,
+        307.73,
+        1.7374e+1,
+        514.20,
+        1.4010e-30,
+        0.3459,
+        1.987e+4
+    ),
+    rho_(67.36014, 0.23843, 761, 0.2559),
+    pv_(134.31, -12103, -16.195, 6.9659e-06, 2),
+    hl_(761.0, 513150.492264416, 0.4044, 0.0, 0.0, 0.0),
+    cp_(811.322081575246, 2.30225035161744, 0.0008628691983122, 0.0, 0.0, 0.0),
+    h_
+    (
+        45001.2311880177,
+        811.322081575246,
+        1.15112517580872,
+        0.000287623066104079,
+        0.0,
+        0.0
+    ),
+    cpg_(760.126582278481, 2699.08579465542, 1564.1, 1994.51476793249, 727.49),
+    B_
+    (
+        0.00229430379746835,
+       -3.53720112517581,
+       -1067158.93108298,
+        2.29746835443038e+18,
+       -2.68438818565401e+21
+    ),
+    mu_(-63.276, 4219, 7.5549, 0.0, 0.0),
+    mug_(2.1791e-06, 0.3717, 712.53, 0.0),
+    K_(0.1962, -0.00018414, 0.0, 0.0, 0.0, 0.0),
+    Kg_(0.4477, -0.1282, -345.89, 2340100),
+    sigma_(761.0, 0.066442, 1.2634, 0.0, 0.0, 0.0),
+    D_(147.18, 20.1, 142.2, 28) // note: Same as nHeptane
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::bC10H7CH3::bC10H7CH3
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc0& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc6& surfaceTension,
+    const APIdiffCoefFunc& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::bC10H7CH3::bC10H7CH3(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.H b/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.H
index 4fffdd559c..add7fa7e93 100644
--- a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.H
+++ b/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.H
@@ -87,26 +87,9 @@ public:
     // Constructors
 
         //- Construct null
-        bC10H7CH3()
-        :
-            liquid(142.2, 761.0, 3.25e+6, 0.507, 0.260, 307.73, 1.7374e+1, 514.20, 1.4010e-30, 0.3459, 1.987e+4),
-            rho_(67.36014, 0.23843, 761, 0.2559),
-            pv_(134.31, -12103, -16.195, 6.9659e-06, 2),
-            hl_(761.0, 513150.492264416, 0.4044, 0, 0, 0),
-            cp_(811.322081575246, 2.30225035161744, 0.000862869198312236, 0, 0, 0),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(45001.2311880177, 811.322081575246, 1.15112517580872, 0.000287623066104079, 0, 0),
-            cpg_(760.126582278481, 2699.08579465542, 1564.1, 1994.51476793249, 727.49),
-            B_(0.00229430379746835, -3.53720112517581, -1067158.93108298, 2.29746835443038e+18, -2.68438818565401e+21),
-            mu_(-63.276, 4219, 7.5549, 0, 0),
-            mug_(2.1791e-06, 0.3717, 712.53, 0),
-            K_(0.1962, -0.00018414, 0, 0, 0, 0),
-            Kg_(0.4477, -0.1282, -345.89, 2340100),
-            sigma_(761.0, 0.066442, 1.2634, 0, 0, 0),
-            D_(147.18, 20.1, 142.2, 28) // NN: Same as nHeptane
-        {}
+        bC10H7CH3();
+
+        //- Construct from components
         bC10H7CH3
         (
             const liquid& l,
@@ -123,125 +106,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc6& surfaceTension,
             const APIdiffCoefFunc& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        bC10H7CH3(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        bC10H7CH3(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
-        //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        //- Liquid thermal conductivity [W/(m K)]
+        inline scalar K(scalar p, scalar T) const;
 
-        //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        //- Vapour thermal conductivity [W/(m K)]
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -260,9 +174,7 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const bC10H7CH3& l)
         {
             l.writeData(os);
@@ -277,6 +189,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "bC10H7CH3I.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3I.H b/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3I.H
new file mode 100644
index 0000000000..1be40b2f2d
--- /dev/null
+++ b/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3I.H
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::bC10H7CH3::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::bC10H7CH3::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::bC10H7CH3::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::bC10H7CH3::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::bC10H7CH3::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::bC10H7CH3::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::bC10H7CH3::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::bC10H7CH3::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::bC10H7CH3::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::bC10H7CH3::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::bC10H7CH3::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::bC10H7CH3::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::bC10H7CH3::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C b/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C
index 0cc62cedb9..f398523460 100644
--- a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C
+++ b/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C
@@ -24,25 +24,129 @@ License
 
 Description
 
--------------------------------------------------------------------------------
-*/
+\*---------------------------------------------------------------------------*/
 
 #include "iC3H8O.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(iC3H8O, 0);
+    addToRunTimeSelectionTable(liquid, iC3H8O,);
+    addToRunTimeSelectionTable(liquid, iC3H8O, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(iC3H8O, 0);
-addToRunTimeSelectionTable(liquid, iC3H8O,);
-addToRunTimeSelectionTable(liquid, iC3H8O, Istream);
+Foam::iC3H8O::iC3H8O()
+:
+    liquid
+    (
+        60.096,
+        508.31,
+        4.7643e+6,
+        0.22013,
+        0.248,
+        185.28,
+        3.20e-2,
+        355.41,
+        5.5372e-30,
+        0.6689,
+        2.3575e+4
+    ),
+    rho_(70.91328, 0.26475, 508.31, 0.243),
+    pv_(92.935, -8177.1, -10.031, 3.9988e-06, 2.0),
+    hl_(508.31, 948149.627263046, 0.087, 0.3007, 0.0, 0.0),
+    cp_
+    (
+        7760.91586794462,
+       -68.3672790202343,
+        0.241380457933972,
+       -0.000235057241746539,
+        0.0,
+        0.0
+    ),
+    h_
+    (
+       -6227786.27583977,
+        7760.91586794462,
+       -34.1836395101172,
+        0.0804601526446574,
+       -5.87643104366347e-05,
+        0.0
+    ),
+    cpg_(789.73642172524, 3219.8482428115, 1124, 1560.83599574015, 460.0),
+    B_
+    (
+        0.000502529286474973,
+       -0.104665867944622,
+       -717185.83599574,
+        3.3047124600639e+18,
+       -1.43270766773163e+21
+    ),
+    mu_(-8.23, 2282.2, -0.98495, 0.0, 0.0),
+    mug_(1.993e-07, 0.7233, 178.0, 0.0),
+    K_(0.2029, -0.0002278, 0.0, 0.0, 0.0, 0.0),
+    Kg_(-80.642, -1.4549, -604.42, 0.0),
+    sigma_(0.03818, -3.818e-05, -6.51e-08, 0.0, 0.0, 0.0),
+    D_(4.75e-10, 1.75, 0.0, 0.0, 0.0)
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::iC3H8O::iC3H8O
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc0& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc0& surfaceTension,
+    const NSRDSfunc1& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::iC3H8O::iC3H8O(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.H b/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.H
index ffa2acb32e..d6f59b9568 100644
--- a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.H
+++ b/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.H
@@ -85,26 +85,9 @@ public:
     // Constructors
 
         //- Construct null
-        iC3H8O()
-        :
-            liquid(60.096, 508.31, 4.7643e+6, 0.22013, 0.248, 185.28, 3.20e-2, 355.41, 5.5372e-30, 0.6689, 2.3575e+4),
-            rho_(70.91328, 0.26475, 508.31, 0.243),
-            pv_(92.935, -8177.1, -10.031, 3.9988e-06, 2),
-            hl_(508.31, 948149.627263046, 0.087, 0.3007, 0, 0),
-            cp_(7760.91586794462, -68.3672790202343, 0.241380457933972, -0.000235057241746539, 0, 0),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(-6227786.27583977, 7760.91586794462, -34.1836395101172, 0.0804601526446574, -5.87643104366347e-05, 0),
-            cpg_(789.73642172524, 3219.8482428115, 1124, 1560.83599574015, 460),
-            B_(0.000502529286474973, -0.104665867944622, -717185.83599574, 3.3047124600639e+18, -1.43270766773163e+21),
-            mu_(-8.23, 2282.2, -0.98495, 0, 0),
-            mug_(1.993e-07, 0.7233, 178, 0),
-            K_(0.2029, -0.0002278, 0, 0, 0, 0),
-            Kg_(-80.642, -1.4549, -604.42, 0),
-            sigma_(0.03818, -3.818e-05, -6.51e-08, 0, 0, 0),
-            D_(4.75e-10, 1.75, 0.0, 0.0, 0.0) // NN. same as iC3H8O
-        {}
+        iC3H8O();
+
+        //- Constrcut from components
         iC3H8O
         (
             const liquid& l,
@@ -121,125 +104,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc0& surfaceTension,
             const NSRDSfunc1& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        iC3H8O(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        iC3H8O(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
         //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        inline scalar K(scalar p, scalar T) const;
 
         //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -258,9 +172,7 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const iC3H8O& l)
         {
             l.writeData(os);
@@ -275,6 +187,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "iC3H8OI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/iC3H8O/iC3H8OI.H b/src/thermophysicalModels/liquids/iC3H8O/iC3H8OI.H
new file mode 100644
index 0000000000..3ec8bd368d
--- /dev/null
+++ b/src/thermophysicalModels/liquids/iC3H8O/iC3H8OI.H
@@ -0,0 +1,106 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::iC3H8O::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::iC3H8O::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::iC3H8O::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::iC3H8O::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::iC3H8O::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::iC3H8O::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::iC3H8O::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::iC3H8O::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::iC3H8O::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::iC3H8O::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::iC3H8O::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::iC3H8O::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::iC3H8O::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
+
diff --git a/src/thermophysicalModels/liquids/liquid/liquid.C b/src/thermophysicalModels/liquids/liquid/liquid.C
index e4ffc44b01..c2b5f8b3fa 100644
--- a/src/thermophysicalModels/liquids/liquid/liquid.C
+++ b/src/thermophysicalModels/liquids/liquid/liquid.C
@@ -33,16 +33,14 @@ License
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(liquid, 0);
-defineRunTimeSelectionTable(liquid,);
-defineRunTimeSelectionTable(liquid, Istream);
+    defineTypeNameAndDebug(liquid, 0);
+    defineRunTimeSelectionTable(liquid,);
+    defineRunTimeSelectionTable(liquid, Istream);
+}
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-autoPtr<liquid> liquid::New(Istream& is)
+Foam::autoPtr<Foam::liquid> Foam::liquid::New(Istream& is)
 {
     if (debug)
     {
@@ -64,8 +62,8 @@ autoPtr<liquid> liquid::New(Istream& is)
         {
             FatalErrorIn("liquid::New(Istream&)")
                 << "Unknown liquid type " << liquidType
-                << endl << endl
-                << "Valid liquid types are :" << endl
+                << nl << nl
+                << "Valid liquid types are:" << nl
                 << ConstructorTablePtr_->toc()
                 << abort(FatalError);
         }
@@ -82,7 +80,7 @@ autoPtr<liquid> liquid::New(Istream& is)
             FatalErrorIn("liquid::New(Istream&)")
                 << "Unknown liquid type " << liquidType
                 << endl << endl
-                << "Valid liquid types are :" << endl
+                << "Valid liquid types are:" << nl
                 << IstreamConstructorTablePtr_->toc()
                 << abort(FatalError);
         }
@@ -102,8 +100,4 @@ autoPtr<liquid> liquid::New(Istream& is)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/liquid/liquid.H b/src/thermophysicalModels/liquids/liquid/liquid.H
index 4c4769026f..0973f2b45e 100644
--- a/src/thermophysicalModels/liquids/liquid/liquid.H
+++ b/src/thermophysicalModels/liquids/liquid/liquid.H
@@ -162,10 +162,9 @@ public:
         static autoPtr<liquid> New(Istream& is);
 
 
-    // Destructor
-
-        virtual ~liquid()
-        {}
+    //- Destructor
+    virtual ~liquid()
+    {}
 
 
     // Member Functions
@@ -173,70 +172,37 @@ public:
         // Physical constants which define the specie
 
             //- Molecular weight [kg/kmol]
-            scalar W() const
-            {
-                return W_;
-            }
+            inline scalar W() const;
 
             //- Critical temperature [K]
-            scalar Tc() const
-            {
-                return Tc_;
-            }
+            inline scalar Tc() const;
 
             //- Critical pressure [Pa]
-            scalar Pc() const
-            {
-                return Pc_;
-            }
+            inline scalar Pc() const;
 
             //- Critical volume [m^3/mol]
-            scalar Vc() const
-            {
-                return Vc_;
-            }
+            inline scalar Vc() const;
 
             //- Critical compressibilty factor
-            scalar Zc() const
-            {
-                return Zc_;
-            }
+            inline scalar Zc() const;
 
             //- Triple point temperature [K]
-            scalar Tt() const
-            {
-                return Tt_;
-            }
+            inline scalar Tt() const;
 
             //- Triple point pressure [Pa]
-            scalar Pt() const
-            {
-                return Pt_;
-            }
+            inline scalar Pt() const;
 
             //- Normal boiling temperature [K]
-            scalar Tb() const
-            {
-                return Tb_;
-            }
+            inline scalar Tb() const;
 
             //- Dipole moment []
-            scalar dipm() const
-            {
-                return dipm_;
-            }
+            inline scalar dipm() const;
 
             //- Pitzer's ascentric factor []
-            scalar omega() const
-            {
-                return omega_;
-            }
+            inline scalar omega() const;
 
             //- Solubility parameter [(J/m^3)^(1/2)]
-            scalar delta() const
-            {
-                return delta_;
-            }
+            inline scalar delta() const;
 
 
         // Physical property pure virtual functions
@@ -278,6 +244,8 @@ public:
             virtual scalar D(scalar p, scalar T) const = 0;
 
 
+    // I-O
+
         //- Write the function coefficients
         virtual void writeData(Ostream& os) const
         {
@@ -290,9 +258,7 @@ public:
                 << delta_;
         }
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const liquid& l)
         {
             l.writeData(os);
diff --git a/src/thermophysicalModels/liquids/liquid/liquidI.H b/src/thermophysicalModels/liquids/liquid/liquidI.H
new file mode 100644
index 0000000000..cf941d79bf
--- /dev/null
+++ b/src/thermophysicalModels/liquids/liquid/liquidI.H
@@ -0,0 +1,93 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::liquid::W() const
+{
+    return W_;
+}
+
+
+inline Foam::scalar Foam::liquid::Tc() const
+{
+    return Tc_;
+}
+
+
+inline Foam::scalar Foam::liquid::Pc() const
+{
+    return Pc_;
+}
+
+
+inline Foam::scalar Foam::liquid::Vc() const
+{
+    return Vc_;
+}
+
+
+inline Foam::scalar Foam::liquid::Zc() const
+{
+    return Zc_;
+}
+
+
+inline Foam::scalar Foam::liquid::Tt() const
+{
+    return Tt_;
+}
+
+
+inline Foam::scalar Foam::liquid::Pt() const
+{
+    return Pt_;
+}
+
+
+inline Foam::scalar Foam::liquid::Tb() const
+{
+    return Tb_;
+}
+
+
+inline Foam::scalar Foam::liquid::dipm() const
+{
+    return dipm_;
+}
+
+
+inline Foam::scalar Foam::liquid::omega() const
+{
+    return omega_;
+}
+
+
+inline Foam::scalar Foam::liquid::delta() const
+{
+    return delta_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.C b/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.C
index cdf81e6b94..5b4be350ea 100644
--- a/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.C
+++ b/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.C
@@ -22,27 +22,129 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
--------------------------------------------------------------------------------
-*/
+\*---------------------------------------------------------------------------*/
 
 #include "nC3H8O.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(nC3H8O, 0);
+    addToRunTimeSelectionTable(liquid, nC3H8O,);
+    addToRunTimeSelectionTable(liquid, nC3H8O, Istream);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(nC3H8O, 0);
-addToRunTimeSelectionTable(liquid, nC3H8O,);
-addToRunTimeSelectionTable(liquid, nC3H8O, Istream);
+Foam::nC3H8O::nC3H8O()
+:
+    liquid
+    (
+        60.096,
+        536.71,
+        5.1696e+6,
+        0.21853,
+        0.253,
+        146.95,
+        6.5112e-7,
+        370.35,
+        5.6039e-30,
+        0.6279,
+        2.4557e+4
+    ),
+    rho_(75.300288, 0.272, 536.71, 0.2494),
+    pv_(77.46, -7960, -7.5235, 3e-07, 2.0),
+    hl_(536.71, 1098242.8115016, 0.647, -0.783, 0.613, 0.0),
+    cp_
+    (
+        216.320553780618,
+        18.5203674121406,
+       -0.0751797124600639,
+        0.000126464323748669,
+        0.0,
+        0.0
+    ),
+    h_
+    (
+       -5533091.96851587,
+        216.320553780618,
+        9.26018370607029,
+       -0.0250599041533546,
+        3.16160809371672e-05,
+        0.0
+    ),
+    cpg_(961.794462193823, 3467.78487752929, 1542, 2046.72523961661, 649),
+    B_
+    (
+        0.000933506389776358,
+       -1.09325079872204,
+       -531649.361022364,
+       -2.32627795527157e+17,
+       -3.81888977635783e+20
+    ),
+    mu_(0.571, 1521, -2.0894, 0.0, 0.0),
+    mug_(7.942e-07, 0.5491, 415.8, 0.0),
+    K_(0.204, -0.000169, 0.0, 0.0, 0.0, 0.0),
+    Kg_(-613.84, 0.7927, -1157400000.0, 0.0),
+    sigma_(0.04533, -6.88e-05, -1.6e-08, 0.0, 0.0, 0.0),
+    D_(4.75e-10, 1.75, 0.0, 0.0, 0.0) // note: same as iC3H8O
+{}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+Foam::nC3H8O::nC3H8O
+(
+    const liquid& l,
+    const NSRDSfunc5& density,
+    const NSRDSfunc1& vapourPressure,
+    const NSRDSfunc6& heatOfVapourisation,
+    const NSRDSfunc0& heatCapacity,
+    const NSRDSfunc0& enthalpy,
+    const NSRDSfunc7& idealGasHeatCapacity,
+    const NSRDSfunc4& secondVirialCoeff,
+    const NSRDSfunc1& dynamicViscosity,
+    const NSRDSfunc2& vapourDynamicViscosity,
+    const NSRDSfunc0& thermalConductivity,
+    const NSRDSfunc2& vapourThermalConductivity,
+    const NSRDSfunc0& surfaceTension,
+    const NSRDSfunc1& vapourDiffussivity
+)
+:
+    liquid(l),
+    rho_(density),
+    pv_(vapourPressure),
+    hl_(heatOfVapourisation),
+    cp_(heatCapacity),
+    h_(enthalpy),
+    cpg_(idealGasHeatCapacity),
+    B_(secondVirialCoeff),
+    mu_(dynamicViscosity),
+    mug_(vapourDynamicViscosity),
+    K_(thermalConductivity),
+    Kg_(vapourThermalConductivity),
+    sigma_(surfaceTension),
+    D_(vapourDiffussivity)
+{}
+
+
+Foam::nC3H8O::nC3H8O(Istream& is)
+:
+    liquid(is),
+    rho_(is),
+    pv_(is),
+    hl_(is),
+    cp_(is),
+    h_(is),
+    cpg_(is),
+    B_(is),
+    mu_(is),
+    mug_(is),
+    K_(is),
+    Kg_(is),
+    sigma_(is),
+    D_(is)
+{}
+
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.H b/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.H
index 5bb5ba21d7..27601bc548 100644
--- a/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.H
+++ b/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.H
@@ -85,26 +85,9 @@ public:
     // Constructors
 
         //- Construct null
-        nC3H8O()
-        :
-            liquid(60.096, 536.71, 5.1696e+6, 0.21853, 0.253, 146.95, 6.5112e-7, 370.35, 5.6039e-30, 0.6279, 2.4557e+4),
-            rho_(75.300288, 0.272, 536.71, 0.2494),
-            pv_(77.46, -7960, -7.5235, 3e-07, 2),
-            hl_(536.71, 1098242.8115016, 0.647, -0.783, 0.613, 0),
-            cp_(216.320553780618, 18.5203674121406, -0.0751797124600639, 0.000126464323748669, 0, 0),
-            // NN: enthalpy, h_, is not used in the sprayModel.
-            // For consistency, the enthalpy is derived from hlat and hl.
-            // It is, however, convenient to have it available.
-            h_(-5533091.96851587, 216.320553780618, 9.26018370607029, -0.0250599041533546, 3.16160809371672e-05, 0),
-            cpg_(961.794462193823, 3467.78487752929, 1542, 2046.72523961661, 649),
-            B_(0.000933506389776358, -1.09325079872204, -531649.361022364, -2.32627795527157e+17, -3.81888977635783e+20),
-            mu_(0.571, 1521, -2.0894, 0, 0),
-            mug_(7.942e-07, 0.5491, 415.8, 0),
-            K_(0.204, -0.000169, 0, 0, 0, 0),
-            Kg_(-613.84, 0.7927, -1157400000, 0),
-            sigma_(0.04533, -6.88e-05, -1.6e-08, 0, 0, 0),
-            D_(4.75e-10, 1.75, 0.0, 0.0, 0.0) // NN. same as iC3H8O
-        {}
+        nC3H8O();
+
+        //- Construct from components
         nC3H8O
         (
             const liquid& l,
@@ -121,125 +104,56 @@ public:
             const NSRDSfunc2& vapourThermalConductivity,
             const NSRDSfunc0& surfaceTension,
             const NSRDSfunc1& vapourDiffussivity
-        )
-        :
-            liquid(l),
-            rho_(density),
-            pv_(vapourPressure),
-            hl_(heatOfVapourisation),
-            cp_(heatCapacity),
-            h_(enthalpy),
-            cpg_(idealGasHeatCapacity),
-            B_(secondVirialCoeff),
-            mu_(dynamicViscosity),
-            mug_(vapourDynamicViscosity),
-            K_(thermalConductivity),
-            Kg_(vapourThermalConductivity),
-            sigma_(surfaceTension),
-            D_(vapourDiffussivity)
-        {}
+        );
 
         //- Construct from Istream
-        nC3H8O(Istream& is)
-        :
-            liquid(is),
-            rho_(is),
-            pv_(is),
-            hl_(is),
-            cp_(is),
-            h_(is),
-            cpg_(is),
-            B_(is),
-            mu_(is),
-            mug_(is),
-            K_(is),
-            Kg_(is),
-            sigma_(is),
-            D_(is)
-        {}
+        nC3H8O(Istream& is);
 
 
     // Member Functions
 
         //- Liquid density [kg/m^3]
-        scalar rho(scalar p, scalar T) const
-        {
-            return rho_.f(p, T);
-        }
+        inline scalar rho(scalar p, scalar T) const;
 
         //- Vapour pressure [Pa]
-        scalar pv(scalar p, scalar T) const
-        {
-            return pv_.f(p, T);
-        }
+        inline scalar pv(scalar p, scalar T) const;
 
         //- Heat of vapourisation [J/kg]
-        scalar hl(scalar p, scalar T) const
-        {
-            return hl_.f(p, T);
-        }
+        inline scalar hl(scalar p, scalar T) const;
 
         //- Liquid heat capacity [J/(kg K)]
-        scalar cp(scalar p, scalar T) const
-        {
-            return cp_.f(p, T);
-        }
+        inline scalar cp(scalar p, scalar T) const;
 
         //- Liquid Enthalpy [J/(kg)]
-        scalar h(scalar p, scalar T) const
-        {
-            return h_.f(p, T);
-        }
+        inline scalar h(scalar p, scalar T) const;
 
         //- Ideal gas heat capacity [J/(kg K)]
-        scalar cpg(scalar p, scalar T) const
-        {
-            return cpg_.f(p, T);
-        }
+        inline scalar cpg(scalar p, scalar T) const;
 
         //- Second Virial Coefficient [m^3/kg]
-        scalar B(scalar p, scalar T) const
-        {
-            return B_.f(p, T);
-        }
+        inline scalar B(scalar p, scalar T) const;
 
         //- Liquid viscosity [Pa s]
-        scalar mu(scalar p, scalar T) const
-        {
-            return mu_.f(p, T);
-        }
+        inline scalar mu(scalar p, scalar T) const;
 
         //- Vapour viscosity [Pa s]
-        scalar mug(scalar p, scalar T) const
-        {
-            return mug_.f(p, T);
-        }
+        inline scalar mug(scalar p, scalar T) const;
 
-        //- Liquid thermal conductivity  [W/(m K)]
-        scalar K(scalar p, scalar T) const
-        {
-            return K_.f(p, T);
-        }
+        //- Liquid thermal conductivity [W/(m K)]
+        inline scalar K(scalar p, scalar T) const;
 
-        //- Vapour thermal conductivity  [W/(m K)]
-        scalar Kg(scalar p, scalar T) const
-        {
-            return Kg_.f(p, T);
-        }
+        //- Vapour thermal conductivity [W/(m K)]
+        inline scalar Kg(scalar p, scalar T) const;
 
         //- Surface tension [N/m]
-        scalar sigma(scalar p, scalar T) const
-        {
-            return sigma_.f(p, T);
-        }
+        inline scalar sigma(scalar p, scalar T) const;
 
         //- Vapour diffussivity [m2/s]
-        scalar D(scalar p, scalar T) const
-        {
-            return D_.f(p, T);
-        }
+        inline scalar D(scalar p, scalar T) const;
 
 
+    // I-O
+
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {
@@ -258,9 +172,7 @@ public:
             D_.writeData(os); os << endl;
         }
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const nC3H8O& l)
         {
             l.writeData(os);
@@ -275,6 +187,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "nC3H8OI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquids/nC3H8O/nC3H8OI.H b/src/thermophysicalModels/liquids/nC3H8O/nC3H8OI.H
new file mode 100644
index 0000000000..ec850eddf8
--- /dev/null
+++ b/src/thermophysicalModels/liquids/nC3H8O/nC3H8OI.H
@@ -0,0 +1,106 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::scalar Foam::nC3H8O::rho(scalar p, scalar T) const
+{
+    return rho_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::nC3H8O::pv(scalar p, scalar T) const
+{
+    return pv_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::nC3H8O::hl(scalar p, scalar T) const
+{
+    return hl_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::nC3H8O::cp(scalar p, scalar T) const
+{
+    return cp_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::nC3H8O::h(scalar p, scalar T) const
+{
+    return h_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::nC3H8O::cpg(scalar p, scalar T) const
+{
+    return cpg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::nC3H8O::B(scalar p, scalar T) const
+{
+    return B_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::nC3H8O::mu(scalar p, scalar T) const
+{
+    return mu_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::nC3H8O::mug(scalar p, scalar T) const
+{
+    return mug_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::nC3H8O::K(scalar p, scalar T) const
+{
+    return K_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::nC3H8O::Kg(scalar p, scalar T) const
+{
+    return Kg_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::nC3H8O::sigma(scalar p, scalar T) const
+{
+    return sigma_.f(p, T);
+}
+
+
+inline Foam::scalar Foam::nC3H8O::D(scalar p, scalar T) const
+{
+    return D_.f(p, T);
+}
+
+
+// ************************************************************************* //
+

From 9fb1dac1cc4a482895320267d19b6a39538a5cd5 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Tue, 7 Jul 2009 10:50:37 +0100
Subject: [PATCH 23/84] Adding check for density < VSMALL to avoid FPE.

Modifying nanoNozzle tutorial to shorten the run and increase the density.
---
 .../molecule/moleculeCloud/moleculeCloud.C    | 27 ++++++++++++++++---
 .../mdFoam/nanoNozzle/system/controlDict      |  2 +-
 .../mdFoam/nanoNozzle/system/mdInitialiseDict |  6 ++---
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
index b747373e3a..113fb82942 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
@@ -507,7 +507,7 @@ void Foam::moleculeCloud::initialiseMolecules
             else
             {
                 const dictionary& zoneDict =
-                mdInitialiseDict.subDict(zone.name());
+                    mdInitialiseDict.subDict(zone.name());
 
                 const scalar temperature
                 (
@@ -530,7 +530,7 @@ void Foam::moleculeCloud::initialiseMolecules
                 {
                     FatalErrorIn("Foam::moleculeCloud::initialiseMolecules")
                         << "latticeIds and latticePositions must be the same "
-                            << " size." << nl
+                        << " size." << nl
                         << abort(FatalError);
                 }
 
@@ -548,6 +548,15 @@ void Foam::moleculeCloud::initialiseMolecules
                         zoneDict.lookup("numberDensity")
                     );
 
+                    if (numberDensity < VSMALL)
+                    {
+                        WarningIn("moleculeCloud::initialiseMolecules")
+                            << "numberDensity too small, not filling zone "
+                            << zone.name() << endl;
+
+                        continue;
+                    }
+
                     latticeCellScale = pow
                     (
                         latticeIds.size()/(det(latticeCellShape)*numberDensity),
@@ -572,9 +581,19 @@ void Foam::moleculeCloud::initialiseMolecules
                         zoneDict.lookup("massDensity")
                     );
 
+                    if (massDensity < VSMALL)
+                    {
+                        WarningIn("moleculeCloud::initialiseMolecules")
+                            << "massDensity too small, not filling zone "
+                            << zone.name() << endl;
+
+                        continue;
+                    }
+
+
                     latticeCellScale = pow
                     (
-                        unitCellMass /(det(latticeCellShape)*massDensity),
+                        unitCellMass/(det(latticeCellShape)*massDensity),
                         (1.0/3.0)
                     );
                 }
@@ -906,7 +925,7 @@ void Foam::moleculeCloud::initialiseMolecules
                     )
                     {
                         WarningIn("Foam::moleculeCloud::initialiseMolecules()")
-                        << "A whole layer of unit cells was placed "
+                            << "A whole layer of unit cells was placed "
                             << "outside the bounds of the mesh, but no "
                             << "molecules have been placed in zone '"
                             << zone.name()
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict
index 8a3ba00616..51a42ecc0e 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict
@@ -20,7 +20,7 @@ startTime       0;
 
 stopAt          endTime;
 
-endTime         1e-10;
+endTime         5e-12;
 
 deltaT          1e-15;
 
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdInitialiseDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdInitialiseDict
index ac85160f5c..0d91d5a08b 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdInitialiseDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdInitialiseDict
@@ -27,7 +27,7 @@ FoamFile
 
 sectionA
 {
-    massDensity             980;
+    massDensity             1004;
     temperature             298;
     bulkVelocity            (0.0 0.0 0.0);
     latticeIds
@@ -46,7 +46,7 @@ sectionA
 
 sectionB
 {
-    massDensity             980;
+    massDensity             1004;
     temperature             298;
     bulkVelocity            (0.0 0.0 0.0);
     latticeIds
@@ -65,7 +65,7 @@ sectionB
 
 sectionC
 {
-    massDensity             980;
+    massDensity             1004;
     temperature             298;
     bulkVelocity            (0.0 0.0 0.0);
     latticeIds

From d02e3f1468732b02afcec53766f5e4ed7db16ab6 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Tue, 7 Jul 2009 15:38:50 +0100
Subject: [PATCH 24/84] unused files

---
 .../mesh/generation/extrudeMesh/setRoots.H       | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 applications/utilities/mesh/generation/extrudeMesh/setRoots.H

diff --git a/applications/utilities/mesh/generation/extrudeMesh/setRoots.H b/applications/utilities/mesh/generation/extrudeMesh/setRoots.H
deleted file mode 100644
index 9c13db28d1..0000000000
--- a/applications/utilities/mesh/generation/extrudeMesh/setRoots.H
+++ /dev/null
@@ -1,16 +0,0 @@
-    argList::validArgs.clear();
-    argList::noParallel();
-
-    argList::validOptions.insert("sourceCase", "source case");
-    argList::validOptions.insert("sourcePatch", "source patch");
-
-    argList::validOptions.insert("surface", "surface file");
-
-    argList::validOptions.insert("mergeFaces", "");
-
-    argList args(argc, argv);
-
-    if (!args.check())
-    {
-         FatalError.exit();
-    }

From 302a5c1a8211dd913d1e2fbc9fbcc44699e0de7e Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Tue, 7 Jul 2009 15:39:02 +0100
Subject: [PATCH 25/84] unused files

---
 .../wallModel/reflectParcel/reflectParcel.C2  | 211 ------------------
 1 file changed, 211 deletions(-)
 delete mode 100755 src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C2

diff --git a/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C2 b/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C2
deleted file mode 100755
index 7a209cc8e3..0000000000
--- a/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C2
+++ /dev/null
@@ -1,211 +0,0 @@
-// The FOAM Project // File: reflectParcel.C
-/*
--------------------------------------------------------------------------------
- =========         | Class Implementation
- \\      /         |
-  \\    /          | Name:   reflectParcel
-   \\  /           | Family: wallModel
-    \\/            |
-    F ield         | FOAM version: 2.3
-    O peration     |
-    A and          | Copyright (C) 1991-2009 OpenCFD Ltd.
-    M anipulation  |          All Rights Reserved.
--------------------------------------------------------------------------------
-DESCRIPTION
-
-AUTHOR
-    Henry G Weller.
-
--------------------------------------------------------------------------------
-*/
-
-#include "reflectParcel.H"
-#include "addToRunTimeSelectionTable.H"
-#include "wallPolyPatch.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(reflectParcel, 0);
-
-addToRunTimeSelectionTable
-(
-    wallModel,
-    reflectParcel,
-    dictionary
-);
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-// Construct from components
-reflectParcel::reflectParcel
-(
-    const dictionary& dict,
-    const fvMesh& mesh,
-    spray& sm
-)
-:
-    wallModel(dict, mesh, sm),
-    coeffsDict_(dict.subDict(typeName + "Coeffs")),
-    elasticity_(readScalar(coeffsDict_.lookup("elasticity")))
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-reflectParcel::~reflectParcel()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-// Return 'keepParcel'
-bool reflectParcel::wallTreatment
-(
-    parcel& p
-) const
-{
-    label patchi = p.patch();
-    label facei = p.patchFace(patchi);
-
-    const polyMesh& mesh = spray_.mesh();
-
-    if (typeid(mesh_.boundaryMesh()[patchi]) == typeid(wallPolyPatch))
-    {
-        // wallNormal defined to point outwards of domain
-        vector Sf = mesh_.Sf().boundaryField()[patchi][facei];
-        Sf /= mag(Sf);
-
-        // adjust velocity when wall is moving
-        if (!mesh.moving())
-        {
-            scalar Un = p.U() & Sf;
-            
-            if (Un > 0)
-            {
-                p.U() -= (1.0 + elasticity_)*Un*Sf;
-            }
-
-        }
-        else
-        {
-            label facep = p.face();
-
-            scalar dt = spray_.runTime().deltaT().value();
-            scalar fraction = p.t0()/dt;
-            const vectorField& oldPoints = mesh.oldPoints();
-            const vector& Cf1 = mesh.faceCentres()[facep];
-
-            vector Cf0 = mesh.faces()[facep].centre(oldPoints);
-            vector Cf = Cf0 + fraction*(Cf1 - Cf0);
-            vector Sf0 = mesh.faces()[facep].normal(oldPoints);
-            Sf0 /= mag(Sf0);
-
-            scalar magSfDiff = mag(Sf - Sf0);
-
-            if (magSfDiff > SMALL)
-            {
-                bool pureRotation = false;
-
-                if (pureRotation)
-                {
-                    // rotation
-                    
-                    // find center of rotation
-                    vector omega = Sf0 ^ Sf;
-                    scalar magOmega = mag(omega);
-                    omega /= magOmega+SMALL;
-                    vector n0 = omega ^ Sf0;
-                    scalar lam = ((Cf1 - Cf0) & Sf)/(n0 & Sf);
-                    vector r0 = Cf0 + lam*n0;
-                    
-                    scalar phiVel = ::asin(magOmega)/dt;
-                    
-                    vector pos = p.position() - r0;
-                    vector v = phiVel*(omega ^ pos);
-
-                    vector Sfp = Sf0 + fraction*(Sf - Sf0);
-                    //vector Sfp = Sf;
-
-                    vector Ur = p.U() - v;
-                    scalar Urn = Ur & Sfp;
-                    /*
-                    scalar dd = (p.position() - r0) & Sfp;
-                    Info << "Urn = " << Urn
-                        << ", dd = " << dd
-                        << ", pos = " << p.position()
-                        << ", Sfp = " << Sfp
-                        << ", omega = " << omega
-                        << ", r0 = " << r0
-                        << endl;
-                        */
-                    if (Urn > 0.0)
-                    {
-                        p.U() -= (1.0 + elasticity_)*Urn*Sfp;
-                    }
-                }
-                else
-                {
-                    vector Sfp = Sf0 + fraction*(Sf - Sf0);
-                    //vector Sfp = Sf;
-                    vector omega = Sf0 ^ Sf;
-                    scalar magOmega = mag(omega);
-                    omega /= magOmega+SMALL;
-                    
-                    scalar phiVel = ::asin(magOmega)/dt;
-                    
-                    scalar dist = (p.position() - Cf) & Sfp;
-                    vector pos = p.position() - dist*Sfp;
-                    vector vrot = phiVel*(omega ^ (pos - Cf));
-                    vector vtrans = (Cf1 - Cf0)/dt;
-                    vector v = vtrans + vrot;
-
-                    scalar Un = ((p.U() - v) & Sfp);
-                    
-                    if (Un > 0.0)
-                    {
-                        p.U() -= (1.0 + elasticity_)*Un*Sfp;
-                    }
-                }
-            }
-            else
-            {
-                // translation
-
-                vector v = (Cf1 - Cf0)/dt;
-                vector Ur = p.U() - v;
-                scalar Urn = Ur & Sf;
-
-                if (Urn > 0.0)
-                {
-                    Ur -= (1.0 + elasticity_)*Urn*Sf;
-                    p.U() = Ur + v;
-                }
-
-
-            }
-        }
-
-    }
-    else
-    {
-        FatalError
-            << "bool reflectParcel::wallTreatment(parcel& parcel) const "
-                << " parcel has hit a boundary " 
-                << mesh_.boundary()[patchi].type()
-                << " which not yet has been implemented."
-            << abort(FatalError);
-    }
-    return true;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //

From f3b6566f329278bcd179b8cd007ba13e19cacb0a Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Tue, 7 Jul 2009 15:45:58 +0100
Subject: [PATCH 26/84] cleanup and running

---
 .../porousExplicitSourceReactingParcelFoam/filter/Allclean  | 1 +
 .../porousExplicitSourceReactingParcelFoam/filter/Allrun    | 1 +
 .../filter/system/decomposeParDict                          | 6 ++----
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allclean b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allclean
index d8e9677f46..9ded4bdec6 100755
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allclean
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allclean
@@ -3,6 +3,7 @@ set -x
 
 # remove old cell sets
 rm -rf constant/polyMesh/sets
+foamClearPolyMesh
 
 # remove old time folders
 rm -rf 0 *[1-9]*
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun
index 8378f1f44b..701d55dc28 100755
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun
@@ -15,6 +15,7 @@ setSet -batch system/sets.setSet >& log.setSet1
 setsToZones -noFlipMap >& log.setsToZones
 
 # create the first cyclic - lhs of porous zone
+unset FOAM_SETNAN
 createBaffles cycLeft cycLeft -overwrite >& log.createBaffles1
 
 # create the second cyclic - rhs of porous zone
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/decomposeParDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/decomposeParDict
index 152e9d0528..c8ec739687 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/decomposeParDict
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/decomposeParDict
@@ -19,7 +19,7 @@ numberOfSubdomains 4;
 
 method          metis;
 
-preservePatches
+preserveFaceZones
 (
     cycLeft
     cycRight
@@ -39,9 +39,7 @@ hierarchicalCoeffs
 }
 
 metisCoeffs
-{
-    processorWeights ( 1 1 1 1 );
-}
+{}
 
 manualCoeffs
 {

From 4e2d5a907159b588dc6575aa1a857d8f09fa087b Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Tue, 7 Jul 2009 15:47:05 +0100
Subject: [PATCH 27/84] Particle backwards compatibility

---
 .../trackedParticle/trackedParticle.C         |   2 +-
 src/lagrangian/basic/Cloud/Cloud.C            |  41 ++--
 src/lagrangian/basic/Cloud/Cloud.H            |  25 ++-
 src/lagrangian/basic/Cloud/CloudIO.C          |  14 +-
 src/lagrangian/basic/IOPosition/IOPosition.C  |  21 +-
 src/lagrangian/basic/IOPosition/IOPosition.H  |  10 +-
 src/lagrangian/basic/Particle/Particle.C      |  16 +-
 src/lagrangian/basic/Particle/Particle.H      |  18 +-
 src/lagrangian/basic/Particle/ParticleIO.C    | 183 ++++++++++++++----
 .../basic/indexedParticle/indexedParticle.H   |   2 +-
 .../indexedParticle/indexedParticleCloud.C    |  24 ++-
 .../indexedParticle/indexedParticleCloud.H    |  91 +++++++++
 .../basic/passiveParticle/passiveParticle.H   |   5 +-
 .../passiveParticle/passiveParticleCloud.C    |  33 +++-
 .../passiveParticle/passiveParticleCloud.H    |  94 +++++++++
 .../coalCombustion/CoalCloud/CoalCloud.H      |   2 +-
 src/lagrangian/coalCombustion/Make/files      |   0
 src/lagrangian/coalCombustion/Make/options    |   0
 src/lagrangian/dieselSpray/parcel/parcelIO.C  |   2 +-
 src/lagrangian/dieselSpray/spray/spray.H      |   2 +-
 .../dsmc/clouds/derived/dsmcCloud/dsmcCloud.H |   2 +-
 src/lagrangian/intermediate/Make/files        |   1 +
 .../BasicReactingCloud/BasicReactingCloud.H   |   2 +-
 .../BasicReactingMultiphaseCloud.H            |   2 +-
 .../basicKinematicCloud/basicKinematicCloud.H |   2 +-
 .../basicThermoCloud/basicThermoCloud.H       |   2 +-
 .../InjectionModel/InjectionModel.C           |   3 +-
 .../molecularDynamics/molecule/Make/files     |   0
 .../molecularDynamics/molecule/Make/options   |   0
 .../solidParticle/solidParticleCloud.H        |   4 +-
 30 files changed, 477 insertions(+), 126 deletions(-)
 create mode 100644 src/lagrangian/basic/indexedParticle/indexedParticleCloud.H
 create mode 100644 src/lagrangian/basic/passiveParticle/passiveParticleCloud.H
 mode change 100755 => 100644 src/lagrangian/coalCombustion/Make/files
 mode change 100755 => 100644 src/lagrangian/coalCombustion/Make/options
 mode change 100755 => 100644 src/lagrangian/molecularDynamics/molecule/Make/files
 mode change 100755 => 100644 src/lagrangian/molecularDynamics/molecule/Make/options

diff --git a/src/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C b/src/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C
index 761ca5b447..7cd8fb9dd2 100644
--- a/src/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C
+++ b/src/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C
@@ -56,7 +56,7 @@ Foam::trackedParticle::trackedParticle
     bool readFields
 )
 :
-    ExactParticle<trackedParticle>(c, is)
+    ExactParticle<trackedParticle>(c, is, readFields)
 {
     if (readFields)
     {
diff --git a/src/lagrangian/basic/Cloud/Cloud.C b/src/lagrangian/basic/Cloud/Cloud.C
index 72e1b1f818..e3e0b4f63f 100644
--- a/src/lagrangian/basic/Cloud/Cloud.C
+++ b/src/lagrangian/basic/Cloud/Cloud.C
@@ -42,15 +42,12 @@ Foam::Cloud<ParticleType>::Cloud
 )
 :
     cloud(pMesh),
-    IDLList<ParticleType>(particles),
+    IDLList<ParticleType>(),
     polyMesh_(pMesh),
-    allFaces_(pMesh.faces()),
-    points_(pMesh.points()),
-    cellFaces_(pMesh.cells()),
-    allFaceCentres_(pMesh.faceCentres()),
-    owner_(pMesh.faceOwner()),
-    neighbour_(pMesh.faceNeighbour())
-{}
+    particleCount_(0)
+{
+    IDLList<ParticleType>::operator=(particles);
+}
 
 
 template<class ParticleType>
@@ -62,19 +59,31 @@ Foam::Cloud<ParticleType>::Cloud
 )
 :
     cloud(pMesh, cloudName),
-    IDLList<ParticleType>(particles),
+    IDLList<ParticleType>(),
     polyMesh_(pMesh),
-    allFaces_(pMesh.faces()),
-    points_(pMesh.points()),
-    cellFaces_(pMesh.cells()),
-    allFaceCentres_(pMesh.faceCentres()),
-    owner_(pMesh.faceOwner()),
-    neighbour_(pMesh.faceNeighbour())
-{}
+    particleCount_(0)
+{
+    IDLList<ParticleType>::operator=(particles);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class ParticleType>
+Foam::label Foam::Cloud<ParticleType>::getNewParticleID() const
+{
+    label id = particleCount_++;
+
+    if (id == labelMax)
+    {
+        WarningIn("Cloud<ParticleType>::getNewParticleID() const")
+            << "Particle counter has overflowed. This might cause problems"
+            << " when reconstructing particle tracks." << endl;
+    }
+    return id;
+}
+
+
 template<class ParticleType>
 void Foam::Cloud<ParticleType>::addParticle(ParticleType* pPtr)
 {
diff --git a/src/lagrangian/basic/Cloud/Cloud.H b/src/lagrangian/basic/Cloud/Cloud.H
index e298affe7d..626042e68a 100644
--- a/src/lagrangian/basic/Cloud/Cloud.H
+++ b/src/lagrangian/basic/Cloud/Cloud.H
@@ -50,6 +50,9 @@ namespace Foam
 template<class ParticleType>
 class Cloud;
 
+template<class ParticleType>
+class IOPosition;
+
 template<class ParticleType>
 Ostream& operator<<
 (
@@ -71,12 +74,9 @@ class Cloud
     // Private data
 
         const polyMesh& polyMesh_;
-        const faceList& allFaces_;
-        const vectorField& points_;
-        const cellList& cellFaces_;
-        const vectorField& allFaceCentres_;
-        const unallocLabelList& owner_;
-        const unallocLabelList& neighbour_;
+
+        //- Overall count of particles ever created. Never decreases.
+        mutable label particleCount_;
 
         //- Temporary storage for addressing. Used in findFaces.
         mutable DynamicList<label> labels_;
@@ -92,6 +92,8 @@ public:
 
     template<class ParticleT>
     friend class Particle;
+    template<class ParticleT>
+    friend class IOPosition;
 
     typedef ParticleType particleType;
 
@@ -218,6 +220,9 @@ public:
                 return IDLList<ParticleType>::clear();
             };
 
+            //- Get unique particle creation id
+            label getNewParticleID() const;
+
             //- Transfer particle to cloud
             void addParticle(ParticleType* pPtr);
 
@@ -251,13 +256,15 @@ public:
                 const IOField<DataType>& data
             ) const;
 
-            //- Read the field data for the cloud of particles
-            void readFields();
+            //- Read the field data for the cloud of particles. Dummy at
+            //  this level.
+            virtual void readFields();
 
 
         // Write
 
-            //- Write the field data for the cloud of particles
+            //- Write the field data for the cloud of particles Dummy at
+            //  this level.
             virtual void writeFields() const;
 
             //- Write using given format, version and compression.
diff --git a/src/lagrangian/basic/Cloud/CloudIO.C b/src/lagrangian/basic/Cloud/CloudIO.C
index 42c1a9317a..c1e4b30f80 100644
--- a/src/lagrangian/basic/Cloud/CloudIO.C
+++ b/src/lagrangian/basic/Cloud/CloudIO.C
@@ -67,12 +67,7 @@ Foam::Cloud<ParticleType>::Cloud
 :
     cloud(pMesh),
     polyMesh_(pMesh),
-    allFaces_(pMesh.faces()),
-    points_(pMesh.points()),
-    cellFaces_(pMesh.cells()),
-    allFaceCentres_(pMesh.faceCentres()),
-    owner_(pMesh.faceOwner()),
-    neighbour_(pMesh.faceNeighbour())
+    particleCount_(0)
 {
     initCloud(checkClass);
 }
@@ -88,12 +83,7 @@ Foam::Cloud<ParticleType>::Cloud
 :
     cloud(pMesh, cloudName),
     polyMesh_(pMesh),
-    allFaces_(pMesh.faces()),
-    points_(pMesh.points()),
-    cellFaces_(pMesh.cells()),
-    allFaceCentres_(pMesh.faceCentres()),
-    owner_(pMesh.faceOwner()),
-    neighbour_(pMesh.faceNeighbour())
+    particleCount_(0)
 {
     initCloud(checkClass);
 }
diff --git a/src/lagrangian/basic/IOPosition/IOPosition.C b/src/lagrangian/basic/IOPosition/IOPosition.C
index 810a9fbcf5..5f12742d8c 100644
--- a/src/lagrangian/basic/IOPosition/IOPosition.C
+++ b/src/lagrangian/basic/IOPosition/IOPosition.C
@@ -34,6 +34,7 @@ Foam::word Foam::IOPosition<ParticleType>::particlePropertiesName
     "particleProperties"
 );
 
+
 // * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * * //
 
 template<class ParticleType>
@@ -58,7 +59,7 @@ void Foam::IOPosition<ParticleType>::readParticleProperties()
         if (propsDict.found(procName))
         {
             propsDict.subDict(procName).lookup("particleCount")
-                >> Particle<ParticleType>::particleCount;
+                >> cloud_.particleCount_;
         }
     }
 }
@@ -83,11 +84,7 @@ void Foam::IOPosition<ParticleType>::writeParticleProperties() const
 
     word procName("processor" + Foam::name(Pstream::myProcNo()));
     propsDict.add(procName, dictionary());
-    propsDict.subDict(procName).add
-    (
-        "particleCount",
-        Particle<ParticleType>::particleCount
-    );
+    propsDict.subDict(procName).add("particleCount", cloud_.particleCount_);
 
     propsDict.regIOobject::write();
 }
@@ -135,13 +132,20 @@ bool Foam::IOPosition<ParticleType>::write() const
 template<class ParticleType>
 bool Foam::IOPosition<ParticleType>::writeData(Ostream& os) const
 {
+    // Write global cloud data
     writeParticleProperties();
 
     os<< cloud_.size() << nl << token::BEGIN_LIST << nl;
 
     forAllConstIter(typename Cloud<ParticleType>, cloud_, iter)
     {
-        os<< static_cast<const Particle<ParticleType>&>(iter()) << nl;
+        // Prevent writing additional fields
+        static_cast<const Particle<ParticleType>&>(iter()).write
+        (
+            os,
+            false
+        );
+        os  << nl;
     }
 
     os<< token::END_LIST << endl;
@@ -157,6 +161,7 @@ void Foam::IOPosition<ParticleType>::readData
     bool checkClass
 )
 {
+    // Read global cloud data. Resets count on cloud.
     readParticleProperties();
 
     Istream& is = readStream(checkClass ? typeName : "");
@@ -172,6 +177,7 @@ void Foam::IOPosition<ParticleType>::readData
 
         for (label i=0; i<s; i++)
         {
+            // Do not read any fields, position only
             c.append(new ParticleType(c, is, false));
         }
 
@@ -202,6 +208,7 @@ void Foam::IOPosition<ParticleType>::readData
         )
         {
             is.putBack(lastToken);
+            // Do not read any fields, position only
             c.append(new ParticleType(c, is, false));
             is >> lastToken;
         }
diff --git a/src/lagrangian/basic/IOPosition/IOPosition.H b/src/lagrangian/basic/IOPosition/IOPosition.H
index 069dc0135d..982416fdc8 100644
--- a/src/lagrangian/basic/IOPosition/IOPosition.H
+++ b/src/lagrangian/basic/IOPosition/IOPosition.H
@@ -26,7 +26,7 @@ Class
     Foam::IOPosition
 
 Description
-    Helper IO class to write particle positions
+    Helper IO class to read and write particle positions
 
 SourceFiles
     IOPosition.C
@@ -72,7 +72,7 @@ public:
 
     // Static data
 
-        //- Runtime type name information
+        //- Runtime type name information. Use cloud type.
         virtual const word& type() const
         {
             return cloud_.type();
@@ -90,11 +90,11 @@ public:
 
     // Member functions
 
-        void readData(Cloud<ParticleType>& c, bool checkClass);
+        virtual void readData(Cloud<ParticleType>& c, bool checkClass);
 
-        bool write() const;
+        virtual bool write() const;
 
-        bool writeData(Ostream& os) const;
+        virtual bool writeData(Ostream& os) const;
 };
 
 
diff --git a/src/lagrangian/basic/Particle/Particle.C b/src/lagrangian/basic/Particle/Particle.C
index 0658e4947f..4838da0ad1 100644
--- a/src/lagrangian/basic/Particle/Particle.C
+++ b/src/lagrangian/basic/Particle/Particle.C
@@ -33,12 +33,6 @@ License
 #include "wallPolyPatch.H"
 #include "transform.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-template<class ParticleType>
-Foam::label Foam::Particle<ParticleType>::particleCount = 0;
-
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class ParticleType>
@@ -184,7 +178,7 @@ Foam::Particle<ParticleType>::Particle
     facei_(-1),
     stepFraction_(0.0),
     origProc_(Pstream::myProcNo()),
-    origId_(particleCount++)
+    origId_(cloud_.getNewParticleID())
 {}
 
 
@@ -313,13 +307,13 @@ Foam::scalar Foam::Particle<ParticleType>::trackToFace
         // change cell
         if (internalFace) // Internal face
         {
-            if (celli_ == cloud_.owner_[facei_])
+            if (celli_ == mesh.faceOwner()[facei_])
             {
-                celli_ = cloud_.neighbour_[facei_];
+                celli_ = mesh.faceNeighbour()[facei_];
             }
-            else if (celli_ == cloud_.neighbour_[facei_])
+            else if (celli_ == mesh.faceNeighbour()[facei_])
             {
-                celli_ = cloud_.owner_[facei_];
+                celli_ = mesh.faceOwner()[facei_];
             }
             else
             {
diff --git a/src/lagrangian/basic/Particle/Particle.H b/src/lagrangian/basic/Particle/Particle.H
index 71011d72a4..a1077a604e 100644
--- a/src/lagrangian/basic/Particle/Particle.H
+++ b/src/lagrangian/basic/Particle/Particle.H
@@ -279,9 +279,6 @@ public:
         //- String representation of properties
         static string propHeader;
 
-        //- Cumulative particle count used for particle id
-        static label particleCount;
-
 
     // Constructors
 
@@ -330,7 +327,15 @@ public:
 
             autoPtr<ParticleType> operator()(Istream& is) const
             {
-                return autoPtr<ParticleType>(new ParticleType(cloud_, is));
+                return autoPtr<ParticleType>
+                (
+                    new ParticleType
+                    (
+                        cloud_,
+                        is,
+                        true
+                    )
+                );
             }
         };
 
@@ -454,9 +459,14 @@ public:
 
     // I-O
 
+        //- Read the fields associated with the owner cloud
+        static void readFields(Cloud<ParticleType>& c);
+
         //- Write the fields associated with the owner cloud
         static void writeFields(const Cloud<ParticleType>& c);
 
+        //- Write the particle data
+        void write(Ostream& os, bool writeFields) const;
 
     // Ostream Operator
 
diff --git a/src/lagrangian/basic/Particle/ParticleIO.C b/src/lagrangian/basic/Particle/ParticleIO.C
index 5865cf5098..77774cf90b 100644
--- a/src/lagrangian/basic/Particle/ParticleIO.C
+++ b/src/lagrangian/basic/Particle/ParticleIO.C
@@ -50,23 +50,49 @@ Foam::Particle<ParticleType>::Particle
     origProc_(Pstream::myProcNo()),
     origId_(-1)
 {
+
+    // readFields : read additional data. Should be consistent with writeFields.
+
     if (is.format() == IOstream::ASCII)
     {
-        is >> position_ >> celli_ >> origProc_ >> origId_;
+        is >> position_ >> celli_;
+        if (readFields)
+        {
+            is >> origProc_ >> origId_;
+        }
+        else
+        {
+            origId_ = cloud_.getNewParticleID();
+        }
     }
     else
     {
         // In binary read all particle data - needed for parallel transfer
-        is.read
-        (
-            reinterpret_cast<char*>(&position_),
-            sizeof(position_)
-            + sizeof(celli_)
-            + sizeof(facei_)
-            + sizeof(stepFraction_)
-            + sizeof(origProc_)
-            + sizeof(origId_)
-        );
+        if (readFields)
+        {
+            is.read
+            (
+                reinterpret_cast<char*>(&position_),
+                sizeof(position_)
+              + sizeof(celli_)
+              + sizeof(facei_)
+              + sizeof(stepFraction_)
+              + sizeof(origProc_)
+              + sizeof(origId_)
+            );
+        }
+        else
+        {
+            is.read
+            (
+                reinterpret_cast<char*>(&position_),
+                sizeof(position_)
+              + sizeof(celli_)
+              + sizeof(facei_)
+              + sizeof(stepFraction_)
+            );
+            origId_ = cloud_.getNewParticleID();
+        }
     }
 
     if (celli_ == -1)
@@ -79,6 +105,38 @@ Foam::Particle<ParticleType>::Particle
 }
 
 
+template<class ParticleType>
+void Foam::Particle<ParticleType>::readFields
+(
+    Cloud<ParticleType>& c
+)
+{
+    if (!c.size())
+    {
+        return;
+    }
+
+    IOobject procIO(c.fieldIOobject("origProcId", IOobject::MUST_READ));
+    if (procIO.headerOk())
+    {
+        IOField<label> origProcId(procIO);
+        c.checkFieldIOobject(c, origProcId);
+        IOField<label> origId(c.fieldIOobject("origId", IOobject::MUST_READ));
+        c.checkFieldIOobject(c, origId);
+
+        label i = 0;
+        forAllIter(typename Cloud<ParticleType>, c, iter)
+        {
+            ParticleType& p = iter();
+
+            p.origProc_ = origProcId[i];
+            p.origId_ = origId[i];
+            i++;
+        }
+    }
+}
+
+
 template<class ParticleType>
 void Foam::Particle<ParticleType>::writeFields
 (
@@ -88,36 +146,91 @@ void Foam::Particle<ParticleType>::writeFields
     // Write the cloud position file
     IOPosition<ParticleType> ioP(c);
     ioP.write();
+
+    label np =  c.size();
+
+    IOField<label> origProc
+    (
+        c.fieldIOobject
+        (
+            "origProcId",
+            IOobject::NO_READ
+        ),
+        np
+    );
+    IOField<label> origId(c.fieldIOobject("origId", IOobject::NO_READ), np);
+
+    label i = 0;
+    forAllConstIter(typename Cloud<ParticleType>, c, iter)
+    {
+        origProc[i] = iter().origProc_;
+        origId[i] = iter().origId_;
+        i++;
+    }
+
+    origProc.write();
+    origId.write();
+}
+
+
+template<class ParticleType>
+void Foam::Particle<ParticleType>::write(Ostream& os, bool writeFields) const
+{
+    if (os.format() == IOstream::ASCII)
+    {
+        if (writeFields)
+        {
+            // Write the additional entries
+            os << position_
+               << token::SPACE << celli_
+               << token::SPACE << origProc_
+               << token::SPACE << origId_;
+        }
+        else
+        {
+            os << position_
+               << token::SPACE << celli_;
+        }
+    }
+    else
+    {
+        // In binary write both celli_ and facei_, needed for parallel transfer
+        if (writeFields)
+        {
+            os.write
+            (
+                reinterpret_cast<const char*>(&position_),
+                sizeof(position_)
+              + sizeof(celli_)
+              + sizeof(facei_)
+              + sizeof(stepFraction_)
+              + sizeof(origProc_)
+              + sizeof(origId_)
+            );
+        }
+        else
+        {
+            os.write
+            (
+                reinterpret_cast<const char*>(&position_),
+                sizeof(position_)
+              + sizeof(celli_)
+              + sizeof(facei_)
+              + sizeof(stepFraction_)
+            );
+        }
+    }
+
+    // Check state of Ostream
+    os.check("Particle<ParticleType>::write(Ostream& os, bool) const");
 }
 
 
 template<class ParticleType>
 Foam::Ostream& Foam::operator<<(Ostream& os, const Particle<ParticleType>& p)
 {
-    if (os.format() == IOstream::ASCII)
-    {
-        os << p.position_
-           << token::SPACE << p.celli_
-           << token::SPACE << p.origProc_
-           << token::SPACE << p.origId_;
-    }
-    else
-    {
-        // In binary write both celli_ and facei_, needed for parallel transfer
-        os.write
-        (
-            reinterpret_cast<const char*>(&p.position_),
-            sizeof(p.position_)
-          + sizeof(p.celli_)
-          + sizeof(p.facei_)
-          + sizeof(p.stepFraction_)
-          + sizeof(p.origProc_)
-          + sizeof(p.origId_)
-        );
-    }
-
-    // Check state of Ostream
-    os.check("Ostream& operator<<(Ostream&, const Particle<ParticleType>&)");
+    // Write all data
+    p.write(os, true);
 
     return os;
 }
diff --git a/src/lagrangian/basic/indexedParticle/indexedParticle.H b/src/lagrangian/basic/indexedParticle/indexedParticle.H
index fd20681a32..7023f0ba6d 100644
--- a/src/lagrangian/basic/indexedParticle/indexedParticle.H
+++ b/src/lagrangian/basic/indexedParticle/indexedParticle.H
@@ -84,7 +84,7 @@ public:
             bool readFields = true
         )
         :
-            Particle<indexedParticle>(c, is)
+            Particle<indexedParticle>(c, is, readFields)
         {}
 
         //- Construct as a copy
diff --git a/src/lagrangian/basic/indexedParticle/indexedParticleCloud.C b/src/lagrangian/basic/indexedParticle/indexedParticleCloud.C
index 52cf785b91..422661f76a 100644
--- a/src/lagrangian/basic/indexedParticle/indexedParticleCloud.C
+++ b/src/lagrangian/basic/indexedParticle/indexedParticleCloud.C
@@ -22,12 +22,9 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
-#include "indexedParticle.H"
-#include "Cloud.H"
+#include "indexedParticleCloud.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -43,4 +40,23 @@ defineTemplateTypeNameAndDebug(Cloud<indexedParticle>, 0);
 
 } // End namespace Foam
 
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::indexedParticleCloud::indexedParticleCloud
+(
+    const polyMesh& mesh,
+    const word& cloudName
+)
+:
+    Cloud<indexedParticle>(mesh, cloudName, false)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::indexedParticleCloud::writeFields() const
+{
+    indexedParticle::writeFields(*this);
+}
+
 // ************************************************************************* //
diff --git a/src/lagrangian/basic/indexedParticle/indexedParticleCloud.H b/src/lagrangian/basic/indexedParticle/indexedParticleCloud.H
new file mode 100644
index 0000000000..65033e0a9d
--- /dev/null
+++ b/src/lagrangian/basic/indexedParticle/indexedParticleCloud.H
@@ -0,0 +1,91 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::indexedParticleCloud
+
+Description
+    A Cloud of particles carrying an additional index.
+
+SourceFiles
+    indexedParticleCloud.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef indexedParticleCloud_H
+#define indexedParticleCloud_H
+
+#include "Cloud.H"
+#include "indexedParticle.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class indexedParticleCloud Declaration
+\*---------------------------------------------------------------------------*/
+
+class indexedParticleCloud
+:
+    public Cloud<indexedParticle>
+{
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        indexedParticleCloud(const indexedParticleCloud&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const indexedParticleCloud&);
+
+
+public:
+
+    // Constructors
+
+        //- Construct given mesh
+        indexedParticleCloud
+        (
+            const polyMesh&,
+            const word& cloudName = "defaultCloud"
+        );
+
+
+    // Member Functions
+
+        //- Write fields
+        virtual void writeFields() const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/basic/passiveParticle/passiveParticle.H b/src/lagrangian/basic/passiveParticle/passiveParticle.H
index ce4f7bfcad..c8d912ac76 100644
--- a/src/lagrangian/basic/passiveParticle/passiveParticle.H
+++ b/src/lagrangian/basic/passiveParticle/passiveParticle.H
@@ -28,9 +28,6 @@ Class
 Description
 
 SourceFiles
-    passiveParticleI.H
-    passiveParticle.C
-    passiveParticleIO.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -78,7 +75,7 @@ public:
             bool readFields = true
         )
         :
-            Particle<passiveParticle>(c, is)
+            Particle<passiveParticle>(c, is, readFields)
         {}
 
         //- Construct as copy
diff --git a/src/lagrangian/basic/passiveParticle/passiveParticleCloud.C b/src/lagrangian/basic/passiveParticle/passiveParticleCloud.C
index 71af5dd82b..e60b691c1f 100644
--- a/src/lagrangian/basic/passiveParticle/passiveParticleCloud.C
+++ b/src/lagrangian/basic/passiveParticle/passiveParticleCloud.C
@@ -22,12 +22,9 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
-#include "passiveParticle.H"
-#include "Cloud.H"
+#include "passiveParticleCloud.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -39,8 +36,32 @@ namespace Foam
 defineParticleTypeNameAndDebug(passiveParticle, 0);
 defineTemplateTypeNameAndDebug(Cloud<passiveParticle>, 0);
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+};
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::passiveParticleCloud::passiveParticleCloud
+(
+    const polyMesh& mesh,
+    const word& cloudName
+)
+:
+    Cloud<passiveParticle>(mesh, cloudName, false)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::passiveParticleCloud::readFields()
+{
+    passiveParticle::readFields(*this);
+}
+
+
+void Foam::passiveParticleCloud::writeFields() const
+{
+    passiveParticle::writeFields(*this);
+}
 
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H b/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H
new file mode 100644
index 0000000000..b8faac8f43
--- /dev/null
+++ b/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H
@@ -0,0 +1,94 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::passiveParticleCloud
+
+Description
+    A Cloud of passive particles
+
+SourceFiles
+    passiveParticleCloud.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef passiveParticleCloud_H
+#define passiveParticleCloud_H
+
+#include "Cloud.H"
+#include "passiveParticle.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class passiveParticleCloud Declaration
+\*---------------------------------------------------------------------------*/
+
+class passiveParticleCloud
+:
+    public Cloud<passiveParticle>
+{
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        passiveParticleCloud(const passiveParticleCloud&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const passiveParticleCloud&);
+
+
+public:
+
+    // Constructors
+
+        //- Construct given mesh
+        passiveParticleCloud
+        (
+            const polyMesh&,
+            const word& cloudName = "defaultCloud"
+        );
+
+
+    // Member Functions
+
+        //- Read fields
+        virtual void readFields();
+
+        //- Write fields
+        virtual void writeFields() const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/CoalCloud/CoalCloud.H b/src/lagrangian/coalCombustion/CoalCloud/CoalCloud.H
index 36e3b4e03e..d4d6c2bc94 100644
--- a/src/lagrangian/coalCombustion/CoalCloud/CoalCloud.H
+++ b/src/lagrangian/coalCombustion/CoalCloud/CoalCloud.H
@@ -87,7 +87,7 @@ public:
     // Member Functions
 
         //- Write fields
-        void writeFields() const;
+        virtual void writeFields() const;
 };
 
 
diff --git a/src/lagrangian/coalCombustion/Make/files b/src/lagrangian/coalCombustion/Make/files
old mode 100755
new mode 100644
diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options
old mode 100755
new mode 100644
diff --git a/src/lagrangian/dieselSpray/parcel/parcelIO.C b/src/lagrangian/dieselSpray/parcel/parcelIO.C
index d84f2bb195..4ae7bbc90a 100644
--- a/src/lagrangian/dieselSpray/parcel/parcelIO.C
+++ b/src/lagrangian/dieselSpray/parcel/parcelIO.C
@@ -36,7 +36,7 @@ Foam::parcel::parcel
     bool readFields
 )
 :
-    Particle<parcel>(cloud, is),
+    Particle<parcel>(cloud, is, readFields),
 
     liquidComponents_
     (
diff --git a/src/lagrangian/dieselSpray/spray/spray.H b/src/lagrangian/dieselSpray/spray/spray.H
index f416e3cf4e..044423fc75 100644
--- a/src/lagrangian/dieselSpray/spray/spray.H
+++ b/src/lagrangian/dieselSpray/spray/spray.H
@@ -345,7 +345,7 @@ public:
     // I/O
 
             //- Write fields
-            void writeFields() const;
+            virtual void writeFields() const;
 };
 
 
diff --git a/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.H b/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.H
index d530205681..ad63aca9fc 100644
--- a/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.H
+++ b/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.H
@@ -91,7 +91,7 @@ public:
     // Member functions
 
         //- Write fields
-        void writeFields() const;
+        virtual void writeFields() const;
 };
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/Make/files b/src/lagrangian/intermediate/Make/files
index c07a3a34fa..7911383146 100644
--- a/src/lagrangian/intermediate/Make/files
+++ b/src/lagrangian/intermediate/Make/files
@@ -59,6 +59,7 @@ submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C
 /* data entries */
 submodels/IO/DataEntry/makeDataEntries.C
 submodels/IO/DataEntry/polynomial/polynomial.C
+submodels/IO/DataEntry/polynomial/polynomialIO.C
 
 
 /* integration schemes */
diff --git a/src/lagrangian/intermediate/clouds/derived/BasicReactingCloud/BasicReactingCloud.H b/src/lagrangian/intermediate/clouds/derived/BasicReactingCloud/BasicReactingCloud.H
index 49a51a230e..0dea7344a6 100644
--- a/src/lagrangian/intermediate/clouds/derived/BasicReactingCloud/BasicReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/BasicReactingCloud/BasicReactingCloud.H
@@ -92,7 +92,7 @@ public:
     // Member Functions
 
         //- Write fields
-        void writeFields() const;
+        virtual void writeFields() const;
 };
 
 
diff --git a/src/lagrangian/intermediate/clouds/derived/BasicReactingMultiphaseCloud/BasicReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/derived/BasicReactingMultiphaseCloud/BasicReactingMultiphaseCloud.H
index ac0853823f..11b6fb2378 100644
--- a/src/lagrangian/intermediate/clouds/derived/BasicReactingMultiphaseCloud/BasicReactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/BasicReactingMultiphaseCloud/BasicReactingMultiphaseCloud.H
@@ -92,7 +92,7 @@ public:
     // Member Functions
 
         //- Write fields
-        void writeFields() const;
+        virtual void writeFields() const;
 };
 
 
diff --git a/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H b/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H
index 91a8ae2e5b..9b2c6003d3 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H
@@ -87,7 +87,7 @@ public:
     // Member functions
 
         //- Write fields
-        void writeFields() const;
+        virtual void writeFields() const;
 };
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H b/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H
index 5254fed8eb..cbe3695d5d 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H
@@ -90,7 +90,7 @@ public:
     // Member Functions
 
         //- Write fields
-        void writeFields() const;
+        virtual void writeFields() const;
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index fa48f4c28b..7c63f1c262 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -233,7 +233,8 @@ void Foam::InjectionModel<CloudType>::postInjectCheck(const label parcelsAdded)
 {
     if (parcelsAdded > 0)
     {
-        Pout<< "\n--> Cloud: " << owner_.name() << nl
+        Pout<< nl
+            << "--> Cloud: " << owner_.name() << nl
             << "    Added " << parcelsAdded
             << " new parcels" << nl << endl;
     }
diff --git a/src/lagrangian/molecularDynamics/molecule/Make/files b/src/lagrangian/molecularDynamics/molecule/Make/files
old mode 100755
new mode 100644
diff --git a/src/lagrangian/molecularDynamics/molecule/Make/options b/src/lagrangian/molecularDynamics/molecule/Make/options
old mode 100755
new mode 100644
diff --git a/src/lagrangian/solidParticle/solidParticleCloud.H b/src/lagrangian/solidParticle/solidParticleCloud.H
index 078594592d..f171007ce3 100644
--- a/src/lagrangian/solidParticle/solidParticleCloud.H
+++ b/src/lagrangian/solidParticle/solidParticleCloud.H
@@ -108,10 +108,10 @@ public:
             void move(const dimensionedVector& g);
 
 
-        // I-O
+        // Write
 
             //- Write fields
-            void writeFields() const;
+            virtual void writeFields() const;
 };
 
 

From 6acfd6a3ae5808af60156c8692885e03217a5b64 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Tue, 7 Jul 2009 15:48:04 +0100
Subject: [PATCH 28/84] execute bit set

---
 applications/solvers/discreteMethods/dsmc/dsmcFoam/Make/files     | 0
 applications/solvers/discreteMethods/dsmc/dsmcFoam/Make/options   | 0
 .../molecularDynamics/mdEquilibrationFoam/Make/files              | 0
 .../molecularDynamics/mdEquilibrationFoam/Make/options            | 0
 .../solvers/discreteMethods/molecularDynamics/mdFoam/Make/files   | 0
 .../solvers/discreteMethods/molecularDynamics/mdFoam/Make/options | 0
 applications/utilities/mesh/conversion/ideasUnvToFoam/Make/files  | 0
 .../utilities/mesh/conversion/ideasUnvToFoam/Make/options         | 0
 .../postProcessing/miscellaneous/dsmcFieldsCalc/Make/files        | 0
 .../postProcessing/miscellaneous/dsmcFieldsCalc/Make/options      | 0
 applications/utilities/preProcessing/dsmcInitialise/Make/files    | 0
 applications/utilities/preProcessing/dsmcInitialise/Make/options  | 0
 applications/utilities/preProcessing/mdInitialise/Make/files      | 0
 applications/utilities/preProcessing/mdInitialise/Make/options    | 0
 .../fvDOM/interpolationLookUpTable/interpolationLookUpTable.C     | 0
 .../fvDOM/interpolationLookUpTable/interpolationLookUpTable.H     | 0
 .../lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes | 0
 .../coalChemistryFoam/simplifiedSiwek/system/fvSolution           | 0
 18 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 applications/solvers/discreteMethods/dsmc/dsmcFoam/Make/files
 mode change 100755 => 100644 applications/solvers/discreteMethods/dsmc/dsmcFoam/Make/options
 mode change 100755 => 100644 applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/Make/files
 mode change 100755 => 100644 applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/Make/options
 mode change 100755 => 100644 applications/solvers/discreteMethods/molecularDynamics/mdFoam/Make/files
 mode change 100755 => 100644 applications/solvers/discreteMethods/molecularDynamics/mdFoam/Make/options
 mode change 100755 => 100644 applications/utilities/mesh/conversion/ideasUnvToFoam/Make/files
 mode change 100755 => 100644 applications/utilities/mesh/conversion/ideasUnvToFoam/Make/options
 mode change 100755 => 100644 applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/Make/files
 mode change 100755 => 100644 applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/Make/options
 mode change 100755 => 100644 applications/utilities/preProcessing/dsmcInitialise/Make/files
 mode change 100755 => 100644 applications/utilities/preProcessing/dsmcInitialise/Make/options
 mode change 100755 => 100644 applications/utilities/preProcessing/mdInitialise/Make/files
 mode change 100755 => 100644 applications/utilities/preProcessing/mdInitialise/Make/options
 mode change 100755 => 100644 src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.C
 mode change 100755 => 100644 src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.H
 mode change 100755 => 100644 tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes
 mode change 100755 => 100644 tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution

diff --git a/applications/solvers/discreteMethods/dsmc/dsmcFoam/Make/files b/applications/solvers/discreteMethods/dsmc/dsmcFoam/Make/files
old mode 100755
new mode 100644
diff --git a/applications/solvers/discreteMethods/dsmc/dsmcFoam/Make/options b/applications/solvers/discreteMethods/dsmc/dsmcFoam/Make/options
old mode 100755
new mode 100644
diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/Make/files b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/Make/files
old mode 100755
new mode 100644
diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/Make/options b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/Make/options
old mode 100755
new mode 100644
diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdFoam/Make/files b/applications/solvers/discreteMethods/molecularDynamics/mdFoam/Make/files
old mode 100755
new mode 100644
diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdFoam/Make/options b/applications/solvers/discreteMethods/molecularDynamics/mdFoam/Make/options
old mode 100755
new mode 100644
diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/Make/files b/applications/utilities/mesh/conversion/ideasUnvToFoam/Make/files
old mode 100755
new mode 100644
diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/Make/options b/applications/utilities/mesh/conversion/ideasUnvToFoam/Make/options
old mode 100755
new mode 100644
diff --git a/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/Make/files b/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/Make/files
old mode 100755
new mode 100644
diff --git a/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/Make/options b/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/Make/options
old mode 100755
new mode 100644
diff --git a/applications/utilities/preProcessing/dsmcInitialise/Make/files b/applications/utilities/preProcessing/dsmcInitialise/Make/files
old mode 100755
new mode 100644
diff --git a/applications/utilities/preProcessing/dsmcInitialise/Make/options b/applications/utilities/preProcessing/dsmcInitialise/Make/options
old mode 100755
new mode 100644
diff --git a/applications/utilities/preProcessing/mdInitialise/Make/files b/applications/utilities/preProcessing/mdInitialise/Make/files
old mode 100755
new mode 100644
diff --git a/applications/utilities/preProcessing/mdInitialise/Make/options b/applications/utilities/preProcessing/mdInitialise/Make/options
old mode 100755
new mode 100644
diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.C b/src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.C
old mode 100755
new mode 100644
diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.H b/src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.H
old mode 100755
new mode 100644
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes
old mode 100755
new mode 100644
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
old mode 100755
new mode 100644

From 3d6be6aa5e246741e5527e9beea4c2fc35765ec8 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Tue, 7 Jul 2009 15:48:18 +0100
Subject: [PATCH 29/84] expand on case directory

---
 applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C | 1 +
 1 file changed, 1 insertion(+)

diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C
index 74e505394d..69dc36bccf 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C
@@ -78,6 +78,7 @@ int main(int argc, char *argv[])
     if (sourceType == "patch")
     {
         fileName sourceCasePath(dict.lookup("sourceCase"));
+        sourceCasePath.expand();
         fileName sourceRootDir = sourceCasePath.path();
         fileName sourceCaseDir = sourceCasePath.name();
         word patchName(dict.lookup("sourcePatch"));

From 49ff528a7bd5f084b114796ceafc7ce5db0a5a51 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 7 Jul 2009 16:31:57 +0100
Subject: [PATCH 30/84] solid updates

---
 src/thermophysicalModels/solids/C/C.C         | 18 ++++++------------
 src/thermophysicalModels/solids/CaCO3/CaCO3.C | 18 ++++++------------
 src/thermophysicalModels/solids/ash/ash.C     | 18 ++++++------------
 src/thermophysicalModels/solids/solid/solid.C | 18 ++++++------------
 4 files changed, 24 insertions(+), 48 deletions(-)

diff --git a/src/thermophysicalModels/solids/C/C.C b/src/thermophysicalModels/solids/C/C.C
index bc701872b7..1dbcfd2eed 100644
--- a/src/thermophysicalModels/solids/C/C.C
+++ b/src/thermophysicalModels/solids/C/C.C
@@ -27,16 +27,14 @@ License
 #include "C.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(C, 0);
-addToRunTimeSelectionTable(solid, C,);
-addToRunTimeSelectionTable(solid, C, Istream);
+    defineTypeNameAndDebug(C, 0);
+    addToRunTimeSelectionTable(solid, C,);
+    addToRunTimeSelectionTable(solid, C, Istream);
+}
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -72,15 +70,11 @@ void Foam::C::writeData(Ostream& os) const
 
 // * * * * * * * * * * * * * * IOStream operators  * * * * * * * * * * * * * //
 
-Foam::Ostream& operator<<(Ostream& os, const C& s)
+Foam::Ostream& Foam::operator<<(Ostream& os, const C& s)
 {
     s.writeData(os);
     return os;
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/solids/CaCO3/CaCO3.C b/src/thermophysicalModels/solids/CaCO3/CaCO3.C
index 36dcdd3d5c..77a4398322 100644
--- a/src/thermophysicalModels/solids/CaCO3/CaCO3.C
+++ b/src/thermophysicalModels/solids/CaCO3/CaCO3.C
@@ -27,16 +27,14 @@ License
 #include "CaCO3.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(CaCO3, 0);
-addToRunTimeSelectionTable(solid, CaCO3,);
-addToRunTimeSelectionTable(solid, CaCO3, Istream);
+    defineTypeNameAndDebug(CaCO3, 0);
+    addToRunTimeSelectionTable(solid, CaCO3,);
+    addToRunTimeSelectionTable(solid, CaCO3, Istream);
+}
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -72,15 +70,11 @@ void Foam::CaCO3::writeData(Ostream& os) const
 
 // * * * * * * * * * * * * * * IOStream operators  * * * * * * * * * * * * * //
 
-Foam::Ostream& operator<<(Ostream& os, const CaCO3& s)
+Foam::Ostream& Foam::operator<<(Ostream& os, const CaCO3& s)
 {
     s.writeData(os);
     return os;
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/solids/ash/ash.C b/src/thermophysicalModels/solids/ash/ash.C
index 42da228d2c..c904131aab 100644
--- a/src/thermophysicalModels/solids/ash/ash.C
+++ b/src/thermophysicalModels/solids/ash/ash.C
@@ -27,16 +27,14 @@ License
 #include "ash.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(ash, 0);
-addToRunTimeSelectionTable(solid, ash,);
-addToRunTimeSelectionTable(solid, ash, Istream);
+    defineTypeNameAndDebug(ash, 0);
+    addToRunTimeSelectionTable(solid, ash,);
+    addToRunTimeSelectionTable(solid, ash, Istream);
+}
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -72,15 +70,11 @@ void Foam::ash::writeData(Ostream& os) const
 
 // * * * * * * * * * * * * * * IOStream operators  * * * * * * * * * * * * * //
 
-Foam::Ostream& operator<<(Ostream& os, const ash& s)
+Foam::Ostream& Foam::operator<<(Ostream& os, const ash& s)
 {
     s.writeData(os);
     return os;
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/solids/solid/solid.C b/src/thermophysicalModels/solids/solid/solid.C
index 8d61715465..5a9da6b875 100644
--- a/src/thermophysicalModels/solids/solid/solid.C
+++ b/src/thermophysicalModels/solids/solid/solid.C
@@ -26,16 +26,14 @@ License
 
 #include "solid.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(solid, 0);
-defineRunTimeSelectionTable(solid,);
-defineRunTimeSelectionTable(solid, Istream);
+    defineTypeNameAndDebug(solid, 0);
+    defineRunTimeSelectionTable(solid,);
+    defineRunTimeSelectionTable(solid, Istream);
+}
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -80,15 +78,11 @@ void Foam::solid::writeData(Ostream& os) const
 
 // * * * * * * * * * * * * * * IOStream operators  * * * * * * * * * * * * * //
 
-Foam::Ostream& operator<<(Ostream& os, const solid& s)
+Foam::Ostream& Foam::operator<<(Ostream& os, const solid& s)
 {
     s.writeData(os);
     return os;
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //

From b7e769c2abd827fdf1c063074ae302e7830c996a Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 7 Jul 2009 17:16:28 +0100
Subject: [PATCH 31/84] updated copyright dates

---
 src/lagrangian/coalCombustion/CoalCloud/CoalCloud.C         | 2 +-
 src/lagrangian/coalCombustion/CoalCloud/CoalCloud.H         | 2 +-
 src/lagrangian/coalCombustion/CoalParcel/CoalParcel.C       | 2 +-
 src/lagrangian/coalCombustion/CoalParcel/CoalParcel.H       | 2 +-
 src/lagrangian/coalCombustion/CoalParcel/defineCoalParcel.C | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lagrangian/coalCombustion/CoalCloud/CoalCloud.C b/src/lagrangian/coalCombustion/CoalCloud/CoalCloud.C
index a4d249d265..0f274d70bf 100644
--- a/src/lagrangian/coalCombustion/CoalCloud/CoalCloud.C
+++ b/src/lagrangian/coalCombustion/CoalCloud/CoalCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/coalCombustion/CoalCloud/CoalCloud.H b/src/lagrangian/coalCombustion/CoalCloud/CoalCloud.H
index d4d6c2bc94..8516508d8b 100644
--- a/src/lagrangian/coalCombustion/CoalCloud/CoalCloud.H
+++ b/src/lagrangian/coalCombustion/CoalCloud/CoalCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/coalCombustion/CoalParcel/CoalParcel.C b/src/lagrangian/coalCombustion/CoalParcel/CoalParcel.C
index 53a9f3ac63..ef3448186a 100644
--- a/src/lagrangian/coalCombustion/CoalParcel/CoalParcel.C
+++ b/src/lagrangian/coalCombustion/CoalParcel/CoalParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/coalCombustion/CoalParcel/CoalParcel.H b/src/lagrangian/coalCombustion/CoalParcel/CoalParcel.H
index a23e96bb85..f313a16501 100644
--- a/src/lagrangian/coalCombustion/CoalParcel/CoalParcel.H
+++ b/src/lagrangian/coalCombustion/CoalParcel/CoalParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/coalCombustion/CoalParcel/defineCoalParcel.C b/src/lagrangian/coalCombustion/CoalParcel/defineCoalParcel.C
index f5071d6030..204568acb1 100644
--- a/src/lagrangian/coalCombustion/CoalParcel/defineCoalParcel.C
+++ b/src/lagrangian/coalCombustion/CoalParcel/defineCoalParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 92311ec76d6a061c2ef0faa632e2e6d5f4c85b52 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Tue, 7 Jul 2009 17:36:32 +0100
Subject: [PATCH 32/84] cloud rereading

---
 .../particleTracks/particleTracks.C           | 154 ++++++++----------
 src/lagrangian/basic/Particle/ParticleIO.C    |   1 +
 .../indexedParticle/indexedParticleCloud.C    |   4 +-
 .../passiveParticle/passiveParticleCloud.C    |   4 +-
 4 files changed, 78 insertions(+), 85 deletions(-)

diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
index 596c9e4f88..3ad01ef870 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
@@ -38,7 +38,7 @@ Description
 #include "Time.H"
 #include "timeSelector.H"
 #include "OFstream.H"
-#include "passiveParticle.H"
+#include "passiveParticleCloud.H"
 
 using namespace Foam;
 
@@ -61,7 +61,8 @@ int main(int argc, char *argv[])
     fileName vtkPath(runTime.path()/"VTK");
     mkDir(vtkPath);
 
-    Info<< "Scanning times to determine track data" << nl << endl;
+    Info<< "Scanning times to determine track data for cloud " << cloudName
+        << nl << endl;
 
     labelList maxIds(Pstream::nProcs(), -1);
     forAll(timeDirs, timeI)
@@ -69,35 +70,33 @@ int main(int argc, char *argv[])
         runTime.setTime(timeDirs[timeI], timeI);
         Info<< "Time = " << runTime.timeName() << endl;
 
-        IOobject positionsHeader
-        (
-            "positions",
-            runTime.timeName(),
-            cloud::prefix/cloudName,
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE,
-            false
-        );
+        Info<< "    Reading particle positions" << endl;
+        passiveParticleCloud myCloud(mesh, cloudName);
+        Info<< "    Read " << returnReduce(myCloud.size(), sumOp<label>())
+            << " particles" << endl;
 
-        if (positionsHeader.headerOk())
+        forAllConstIter(passiveParticleCloud, myCloud, iter)
         {
-            Info<< "    Reading particle positions" << endl;
-            Cloud<passiveParticle> myCloud(mesh, cloudName, false);
+            label origId = iter().origId();
+            label origProc = iter().origProc();
 
-            forAllConstIter(Cloud<passiveParticle>, myCloud, iter)
-            {
-                label origId = iter().origId();
-                label origProc = iter().origProc();
-
-                maxIds[origProc] = max(maxIds[origProc], origId);
-            }
+            maxIds[origProc] = max(maxIds[origProc], origId);
         }
     }
-    Pstream::listCombineGather(maxIds, maxOp<label>());
+    Pstream::listCombineGather(maxIds, maxEqOp<label>());
     Pstream::listCombineScatter(maxIds);
+
     labelList numIds = maxIds + 1;
 
+    Info<< nl << "Particle statistics:" << endl;
+    forAll(maxIds, procI)
+    {
+        Info<< "    Found " << numIds[procI] << " particles originating"
+            << " from processor " << procI << endl;
+    }
+    Info<< nl << endl;
+
+
     // calc starting ids for particles on each processor
     List<label> startIds(numIds.size(), 0);
     for (label i = 0; i < numIds.size()-1; i++)
@@ -106,98 +105,87 @@ int main(int argc, char *argv[])
     }
     label nParticle = startIds[startIds.size()-1] + numIds[startIds.size()-1];
 
+
+
     // number of tracks to generate
     label nTracks = nParticle/sampleFrequency;
 
     // storage for all particle tracks
     List<DynamicList<vector> > allTracks(nTracks);
 
-    Info<< "\nGenerating " << nTracks << " particle tracks" << nl << endl;
+    Info<< "\nGenerating " << nTracks << " particle tracks for cloud "
+        << cloudName << nl << endl;
+
     forAll(timeDirs, timeI)
     {
         runTime.setTime(timeDirs[timeI], timeI);
         Info<< "Time = " << runTime.timeName() << endl;
 
-        IOobject positionsHeader
+        List<pointField> allPositions(Pstream::nProcs());
+        List<labelField> allOrigIds(Pstream::nProcs());
+        List<labelField> allOrigProcs(Pstream::nProcs());
+
+        // Read particles. Will be size 0 if no particles.
+        Info<< "    Reading particle positions" << endl;
+        passiveParticleCloud myCloud(mesh, cloudName);
+
+        // collect the track data on all processors that have positions
+        allPositions[Pstream::myProcNo()].setSize
         (
-            "positions",
-            runTime.timeName(),
-            cloud::prefix/cloudName,
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE,
-            false
+            myCloud.size(),
+            point::zero
         );
+        allOrigIds[Pstream::myProcNo()].setSize(myCloud.size(), 0);
+        allOrigProcs[Pstream::myProcNo()].setSize(myCloud.size(), 0);
 
-        if (positionsHeader.headerOk())
+        label i = 0;
+        forAllConstIter(passiveParticleCloud, myCloud, iter)
         {
-            Info<< "    Reading particle positions" << endl;
-            Cloud<passiveParticle> myCloud(mesh, cloudName, false);
+            allPositions[Pstream::myProcNo()][i] = iter().position();
+            allOrigIds[Pstream::myProcNo()][i] = iter().origId();
+            allOrigProcs[Pstream::myProcNo()][i] = iter().origProc();
+            i++;
+        }
 
-            // collect the track data on the master processor
-            List<pointField> allPositions(Pstream::nProcs());
-            allPositions[Pstream::myProcNo()].setSize
-            (
-                myCloud.size(),
-                point::zero
-            );
+        // collect the track data on the master processor
+        Pstream::gatherList(allPositions);
+        Pstream::gatherList(allOrigIds);
+        Pstream::gatherList(allOrigProcs);
 
-            List<labelField> allOrigIds(Pstream::nProcs());
-            allOrigIds[Pstream::myProcNo()].setSize(myCloud.size(), 0);
-
-            List<labelField> allOrigProcs(Pstream::nProcs());
-            allOrigProcs[Pstream::myProcNo()].setSize(myCloud.size(), 0);
-
-            label i = 0;
-            forAllConstIter(Cloud<passiveParticle>, myCloud, iter)
+        Info<< "    Constructing tracks" << nl << endl;
+        if (Pstream::master())
+        {
+            forAll(allPositions, procI)
             {
-                allPositions[Pstream::myProcNo()][i] = iter().position();
-                allOrigIds[Pstream::myProcNo()][i] = iter().origId();
-                allOrigProcs[Pstream::myProcNo()][i] = iter().origProc();
-                i++;
-            }
-            Pstream::gatherList(allPositions);
-            Pstream::gatherList(allOrigIds);
-            Pstream::gatherList(allOrigProcs);
-
-            Info<< "    Constructing tracks" << nl << endl;
-            if (Pstream::master())
-            {
-                forAll(allPositions, procI)
+                forAll(allPositions[procI], i)
                 {
-                    forAll(allPositions[procI], i)
-                    {
-                        label globalId =
-                            startIds[allOrigProcs[procI][i]]
-                          + allOrigIds[procI][i];
+                    label globalId =
+                        startIds[allOrigProcs[procI][i]]
+                      + allOrigIds[procI][i];
 
-                        if (globalId % sampleFrequency == 0)
+                    if (globalId % sampleFrequency == 0)
+                    {
+                        label trackId = globalId/sampleFrequency;
+                        if (allTracks[trackId].size() < maxPositions)
                         {
-                            label trackId = globalId/sampleFrequency;
-                            if (allTracks[trackId].size() < maxPositions)
-                            {
-                                allTracks[trackId].append
-                                (
-                                    allPositions[procI][i]
-                                );
-                            }
+                            allTracks[trackId].append
+                            (
+                                allPositions[procI][i]
+                            );
                         }
                     }
                 }
             }
         }
-        else
-        {
-            Info<< "    No particles read" << nl << endl;
-        }
     }
 
     if (Pstream::master())
     {
-        Info<< "\nWriting particle tracks" << nl << endl;
-
         OFstream vtkTracks(vtkPath/"particleTracks.vtk");
 
+        Info<< "\nWriting particle tracks to " << vtkTracks.name()
+            << nl << endl;
+
         // Total number of points in tracks + 1 per track
         label nPoints = 0;
         forAll(allTracks, trackI)
diff --git a/src/lagrangian/basic/Particle/ParticleIO.C b/src/lagrangian/basic/Particle/ParticleIO.C
index 77774cf90b..980d93f79a 100644
--- a/src/lagrangian/basic/Particle/ParticleIO.C
+++ b/src/lagrangian/basic/Particle/ParticleIO.C
@@ -117,6 +117,7 @@ void Foam::Particle<ParticleType>::readFields
     }
 
     IOobject procIO(c.fieldIOobject("origProcId", IOobject::MUST_READ));
+
     if (procIO.headerOk())
     {
         IOField<label> origProcId(procIO);
diff --git a/src/lagrangian/basic/indexedParticle/indexedParticleCloud.C b/src/lagrangian/basic/indexedParticle/indexedParticleCloud.C
index 422661f76a..a9ebc140ec 100644
--- a/src/lagrangian/basic/indexedParticle/indexedParticleCloud.C
+++ b/src/lagrangian/basic/indexedParticle/indexedParticleCloud.C
@@ -49,7 +49,9 @@ Foam::indexedParticleCloud::indexedParticleCloud
 )
 :
     Cloud<indexedParticle>(mesh, cloudName, false)
-{}
+{
+    indexedParticle::readFields(*this);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/src/lagrangian/basic/passiveParticle/passiveParticleCloud.C b/src/lagrangian/basic/passiveParticle/passiveParticleCloud.C
index e60b691c1f..18844ffcea 100644
--- a/src/lagrangian/basic/passiveParticle/passiveParticleCloud.C
+++ b/src/lagrangian/basic/passiveParticle/passiveParticleCloud.C
@@ -47,7 +47,9 @@ Foam::passiveParticleCloud::passiveParticleCloud
 )
 :
     Cloud<passiveParticle>(mesh, cloudName, false)
-{}
+{
+    readFields();
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //

From 9dac3301bf1d2cc59fa69527a46f4027171b37e3 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 7 Jul 2009 17:37:34 +0100
Subject: [PATCH 33/84] updated H2O vapour diffusion coefficients

---
 src/thermophysicalModels/liquids/H2O/H2O.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/thermophysicalModels/liquids/H2O/H2O.C b/src/thermophysicalModels/liquids/H2O/H2O.C
index 861b39bc4f..590da07405 100644
--- a/src/thermophysicalModels/liquids/H2O/H2O.C
+++ b/src/thermophysicalModels/liquids/H2O/H2O.C
@@ -96,7 +96,7 @@ Foam::H2O::H2O()
     K_(-0.4267, 0.0056903, -8.0065e-06, 1.815e-09, 0, 0),
     Kg_(6.977e-05, 1.1243, 844.9, -148850),
     sigma_(647.13, 0.18548, 2.717, -3.554, 2.047, 0),
-    D_(147.18, 20.1, 18.015, 28) // note: Same as nHeptane
+    D_(15.0, 15.0, 18.015, 28)
 {}
 
 

From f9e3cf3e9e2b10a62300bc873f960192f66a29af Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 7 Jul 2009 17:46:46 +0100
Subject: [PATCH 34/84] adding missing include file

---
 src/thermophysicalModels/liquids/liquid/liquid.H | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/thermophysicalModels/liquids/liquid/liquid.H b/src/thermophysicalModels/liquids/liquid/liquid.H
index 0973f2b45e..053d36027b 100644
--- a/src/thermophysicalModels/liquids/liquid/liquid.H
+++ b/src/thermophysicalModels/liquids/liquid/liquid.H
@@ -273,6 +273,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "liquidI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //

From eebfda5f109551bb9028435b20b2485074908e1f Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 7 Jul 2009 18:21:13 +0100
Subject: [PATCH 35/84] optimisation for diffusion calc

---
 .../APIdiffCoefFunc/APIdiffCoefFunc.H         | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H b/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H
index b24d250d49..7f95e450e3 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H
+++ b/src/thermophysicalModels/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.H
@@ -47,7 +47,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class APIdiffCoefFunc Declaration
+                      Class APIdiffCoefFunc Declaration
 \*---------------------------------------------------------------------------*/
 
 class APIdiffCoefFunc
@@ -59,6 +59,9 @@ class APIdiffCoefFunc
         // API vapour mass diffusivity function coefficients
         scalar a_, b_, wf_, wa_;
 
+        // Helper variables
+        scalar alpha_, beta_;
+
 
 public:
 
@@ -74,7 +77,9 @@ public:
             a_(a),
             b_(b),
             wf_(wf),
-            wa_(wa)
+            wa_(wa),
+            alpha_(sqrt(1/wf_ + 1/wa_)),
+            beta_(sqr((cbrt(a_) + cbrt(b_))))
         {}
 
         //- Construct from Istream
@@ -83,21 +88,21 @@ public:
             a_(readScalar(is)),
             b_(readScalar(is)),
             wf_(readScalar(is)),
-            wa_(readScalar(is))
+            wa_(readScalar(is)),
+            alpha_(sqrt(1/wf_ + 1/wa_)),
+            beta_(sqr((cbrt(a_) + cbrt(b_))))
         {}
 
 
     // Member Functions
 
-        //- API vapour mass diffusivity function
+        //- API vapour mass diffusivity function using properties from
+        //  construction
         scalar f(scalar p, scalar T) const
         {
-            return
-               3.6059e-3*(pow(1.8*T, 1.75))*sqrt(1/wf_ + 1/wa_)
-               /(p*sqr((cbrt(a_) + cbrt(b_))));
+            return 3.6059e-3*(pow(1.8*T, 1.75))*alpha_/(p*beta_);
         }
 
-
         //- Write the function coefficients
         void writeData(Ostream& os) const
         {

From f8f5324740ab153cb3ec68ac8c4679920ba1303b Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 7 Jul 2009 18:34:42 +0100
Subject: [PATCH 36/84] comment clean-up

---
 .../basic/psiThermo/ePsiThermo/ePsiThermo.H                   | 4 ++--
 .../basic/psiThermo/hPsiThermo/hPsiThermo.H                   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermo.H b/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermo.H
index 6952edc423..fd3071ff11 100644
--- a/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermo.H
+++ b/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermo.H
@@ -87,13 +87,13 @@ public:
 
     // Member functions
 
-        //- Return the compostion of the combustion mixture
+        //- Return the compostion of the mixture
         virtual basicMixture& composition()
         {
             return *this;
         }
 
-        //- Return the compostion of the combustion mixture
+        //- Return the compostion of the mixture
         virtual const basicMixture& composition() const
         {
             return *this;
diff --git a/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.H b/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.H
index c1d9b513a3..4eae7214a0 100644
--- a/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.H
+++ b/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.H
@@ -87,13 +87,13 @@ public:
 
     // Member functions
 
-        //- Return the compostion of the combustion mixture
+        //- Return the compostion of the mixture
         virtual basicMixture& composition()
         {
             return *this;
         }
 
-        //- Return the compostion of the combustion mixture
+        //- Return the compostion of the mixture
         virtual const basicMixture& composition() const
         {
             return *this;

From 9015b7f4935c89a33708693ed0831667832fc81b Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Tue, 7 Jul 2009 18:54:19 +0100
Subject: [PATCH 37/84] added comment

---
 .../mesh/generation/snappyHexMesh/snappyHexMeshDict      | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
index 1da4b92f08..b19b207124 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
@@ -209,6 +209,8 @@ snapControls
 // Settings for the layer addition.
 addLayersControls
 {
+    // Are the thickness parameters below relative to the undistorted
+    // size of the refined cell outside layer (true) or absolute sizes (false).
     relativeSizes true;
 
     // Per final patch (so not geometry!) the layer information
@@ -230,14 +232,13 @@ addLayersControls
 
 
     //- Wanted thickness of final added cell layer. If multiple layers
-    //  is the
-    //  thickness of the layer furthest away from the wall.
-    //  Relative to undistorted size of cell outside layer.
+    //  is the thickness of the layer furthest away from the wall.
+    //  See relativeSizes parameter.
     finalLayerThickness 0.3;
 
     //- Minimum thickness of cell layer. If for any reason layer
     //  cannot be above minThickness do not add layer.
-    //  Relative to undistorted size of cell outside layer.
+    //  See relativeSizes parameter.
     minThickness 0.25;
 
     //- If points get not extruded do nGrow layers of connected faces that are

From cd8b38fede428120f55cae9c3c7bc3d3f17969f2 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Tue, 7 Jul 2009 19:47:51 +0100
Subject: [PATCH 38/84] zone flip only for zone faces

---
 .../autoHexMesh/meshRefinement/meshRefinementBaffles.C    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
index b5b4174fb3..88f806b5dd 100644
--- a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -100,6 +100,12 @@ Foam::label Foam::meshRefinement::createBaffle
                 << " ownPatch:" << ownPatch << abort(FatalError);
         }
 
+        bool reverseFlip = false;
+        if (zoneID >= 0)
+        {
+            reverseFlip = !zoneFlip;
+        }
+
         dupFaceI = meshMod.setAction
         (
             polyAddFace
@@ -113,7 +119,7 @@ Foam::label Foam::meshRefinement::createBaffle
                 true,                       // face flip
                 neiPatch,                   // patch for face
                 zoneID,                     // zone for face
-                !zoneFlip                   // face flip in zone
+                reverseFlip                 // face flip in zone
             )
         );
     }

From 4439183d96f3f9b687236154cfa5b01f48c5fc01 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Tue, 7 Jul 2009 22:56:02 +0100
Subject: [PATCH 39/84] Corrected handling of the wall BCs of p for buoyant
 flows.

---
 .../solvers/compressible/rhoPimpleFoam/pEqn.H |  2 --
 .../buoyantBoussinesqSimpleFoam/pEqn.H        |  1 +
 .../heatTransfer/buoyantSimpleFoam/pEqn.H     |  1 +
 .../incompressible/pimpleDyMFoam/correctPhi.H |  6 +++-
 .../compressibleInterDyMFoam.C                |  6 ----
 .../compressibleInterDyMFoam/createFields.H   | 11 +++---
 .../multiphase/interDyMFoam/correctPhi.H      |  4 +--
 .../multiphase/interDyMFoam/createFields.H    |  6 +++-
 .../multiphase/interDyMFoam/interDyMFoam.C    |  3 --
 .../solvers/multiphase/interDyMFoam/pEqn.H    | 14 ++++----
 .../solvers/multiphase/interFoam/correctPhi.H | 10 ++++--
 .../solvers/multiphase/interFoam/pEqn.H       |  7 ++--
 .../interPhaseChangeFoam/correctPhi.H         |  8 +++--
 .../multiphase/interPhaseChangeFoam/pEqn.H    |  4 +--
 .../multiphase/multiphaseInterFoam/pEqn.H     |  4 +--
 etc/controlDict                               |  2 +-
 src/finiteVolume/Make/files                   |  2 +-
 .../general/include/readPISOControls.H        |  4 ---
 .../buoyantPressureFvPatchScalarField.C}      | 34 +++++++++---------
 .../buoyantPressureFvPatchScalarField.H}      | 36 +++++++++----------
 .../buoyantBoussinesqPisoFoam/hotRoom/0/p     |  6 ++--
 .../buoyantBoussinesqSimpleFoam/hotRoom/0/p   |  6 ++--
 .../iglooWithFridges/0/p                      |  8 ++---
 .../heatTransfer/buoyantPisoFoam/hotRoom/0/p  |  6 ++--
 .../buoyantSimpleFoam/hotRoom/0/p             |  6 ++--
 .../hotRadiationRoom/0/p                      |  8 ++---
 .../hotRadiationRoomFvDOM/0/p                 |  8 ++---
 .../chtMultiRegionFoam/multiRegionHeater/0/p  | 12 +++----
 .../system/bottomAir/changeDictionaryDict     | 16 ++++-----
 .../system/topAir/changeDictionaryDict        | 14 ++++----
 .../system/bottomAir/changeDictionaryDict     | 16 ++++-----
 .../system/topAir/changeDictionaryDict        | 14 ++++----
 32 files changed, 144 insertions(+), 141 deletions(-)
 rename src/finiteVolume/fields/fvPatchFields/derived/{fixedFluxBuoyantPressure/fixedFluxBuoyantPressureFvPatchScalarField.C => buoyantPressure/buoyantPressureFvPatchScalarField.C} (81%)
 rename src/finiteVolume/fields/fvPatchFields/derived/{fixedFluxBuoyantPressure/fixedFluxBuoyantPressureFvPatchScalarField.H => buoyantPressure/buoyantPressureFvPatchScalarField.H} (78%)

diff --git a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
index 9c4e9658cc..0f3dfe450b 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
@@ -58,8 +58,6 @@ else
         //+ fvc::ddtPhiCorr(rUA, rho, U, phi)
         );
 
-    //bool closedVolume = adjustPhi(phi, U, p);
-
     for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
         // Pressure corrector
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H
index e1d42d738e..6408c7ccc8 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/pEqn.H
@@ -7,6 +7,7 @@
 
     phi = fvc::interpolate(U) & mesh.Sf();
     adjustPhi(phi, U, p);
+
     surfaceScalarField buoyancyPhi =
         rUAf*fvc::interpolate(rhok)*(g & mesh.Sf());
     phi += buoyancyPhi;
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
index e680e9421a..4bbb449df7 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
@@ -9,6 +9,7 @@
 
     phi = fvc::interpolate(rho)*(fvc::interpolate(U) & mesh.Sf());
     bool closedVolume = adjustPhi(phi, U, p);
+
     surfaceScalarField buoyancyPhi =
         rhorUAf*fvc::interpolate(rho)*(g & mesh.Sf());
     phi += buoyancyPhi;
diff --git a/applications/solvers/incompressible/pimpleDyMFoam/correctPhi.H b/applications/solvers/incompressible/pimpleDyMFoam/correctPhi.H
index 493c4e0929..023ecc6d5a 100644
--- a/applications/solvers/incompressible/pimpleDyMFoam/correctPhi.H
+++ b/applications/solvers/incompressible/pimpleDyMFoam/correctPhi.H
@@ -1,5 +1,9 @@
 {
-    wordList pcorrTypes(p.boundaryField().types());
+    wordList pcorrTypes
+    (
+        p.boundaryField().size(),
+        zeroGradientFvPatchScalarField::typeName
+    );
 
     for (label i=0; i<p.boundaryField().size(); i++)
     {
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C b/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
index 65afde39c2..176900f0c6 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
@@ -104,12 +104,6 @@ int main(int argc, char *argv[])
             #include "meshCourantNo.H"
         }
 
-        if (mesh.changing())
-        {
-            gh = g & mesh.C();
-            ghf = g & mesh.Cf();
-        }
-
         turbulence->correct();
 
         // --- Outer-corrector loop
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/createFields.H b/applications/solvers/multiphase/compressibleInterDyMFoam/createFields.H
index 6b8e67cc49..3da1b5e9c1 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/createFields.H
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/createFields.H
@@ -46,11 +46,6 @@
     #include "createPhi.H"
 
 
-    Info<< "Calculating field g.h\n" << endl;
-    volScalarField gh("gh", g & mesh.C());
-    surfaceScalarField ghf("ghf", g & mesh.Cf());
-
-
     Info<< "Reading transportProperties\n" << endl;
     twoPhaseMixture twoPhaseProperties(U, phi);
 
@@ -134,7 +129,11 @@
     );
 
 
-    wordList pcorrTypes(p.boundaryField().types());
+    wordList pcorrTypes
+    (
+        p.boundaryField().size(),
+        zeroGradientFvPatchScalarField::typeName
+    );
 
     for (label i=0; i<p.boundaryField().size(); i++)
     {
diff --git a/applications/solvers/multiphase/interDyMFoam/correctPhi.H b/applications/solvers/multiphase/interDyMFoam/correctPhi.H
index 1f7845f347..0854a68b8e 100644
--- a/applications/solvers/multiphase/interDyMFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interDyMFoam/correctPhi.H
@@ -1,5 +1,5 @@
 {
-#   include "continuityErrs.H"
+    #include "continuityErrs.H"
 
     volScalarField pcorr
     (
@@ -36,5 +36,5 @@
         }
     }
 
-#   include "continuityErrs.H"
+    #include "continuityErrs.H"
 }
diff --git a/applications/solvers/multiphase/interDyMFoam/createFields.H b/applications/solvers/multiphase/interDyMFoam/createFields.H
index 26644e17f4..905ba0d646 100644
--- a/applications/solvers/multiphase/interDyMFoam/createFields.H
+++ b/applications/solvers/multiphase/interDyMFoam/createFields.H
@@ -92,7 +92,11 @@
         incompressible::turbulenceModel::New(U, phi, twoPhaseProperties)
     );
 
-    wordList pcorrTypes(p.boundaryField().types());
+    wordList pcorrTypes
+    (
+        p.boundaryField().size(),
+        zeroGradientFvPatchScalarField::typeName
+    );
 
     for (label i=0; i<p.boundaryField().size(); i++)
     {
diff --git a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
index cf8ec8eb32..466333ff30 100644
--- a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
+++ b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
@@ -86,9 +86,6 @@ int main(int argc, char *argv[])
                 << " s" << endl;
         }
 
-        volScalarField gh("gh", g & mesh.C());
-        surfaceScalarField ghf("ghf", g & mesh.Cf());
-
         if (mesh.changing() && correctPhi)
         {
             #include "correctPhi.H"
diff --git a/applications/solvers/multiphase/interDyMFoam/pEqn.H b/applications/solvers/multiphase/interDyMFoam/pEqn.H
index 8825661c83..2af289a76f 100644
--- a/applications/solvers/multiphase/interDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/interDyMFoam/pEqn.H
@@ -5,19 +5,19 @@
     U = rAU*UEqn.H();
     surfaceScalarField phiU("phiU", (fvc::interpolate(U) & mesh.Sf()));
 
+    if (p.needReference())
+    {
+        fvc::makeRelative(phiU, U);
+        adjustPhi(phiU, U, p);
+        fvc::makeAbsolute(phiU, U);
+    }
+
     phi = phiU +
     (
         fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)*mesh.magSf()
       + fvc::interpolate(rho)*(g & mesh.Sf())
     )*rAUf;
 
-    if (p.needReference())
-    {
-        fvc::makeRelative(phi, U);
-        adjustPhi(phi, U, p);
-        fvc::makeAbsolute(phi, U);
-    }
-
     for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
         fvScalarMatrix pEqn
diff --git a/applications/solvers/multiphase/interFoam/correctPhi.H b/applications/solvers/multiphase/interFoam/correctPhi.H
index 642aa1c5d2..0274b7e9ed 100644
--- a/applications/solvers/multiphase/interFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interFoam/correctPhi.H
@@ -1,7 +1,11 @@
 {
-#   include "continuityErrs.H"
+    #include "continuityErrs.H"
 
-    wordList pcorrTypes(p.boundaryField().types());
+    wordList pcorrTypes
+    (
+        p.boundaryField().size(),
+        zeroGradientFvPatchScalarField::typeName
+    );
 
     for (label i=0; i<p.boundaryField().size(); i++)
     {
@@ -46,5 +50,5 @@
         }
     }
 
-#   include "continuityErrs.H"
+    #include "continuityErrs.H"
 }
diff --git a/applications/solvers/multiphase/interFoam/pEqn.H b/applications/solvers/multiphase/interFoam/pEqn.H
index 25482fa994..7aa172b858 100644
--- a/applications/solvers/multiphase/interFoam/pEqn.H
+++ b/applications/solvers/multiphase/interFoam/pEqn.H
@@ -7,17 +7,18 @@
     surfaceScalarField phiU
     (
         "phiU",
-        (fvc::interpolate(U) & mesh.Sf()) + fvc::ddtPhiCorr(rUA, rho, U, phi)
+        (fvc::interpolate(U) & mesh.Sf())
+      + fvc::ddtPhiCorr(rUA, rho, U, phi)
     );
 
+    adjustPhi(phiU, U, p);
+
     phi = phiU +
         (
             fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)*mesh.magSf()
           + fvc::interpolate(rho)*(g & mesh.Sf())
         )*rUAf;
 
-    adjustPhi(phi, U, p);
-
     for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
         fvScalarMatrix pEqn
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H b/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H
index 642aa1c5d2..17377302f0 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/correctPhi.H
@@ -1,7 +1,11 @@
 {
-#   include "continuityErrs.H"
+    #include "continuityErrs.H"
 
-    wordList pcorrTypes(p.boundaryField().types());
+    wordList pcorrTypes
+    (
+        p.boundaryField().size(),
+        zeroGradientFvPatchScalarField::typeName
+    );
 
     for (label i=0; i<p.boundaryField().size(); i++)
     {
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
index 4f290157f6..3c164cc574 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/pEqn.H
@@ -11,14 +11,14 @@
       + fvc::ddtPhiCorr(rUA, rho, U, phi)
     );
 
+    adjustPhi(phiU, U, p);
+
     phi = phiU +
         (
             fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)*mesh.magSf()
           + fvc::interpolate(rho)*(g & mesh.Sf())
         )*rUAf;
 
-    adjustPhi(phi, U, p);
-
     Pair<tmp<volScalarField> > vDotP = twoPhaseProperties->vDotP();
     const volScalarField& vDotcP = vDotP[0]();
     const volScalarField& vDotvP = vDotP[1]();
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/pEqn.H b/applications/solvers/multiphase/multiphaseInterFoam/pEqn.H
index 9d7e36dc95..4bec77f950 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/pEqn.H
@@ -10,14 +10,14 @@
         (fvc::interpolate(U) & mesh.Sf()) + fvc::ddtPhiCorr(rUA, rho, U, phi)
     );
 
+    adjustPhi(phiU, U, p);
+
     phi = phiU +
         (
             mixture.surfaceTensionForce()*mesh.magSf()
           + fvc::interpolate(rho)*(g & mesh.Sf())
         )*rUAf;
 
-    adjustPhi(phi, U, p);
-
     for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
     {
         fvScalarMatrix pEqn
diff --git a/etc/controlDict b/etc/controlDict
index d7824f102e..f06bbbd961 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -424,7 +424,7 @@ DebugSwitches
     filteredLinear3     0;
     filteredLinear3V    0;
     fixedEnthalpy       0;
-    fixedFluxBuoyantPressure 0;
+    buoyantPressure 0;
     fixedFluxBoussinesqBuoyantPressure 0;
     fixedFluxPressure   0;
     fixedGradient       0;
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 37b59c523a..54bfbc7cf6 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -108,7 +108,7 @@ $(derivedFvPatchFields)/advective/advectiveFvPatchFields.C
 $(derivedFvPatchFields)/directMappedFixedValue/directMappedFixedValueFvPatchFields.C
 $(derivedFvPatchFields)/directMappedVelocityFluxFixedValue/directMappedVelocityFluxFixedValueFvPatchField.C
 $(derivedFvPatchFields)/fan/fanFvPatchFields.C
-$(derivedFvPatchFields)/fixedFluxBuoyantPressure/fixedFluxBuoyantPressureFvPatchScalarField.C
+$(derivedFvPatchFields)/buoyantPressure/buoyantPressureFvPatchScalarField.C
 $(derivedFvPatchFields)/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
 $(derivedFvPatchFields)/fixedInternalValueFvPatchField/fixedInternalValueFvPatchFields.C
 $(derivedFvPatchFields)/fixedNormalSlip/fixedNormalSlipFvPatchFields.C
diff --git a/src/finiteVolume/cfdTools/general/include/readPISOControls.H b/src/finiteVolume/cfdTools/general/include/readPISOControls.H
index 5f14c2bcae..de763e00b0 100644
--- a/src/finiteVolume/cfdTools/general/include/readPISOControls.H
+++ b/src/finiteVolume/cfdTools/general/include/readPISOControls.H
@@ -13,7 +13,3 @@
 
     int nOuterCorr =
         piso.lookupOrDefault<int>("nOuterCorrectors", 1);
-
-    bool ddtPhiCorr =
-        piso.lookupOrDefault<Switch>("ddtPhiCorr", false);
-
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxBuoyantPressure/fixedFluxBuoyantPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C
similarity index 81%
rename from src/finiteVolume/fields/fvPatchFields/derived/fixedFluxBuoyantPressure/fixedFluxBuoyantPressureFvPatchScalarField.C
rename to src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C
index 279918b47a..cafc55aa3a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxBuoyantPressure/fixedFluxBuoyantPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C
@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "fixedFluxBuoyantPressureFvPatchScalarField.H"
+#include "buoyantPressureFvPatchScalarField.H"
 #include "addToRunTimeSelectionTable.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
@@ -36,8 +36,8 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-fixedFluxBuoyantPressureFvPatchScalarField::
-fixedFluxBuoyantPressureFvPatchScalarField
+buoyantPressureFvPatchScalarField::
+buoyantPressureFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
@@ -48,8 +48,8 @@ fixedFluxBuoyantPressureFvPatchScalarField
 {}
 
 
-fixedFluxBuoyantPressureFvPatchScalarField::
-fixedFluxBuoyantPressureFvPatchScalarField
+buoyantPressureFvPatchScalarField::
+buoyantPressureFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
@@ -64,10 +64,10 @@ fixedFluxBuoyantPressureFvPatchScalarField
 }
 
 
-fixedFluxBuoyantPressureFvPatchScalarField::
-fixedFluxBuoyantPressureFvPatchScalarField
+buoyantPressureFvPatchScalarField::
+buoyantPressureFvPatchScalarField
 (
-    const fixedFluxBuoyantPressureFvPatchScalarField& ptf,
+    const buoyantPressureFvPatchScalarField& ptf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
@@ -78,10 +78,10 @@ fixedFluxBuoyantPressureFvPatchScalarField
 {}
 
 
-fixedFluxBuoyantPressureFvPatchScalarField::
-fixedFluxBuoyantPressureFvPatchScalarField
+buoyantPressureFvPatchScalarField::
+buoyantPressureFvPatchScalarField
 (
-    const fixedFluxBuoyantPressureFvPatchScalarField& ptf
+    const buoyantPressureFvPatchScalarField& ptf
 )
 :
     fixedGradientFvPatchScalarField(ptf),
@@ -89,10 +89,10 @@ fixedFluxBuoyantPressureFvPatchScalarField
 {}
 
 
-fixedFluxBuoyantPressureFvPatchScalarField::
-fixedFluxBuoyantPressureFvPatchScalarField
+buoyantPressureFvPatchScalarField::
+buoyantPressureFvPatchScalarField
 (
-    const fixedFluxBuoyantPressureFvPatchScalarField& ptf,
+    const buoyantPressureFvPatchScalarField& ptf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
@@ -103,7 +103,7 @@ fixedFluxBuoyantPressureFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void fixedFluxBuoyantPressureFvPatchScalarField::updateCoeffs()
+void buoyantPressureFvPatchScalarField::updateCoeffs()
 {
     if (updated())
     {
@@ -134,7 +134,7 @@ void fixedFluxBuoyantPressureFvPatchScalarField::updateCoeffs()
 }
 
 
-void fixedFluxBuoyantPressureFvPatchScalarField::write(Ostream& os) const
+void buoyantPressureFvPatchScalarField::write(Ostream& os) const
 {
     fixedGradientFvPatchScalarField::write(os);
     os.writeKeyword("rho") << rhoName_ << token::END_STATEMENT << nl;
@@ -147,7 +147,7 @@ void fixedFluxBuoyantPressureFvPatchScalarField::write(Ostream& os) const
 makePatchTypeField
 (
     fvPatchScalarField,
-    fixedFluxBuoyantPressureFvPatchScalarField
+    buoyantPressureFvPatchScalarField
 );
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxBuoyantPressure/fixedFluxBuoyantPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.H
similarity index 78%
rename from src/finiteVolume/fields/fvPatchFields/derived/fixedFluxBuoyantPressure/fixedFluxBuoyantPressureFvPatchScalarField.H
rename to src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.H
index ec5dc7dd99..d698487e36 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxBuoyantPressure/fixedFluxBuoyantPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::fixedFluxBuoyantPressureFvPatchScalarField
+    Foam::buoyantPressureFvPatchScalarField
 
 Description
     Set the pressure gradient boundary condition appropriately for buoyant flow.
@@ -32,12 +32,12 @@ Description
     appropriately.  Otherwise assume the variable is the static pressure.
 
 SourceFiles
-    fixedFluxBuoyantPressureFvPatchScalarField.C
+    buoyantPressureFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fixedFluxBuoyantPressureFvPatchScalarFields_H
-#define fixedFluxBuoyantPressureFvPatchScalarFields_H
+#ifndef buoyantPressureFvPatchScalarFields_H
+#define buoyantPressureFvPatchScalarFields_H
 
 #include "fvPatchFields.H"
 #include "fixedGradientFvPatchFields.H"
@@ -48,10 +48,10 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                  Class fixedFluxBuoyantPressureFvPatch Declaration
+                  Class buoyantPressureFvPatch Declaration
 \*---------------------------------------------------------------------------*/
 
-class fixedFluxBuoyantPressureFvPatchScalarField
+class buoyantPressureFvPatchScalarField
 :
     public fixedGradientFvPatchScalarField
 {
@@ -64,20 +64,20 @@ class fixedFluxBuoyantPressureFvPatchScalarField
 public:
 
     //- Runtime type information
-    TypeName("fixedFluxBuoyantPressure");
+    TypeName("buoyantPressure");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        fixedFluxBuoyantPressureFvPatchScalarField
+        buoyantPressureFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        fixedFluxBuoyantPressureFvPatchScalarField
+        buoyantPressureFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
@@ -85,19 +85,19 @@ public:
         );
 
         //- Construct by mapping given
-        //  fixedFluxBuoyantPressureFvPatchScalarField onto a new patch
-        fixedFluxBuoyantPressureFvPatchScalarField
+        //  buoyantPressureFvPatchScalarField onto a new patch
+        buoyantPressureFvPatchScalarField
         (
-            const fixedFluxBuoyantPressureFvPatchScalarField&,
+            const buoyantPressureFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        fixedFluxBuoyantPressureFvPatchScalarField
+        buoyantPressureFvPatchScalarField
         (
-            const fixedFluxBuoyantPressureFvPatchScalarField&
+            const buoyantPressureFvPatchScalarField&
         );
 
         //- Construct and return a clone
@@ -105,14 +105,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new fixedFluxBuoyantPressureFvPatchScalarField(*this)
+                new buoyantPressureFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        fixedFluxBuoyantPressureFvPatchScalarField
+        buoyantPressureFvPatchScalarField
         (
-            const fixedFluxBuoyantPressureFvPatchScalarField&,
+            const buoyantPressureFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -124,7 +124,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new fixedFluxBuoyantPressureFvPatchScalarField(*this, iF)
+                new buoyantPressureFvPatchScalarField(*this, iF)
             );
         }
 
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/p
index 2014ca6e8c..502fb88dfa 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/p
+++ b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/p
@@ -22,21 +22,21 @@ boundaryField
 {
     floor
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     ceiling
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     fixedWalls
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         rho             rhok;
         value           uniform 0;
     }
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p
index 2014ca6e8c..502fb88dfa 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/p
@@ -22,21 +22,21 @@ boundaryField
 {
     floor
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     ceiling
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     fixedWalls
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         rho             rhok;
         value           uniform 0;
     }
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p
index 2b90b18e74..6835a61b12 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p
@@ -22,28 +22,28 @@ boundaryField
 {
     ground
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     igloo_region0
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     twoFridgeFreezers_seal_0
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         rho             rhok;
         value           uniform 0;
     }
 
     twoFridgeFreezers_herring_1
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         rho             rhok;
         value           uniform 0;
     }
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/p
index 188522464a..349cfb544e 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/p
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/p
@@ -22,19 +22,19 @@ boundaryField
 {
     floor
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         value           uniform 1e5;
     }
 
     ceiling
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         value           uniform 1e5;
     }
 
     fixedWalls
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         value           uniform 1e5;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p
index 188522464a..349cfb544e 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/0/p
@@ -22,19 +22,19 @@ boundaryField
 {
     floor
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         value           uniform 1e5;
     }
 
     ceiling
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         value           uniform 1e5;
     }
 
     fixedWalls
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         value           uniform 1e5;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p
index bb1ff51259..f36884c5b2 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p
@@ -22,25 +22,25 @@ boundaryField
 {
     floor
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         value           uniform 100000;
     }
 
     ceiling
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         value           uniform 100000;
     }
 
     fixedWalls
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         value           uniform 100000;
     }
 
     box
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         value           uniform 100000;
     }
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p
index bb1ff51259..f36884c5b2 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p
@@ -22,25 +22,25 @@ boundaryField
 {
     floor
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         value           uniform 100000;
     }
 
     ceiling
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         value           uniform 100000;
     }
 
     fixedWalls
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         value           uniform 100000;
     }
 
     box
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         value           uniform 100000;
     }
 }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p
index 8a2a5d0a87..385ded3bb3 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/p
@@ -22,33 +22,33 @@ boundaryField
 {
     minX
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         value           1e5;
     }
     maxX
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         value           1e5;
     }
 
     minY
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         value           1e5;
     }
     maxY
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         value           1e5;
     }
     minZ
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         value           1e5;
     }
     maxZ
     {
-        type            fixedFluxBuoyantPressure;
+        type            buoyantPressure;
         value           1e5;
     }
 }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
index 7ee62d4bd7..6c80174e35 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict
@@ -232,42 +232,42 @@ dictionaryReplacement
         {
             minX
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
             maxX
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
             minY
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
             minZ
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
             maxZ
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
             bottomAir_to_leftSolid
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
             bottomAir_to_heater
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
             bottomAir_to_rightSolid
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
         }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
index f4f44ee6d4..a437f44d5d 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
@@ -231,7 +231,7 @@ dictionaryReplacement
         {
             minX
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
             maxX
@@ -249,34 +249,34 @@ dictionaryReplacement
 
             minY
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
 
             minZ
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
             maxZ
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
 
             topAir_to_leftSolid
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
             topAir_to_heater
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
             topAir_to_rightSolid
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
         }
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/bottomAir/changeDictionaryDict b/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/bottomAir/changeDictionaryDict
index afb08c33c8..f3d186d1e8 100644
--- a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/bottomAir/changeDictionaryDict
+++ b/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/bottomAir/changeDictionaryDict
@@ -255,42 +255,42 @@ dictionaryReplacement
         {
             minX
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
             maxX
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
             minY
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
             minZ
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
             maxZ
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
             bottomAir_to_leftSolid
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
             bottomAir_to_heater
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
             bottomAir_to_rightSolid
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
         }
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/topAir/changeDictionaryDict b/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/topAir/changeDictionaryDict
index 51104c879f..ad82755773 100644
--- a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/topAir/changeDictionaryDict
+++ b/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/topAir/changeDictionaryDict
@@ -265,7 +265,7 @@ dictionaryReplacement
         {
             minX
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
             maxX
@@ -283,34 +283,34 @@ dictionaryReplacement
 
             maxY
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
 
             minZ
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
             maxZ
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
 
             topAir_to_leftSolid
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
             topAir_to_heater
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
             topAir_to_rightSolid
             {
-                type            fixedFluxBuoyantPressure;
+                type            buoyantPressure;
                 value           1e5;
             }
         }

From d12ef658396a5a5a3a17b7243f1cc7718435924f Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Tue, 7 Jul 2009 22:56:34 +0100
Subject: [PATCH 40/84] Added version control to ThirdParty.

---
 etc/bashrc | 2 +-
 etc/cshrc  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/bashrc b/etc/bashrc
index aae664f98a..f906c99080 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -74,7 +74,7 @@ export WM_PROJECT_USER_DIR=$HOME/$WM_PROJECT/$USER-$WM_PROJECT_VERSION
 
 # Location of third-party software
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty
+export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION
 
 
 # Operating System/Platform
diff --git a/etc/cshrc b/etc/cshrc
index 3e6af0cd44..e1960e39dc 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -68,7 +68,7 @@ setenv WM_PROJECT_USER_DIR $HOME/$WM_PROJECT/$LOGNAME-$WM_PROJECT_VERSION
 
 # Location of third-party software
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-setenv WM_THIRD_PARTY_DIR $WM_PROJECT_INST_DIR/ThirdParty
+setenv WM_THIRD_PARTY_DIR $WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION
 
 
 # Operating System/Platform

From 7485b1c8671f0221d5e19d1fc80564ade23e5225 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Tue, 7 Jul 2009 22:57:02 +0100
Subject: [PATCH 41/84] Added execute permissions.

---
 bin/foamTemplates/sourceTemplate/newSourceTemplate | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 bin/foamTemplates/sourceTemplate/newSourceTemplate

diff --git a/bin/foamTemplates/sourceTemplate/newSourceTemplate b/bin/foamTemplates/sourceTemplate/newSourceTemplate
old mode 100644
new mode 100755

From 74ecfe9f0e4f6c5a7bbf16b9e5b7bea43a931b87 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Tue, 7 Jul 2009 22:57:26 +0100
Subject: [PATCH 42/84] Made destructor virtual.

---
 .../DimensionedFields/DimensionedField/DimensionedField.H    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
index f9744fc4fd..1d26e508a5 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
@@ -217,9 +217,8 @@ public:
         tmp<DimensionedField<Type, GeoMesh> > clone() const;
 
 
-    // Destructor
-
-        ~DimensionedField();
+    //- Destructor
+    virtual ~DimensionedField();
 
 
     // Member Functions

From d535ebc9068fb9be1cfa90397341f37db8e253dc Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 8 Jul 2009 11:20:46 +0100
Subject: [PATCH 43/84] adding Mark's change to the build PV options

---
 bin/tools/buildParaViewFunctions | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/bin/tools/buildParaViewFunctions b/bin/tools/buildParaViewFunctions
index f1c6ffaed6..f0873998af 100644
--- a/bin/tools/buildParaViewFunctions
+++ b/bin/tools/buildParaViewFunctions
@@ -170,6 +170,20 @@ addQtSupport()
     [ "${withQTSUPPORT:=false}" = true ] || return
 
     addCMakeVariable "PARAVIEW_BUILD_QT_GUI=ON"
+
+    if [ -n "$QMAKE_PATH" ]
+    then
+        if [ -x "$QMAKE_PATH" ]
+        then
+            addCMakeVariable QT_QMAKE_EXECUTABLE:FILEPATH=$QMAKE_PATH
+        else
+            echo
+            echo "specified QMAKE_PATH does not exist on this machine"
+            echo "    QMAKE_PATH=$QMAKE_PATH"
+            echo "leaving unspecified"
+            echo
+        fi
+    fi
 }
 
 

From 237cec3bf9cc93fce554698e4bdebd05ce47140b Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 8 Jul 2009 11:28:29 +0100
Subject: [PATCH 44/84] addind Mark's backward compatibility RAS BCs

---
 .../compressible/RAS/Make/files               |   4 +-
 ...urbulentMixingLengthDissipationRateInlet.C | 156 +++++++++++++++++
 ...urbulentMixingLengthDissipationRateInlet.H | 158 +++++++++++++++++
 ...ilityTurbulentMixingLengthFrequencyInlet.C | 163 ++++++++++++++++++
 ...ilityTurbulentMixingLengthFrequencyInlet.H | 162 +++++++++++++++++
 .../backwardsCompatibilityWallFunctions.C     |   0
 .../backwardsCompatibilityWallFunctions.H     |   0
 ...wardsCompatibilityWallFunctionsTemplates.C |   0
 ...entHeatFluxTemperatureFvPatchScalarField.C |   4 +-
 ...thDissipationRateInletFvPatchScalarField.H |   2 +-
 ...ngLengthFrequencyInletFvPatchScalarField.C |   2 +-
 ...ngLengthFrequencyInletFvPatchScalarField.H |   2 +-
 12 files changed, 647 insertions(+), 6 deletions(-)
 create mode 100644 src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.C
 create mode 100644 src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.H
 create mode 100644 src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.C
 create mode 100644 src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.H
 rename src/turbulenceModels/compressible/RAS/{backwardsCompatibilityWallFunctions => backwardsCompatibility/wallFunctions}/backwardsCompatibilityWallFunctions.C (100%)
 rename src/turbulenceModels/compressible/RAS/{backwardsCompatibilityWallFunctions => backwardsCompatibility/wallFunctions}/backwardsCompatibilityWallFunctions.H (100%)
 rename src/turbulenceModels/compressible/RAS/{backwardsCompatibilityWallFunctions => backwardsCompatibility/wallFunctions}/backwardsCompatibilityWallFunctionsTemplates.C (100%)

diff --git a/src/turbulenceModels/compressible/RAS/Make/files b/src/turbulenceModels/compressible/RAS/Make/files
index 4d00100ad6..56644ea6d3 100644
--- a/src/turbulenceModels/compressible/RAS/Make/files
+++ b/src/turbulenceModels/compressible/RAS/Make/files
@@ -37,6 +37,8 @@ derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFv
 derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
 derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
 
-backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctions.C
+backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
+backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.C
+backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.C
 
 LIB = $(FOAM_LIBBIN)/libcompressibleRASModels
diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.C b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.C
new file mode 100644
index 0000000000..83902514a0
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.C
@@ -0,0 +1,156 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2006-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "surfaceFields.H"
+#include "volFields.H"
+#include "RASModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField::
+backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchField<scalar>(p, iF),
+    mixingLength_(0.001)
+{}
+
+backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField::
+backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField
+(
+    const backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchField<scalar>(ptf, p, iF, mapper),
+    mixingLength_(ptf.mixingLength_)
+{}
+
+backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField::
+backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchField<scalar>(p, iF, dict),
+    mixingLength_(readScalar(dict.lookup("mixingLength")))
+{}
+
+backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField::
+backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField
+(
+    const backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField& ptf
+)
+:
+    fixedValueFvPatchField<scalar>(ptf),
+    mixingLength_(ptf.mixingLength_)
+{}
+
+backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField::
+backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField
+(
+    const backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField& ptf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchField<scalar>(ptf, iF),
+    mixingLength_(ptf.mixingLength_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    // Lookup Cmu corresponding to the turbulence model selected
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+
+    const scalar Cmu = readScalar(rasModel.coeffDict().lookup("Cmu"));
+    const scalar Cmu75 = pow(Cmu, 0.75);
+
+    const fvPatchField<scalar>& kp =
+        patch().lookupPatchField<volScalarField, scalar>("k");
+
+    operator==(Cmu75*kp*sqrt(kp)/mixingLength_);
+
+    fixedValueFvPatchField<scalar>::updateCoeffs();
+}
+
+
+void backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField::write
+(
+    Ostream& os
+) const
+{
+    // write with prefix for forwards compatibility
+    // mimic - fvPatchField<scalar>::write(os);
+
+    os.writeKeyword("type")
+        << "compressible::" << type() << token::END_STATEMENT << nl;
+
+    os.writeKeyword("mixingLength")
+        << mixingLength_ << token::END_STATEMENT << nl;
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField
+(
+    fvPatchScalarField,
+    backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace compressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.H b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.H
new file mode 100644
index 0000000000..fec530e1fc
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.H
@@ -0,0 +1,158 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2006-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::compressible::
+        backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField
+
+Description
+    Compatibility for the new namespace qualifier
+    Foam::compressible::turbulentMixingLengthDissipationRateInletFvPatchScalarField
+
+SourceFiles
+    backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet_H
+#define backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet_H
+
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+
+/*---------------------------------------------------------------------------*\
+       Class backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField
+:
+    public fixedValueFvPatchScalarField
+{
+    // Private data
+
+        //- turbulent length scale
+        scalar mixingLength_;
+
+public:
+
+    //- Runtime type information
+    TypeName("turbulentMixingLengthDissipationRateInlet");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField
+        //  onto a new patch
+        backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField
+        (
+            const backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField
+        (
+            const backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField
+                (
+                    *this
+                )
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField
+        (
+            const backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField
+                (
+                    *this,
+                    iF
+                )
+            );
+        }
+
+
+    // Member functions
+
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace compressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.C b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.C
new file mode 100644
index 0000000000..e9e1cd11b4
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.C
@@ -0,0 +1,163 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2006-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "surfaceFields.H"
+#include "volFields.H"
+#include "RASModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField::
+backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchField<scalar>(p, iF),
+    mixingLength_(0.0),
+    kName_("k")
+{}
+
+backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField::
+backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField
+(
+    const backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchField<scalar>(ptf, p, iF, mapper),
+    mixingLength_(ptf.mixingLength_),
+    kName_(ptf.kName_)
+{}
+
+backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField::
+backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchField<scalar>(p, iF, dict),
+    mixingLength_(readScalar(dict.lookup("mixingLength"))),
+    kName_(dict.lookupOrDefault<word>("k", "k"))
+{}
+
+backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField::
+backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField
+(
+    const backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField& ptf
+)
+:
+    fixedValueFvPatchField<scalar>(ptf),
+    mixingLength_(ptf.mixingLength_),
+    kName_(ptf.kName_)
+{}
+
+backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField::
+backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField
+(
+    const backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField& ptf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchField<scalar>(ptf, iF),
+    mixingLength_(ptf.mixingLength_),
+    kName_(ptf.kName_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    // Lookup Cmu corresponding to the turbulence model selected
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+
+    const scalar Cmu = readScalar(rasModel.coeffDict().lookup("Cmu"));
+    const scalar Cmu25 = pow(Cmu, 0.25);
+
+    const fvPatchField<scalar>& kp =
+        patch().lookupPatchField<volScalarField, scalar>(kName_);
+
+    operator==(sqrt(kp)/(Cmu25*mixingLength_));
+
+    fixedValueFvPatchField<scalar>::updateCoeffs();
+}
+
+
+void backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField::write
+(
+    Ostream& os
+) const
+{
+    // write with prefix for forwards compatibility
+    // mimic - fvPatchField<scalar>::write(os);
+
+    os.writeKeyword("type")
+        << "compressible::" << type() << token::END_STATEMENT << nl;
+
+    os.writeKeyword("mixingLength")
+        << mixingLength_ << token::END_STATEMENT << nl;
+
+    os.writeKeyword("k") << kName_ << token::END_STATEMENT << nl;
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField
+(
+    fvPatchScalarField,
+    backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace compressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.H b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.H
new file mode 100644
index 0000000000..ebe6e5445e
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.H
@@ -0,0 +1,162 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2006-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::compressible::
+        backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField
+
+Description
+    Compatibility for the new namespace qualifier
+    Foam::compressible::turbulentMixingLengthFrequencyInletFvPatchScalarField
+
+SourceFiles
+    backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef compressiblebackwardsCompatibilityTurbulentMixingLengthFrequencyInlet_H
+#define compressiblebackwardsCompatibilityTurbulentMixingLengthFrequencyInlet_H
+
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+
+/*---------------------------------------------------------------------------*\
+    Class backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField
+:
+    public fixedValueFvPatchScalarField
+{
+    // Private data
+
+        //- Turbulent length scale
+        scalar mixingLength_;
+
+        //- Name of the turbulent kinetic energy field
+        word kName_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("turbulentMixingLengthFrequencyInlet");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField
+        //  onto a new patch
+        backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField
+        (
+            const backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField
+        (
+            const backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField
+                (
+                    *this
+                )
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField
+        (
+            const backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField
+                (
+                    *this,
+                    iF
+                )
+            );
+        }
+
+
+    // Member functions
+
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace compressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctions.C b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
similarity index 100%
rename from src/turbulenceModels/compressible/RAS/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctions.C
rename to src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctions.H b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.H
similarity index 100%
rename from src/turbulenceModels/compressible/RAS/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctions.H
rename to src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.H
diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctionsTemplates.C b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C
similarity index 100%
rename from src/turbulenceModels/compressible/RAS/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctionsTemplates.C
rename to src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
index bb43576ac8..2f54baf7c2 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
@@ -48,7 +48,7 @@ turbulentHeatFluxTemperatureFvPatchScalarField
 :
     fixedGradientFvPatchScalarField(p, iF),
     q_(p.size(), 0.0),
-    rhoName_("undefinedRho")
+    rhoName_("rho")
 {}
 
 
@@ -77,7 +77,7 @@ turbulentHeatFluxTemperatureFvPatchScalarField
 :
     fixedGradientFvPatchScalarField(p, iF),
     q_("q", dict, p.size()),
-    rhoName_(dict.lookup("rho"))
+    rhoName_(dict.lookupOrDefault<word>("rho", "rho"))
 {
     fvPatchField<scalar>::operator=(patchInternalField());
     gradient() = 0.0;
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H
index 1eb669f06b..ac669c1bba 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H
@@ -33,7 +33,7 @@ Description
     @verbatim
         inlet
         {
-            type            turbulentMixingLengthDissipationRateInlet;
+            type            compressible::turbulentMixingLengthDissipationRateInlet;
             mixingLength    0.005;         // 5 mm
             value           uniform 200;   // placeholder
         }
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
index 4032af3586..60a8e9c9e3 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
@@ -49,7 +49,7 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField
 :
     fixedValueFvPatchField<scalar>(p, iF),
     mixingLength_(0.0),
-    kName_("undefined-k")
+    kName_("k")
 {}
 
 turbulentMixingLengthFrequencyInletFvPatchScalarField::
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H
index 45d8d2663c..ea49be141b 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H
@@ -32,7 +32,7 @@ Description
     @verbatim
         inlet
         {
-            type            turbulentMixingLengthFrequencyInlet;
+            type            compressible::turbulentMixingLengthFrequencyInlet;
             mixingLength    0.005;         // 5 mm
             k               k;             // turbulent k field
             value           uniform 5;     // initial value

From 365df487250322d7e66bd62fda9ee1ec1947ea56 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 8 Jul 2009 11:31:18 +0100
Subject: [PATCH 45/84] adding Mark's change to .gitignore

---
 .gitignore | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 150288aae2..575d88cbe8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,18 +26,19 @@ core
 # dependency files - anywhere
 *.dep
 
-# lnInclude folders - anywhere
+# lnInclude (symlink) folders - anywhere
 lnInclude
 
-# linux build folder(s) - anywhere
-linux*Gcc*
+# build folder(s) - anywhere
+linux*Gcc*/
+linux*Icc*/
+linuxming*/
+SiCortex*Gcc*/
+solaris*Gcc*/
+SunOS*Gcc*/
 
-# reinstate wmake/rules that look like build folders
-!wmake/rules/linux*
-
-# but do continue to ignore the derived wmake files
-wmake/rules/*/dirToString
-wmake/rules/*/wmkdep
+# reinstate wmake/rules that might look like build folders
+!wmake/rules/*/
 
 # doxygen generated documentation
 doc/[Dd]oxygen/html

From 0856be990758760cabdb0b778bcba924ca372383 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Wed, 8 Jul 2009 13:26:11 +0100
Subject: [PATCH 46/84] New uniformDimensionedField class based on dimensioned
 but registered to the db and with IO functionality.  This can be used for
 "fields" like g which can then be looked up in boundary conditions.

---
 src/OpenFOAM/Make/files                       |   6 +-
 .../UniformDimensionedField.C                 | 112 +++++++++++++++++
 .../UniformDimensionedField.H                 | 118 ++++++++++++++++++
 .../uniformDimensionedFields.C                |  46 +++++++
 .../uniformDimensionedFields.H                |  62 +++++++++
 5 files changed, 342 insertions(+), 2 deletions(-)
 create mode 100644 src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C
 create mode 100644 src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H
 create mode 100644 src/OpenFOAM/fields/UniformDimensionedFields/uniformDimensionedFields.C
 create mode 100644 src/OpenFOAM/fields/UniformDimensionedFields/uniformDimensionedFields.H

diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 24208bfcd5..9d1daeeeef 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -449,7 +449,11 @@ meshTools = meshes/meshTools
 $(meshTools)/matchPoints.C
 $(meshTools)/mergePoints.C
 
+fields/UniformDimensionedFields/uniformDimensionedFields.C
+fields/cloud/cloud.C
+
 Fields = fields/Fields
+
 $(Fields)/labelField/labelField.C
 $(Fields)/scalarField/scalarField.C
 $(Fields)/sphericalTensorField/sphericalTensorField.C
@@ -458,8 +462,6 @@ $(Fields)/symmTensorField/symmTensorField.C
 $(Fields)/tensorField/tensorField.C
 $(Fields)/complexFields/complexFields.C
 
-fields/cloud/cloud.C
-
 $(Fields)/labelField/labelIOField.C
 $(Fields)/scalarField/scalarIOField.C
 $(Fields)/vectorField/vectorIOField.C
diff --git a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C
new file mode 100644
index 0000000000..bcf5ddc58d
--- /dev/null
+++ b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.C
@@ -0,0 +1,112 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "UniformDimensionedField.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::UniformDimensionedField<Type>::UniformDimensionedField
+(
+    const IOobject& io,
+    const dimensioned<Type>& dt
+)
+:
+    regIOobject(io),
+    dimensioned<Type>(dt)
+{}
+
+
+template<class Type>
+Foam::UniformDimensionedField<Type>::UniformDimensionedField
+(
+    const UniformDimensionedField<Type>& rdt
+)
+:
+    regIOobject(rdt),
+    dimensioned<Type>(rdt)
+{}
+
+
+template<class Type>
+Foam::UniformDimensionedField<Type>::UniformDimensionedField
+(
+    const IOobject& io
+)
+:
+    regIOobject(io),
+    dimensioned<Type>(regIOobject::name(), dimless, pTraits<Type>::zero)
+{
+    dictionary dict(readStream(typeName));
+    this->dimensions().reset(dict.lookup("dimensions"));
+    this->value() = dict.lookup("value");
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::UniformDimensionedField<Type>::~UniformDimensionedField()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+bool Foam::UniformDimensionedField<Type>::writeData(Ostream& os) const
+{
+    os.writeKeyword("dimensions") << this->dimensions() << token::END_STATEMENT
+        << nl;
+    os.writeKeyword("value") << this->value() << token::END_STATEMENT
+        << nl << nl;
+
+    return (os.good());
+}
+
+
+// * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::UniformDimensionedField<Type>::operator=
+(
+    const UniformDimensionedField<Type>& rhs
+)
+{
+    dimensioned<Type>::operator=(rhs);
+}
+
+
+template<class Type>
+void Foam::UniformDimensionedField<Type>::operator=
+(
+    const dimensioned<Type>& rhs
+)
+{
+    dimensioned<Type>::operator=(rhs);
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H
new file mode 100644
index 0000000000..2d3ff83144
--- /dev/null
+++ b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H
@@ -0,0 +1,118 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::UniformDimensionedField
+
+Description
+    Dimensioned<Type> registered with the database as a registered IOobject
+    which has the functionality of a uniform field and allows values from the
+    top-level code to be passed to boundary conditions etc.
+
+SourceFiles
+    UniformDimensionedField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef UniformDimensionedField_H
+#define UniformDimensionedField_H
+
+#include "regIOobject.H"
+#include "dimensionedType.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class UniformDimensionedField Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class UniformDimensionedField
+:
+    public regIOobject,
+    public dimensioned<Type>
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("DimensionedType");
+
+
+    // Constructors
+
+        //- Construct null
+        UniformDimensionedField();
+
+        //- Construct from components
+        UniformDimensionedField(const IOobject&, const dimensioned<Type>&);
+
+        //- Construct as copy
+        UniformDimensionedField(const UniformDimensionedField<Type>&);
+
+        //- Construct from Istream
+        UniformDimensionedField(const IOobject&);
+
+
+    //- Destructor
+    virtual ~UniformDimensionedField();
+
+
+    // Member Functions
+
+        //- Name function provided to resolve the ambiguity between the
+        //  name functions in regIOobject and dimensioned<Type>
+        virtual const word& name() const
+        {
+            return dimensioned<Type>::name();
+        }
+
+        bool writeData(Ostream&) const;
+
+
+    // Member Operators
+
+        void operator=(const UniformDimensionedField<Type>&);
+        void operator=(const dimensioned<Type>&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "UniformDimensionedField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/UniformDimensionedFields/uniformDimensionedFields.C b/src/OpenFOAM/fields/UniformDimensionedFields/uniformDimensionedFields.C
new file mode 100644
index 0000000000..07ea575bbe
--- /dev/null
+++ b/src/OpenFOAM/fields/UniformDimensionedFields/uniformDimensionedFields.C
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "uniformDimensionedFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTemplateTypeNameAndDebug(uniformDimensionedScalarField, 0);
+defineTemplateTypeNameAndDebug(uniformDimensionedVectorField, 0);
+defineTemplateTypeNameAndDebug(uniformDimensionedSphericalTensorField, 0);
+defineTemplateTypeNameAndDebug(uniformDimensionedSymmTensorField, 0);
+defineTemplateTypeNameAndDebug(uniformDimensionedTensorField, 0);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/UniformDimensionedFields/uniformDimensionedFields.H b/src/OpenFOAM/fields/UniformDimensionedFields/uniformDimensionedFields.H
new file mode 100644
index 0000000000..a59298e8d7
--- /dev/null
+++ b/src/OpenFOAM/fields/UniformDimensionedFields/uniformDimensionedFields.H
@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+InClass
+    Foam::UniformDimensionedField
+
+Description
+
+SourceFiles
+    UniformDimensionedFields.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef UniformDimensionedFields_H
+#define UniformDimensionedFields_H
+
+#include "UniformDimensionedField.H"
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+typedef UniformDimensionedField<scalar> uniformDimensionedScalarField;
+typedef UniformDimensionedField<vector> uniformDimensionedVectorField;
+typedef UniformDimensionedField<sphericalTensor> uniformDimensionedSphericalTensorField;
+typedef UniformDimensionedField<symmTensor> uniformDimensionedSymmTensorField;
+typedef UniformDimensionedField<tensor> uniformDimensionedTensorField;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 979c35edbb15dca864391728d0672b00c32798e3 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 8 Jul 2009 14:10:56 +0100
Subject: [PATCH 47/84] added (previously removed) rules for dirToString and
 wmkdep

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index b124c8d887..a95cd603ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,10 @@ SunOS*Gcc*/
 # reinstate wmake/rules that might look like build folders
 !wmake/rules/*/
 
+# but do continue to ignore the derived wmake files
+wmake/rules/*/dirToString
+wmake/rules/*/wmkdep
+
 # doxygen generated documentation
 doc/[Dd]oxygen/html
 doc/[Dd]oxygen/latex

From 10fa5172ccd1ae717fad130789ec8154f086521a Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 8 Jul 2009 16:35:09 +0100
Subject: [PATCH 48/84] optimisation - removed double allocation of storage of
 t

---
 .../ODEChemistryModel/ODEChemistryModel.C     | 45 +++++++++----------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.C
index dfe226da19..7153826609 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.C
@@ -246,11 +246,9 @@ Foam::scalar Foam::ODEChemistryModel<CompType, ThermoType>::omega
         {
             pr *= pow(cr, exp - 1.0);
         }
-
     }
 
     return pf*cf - pr*cr;
-
 }
 
 
@@ -468,10 +466,27 @@ Foam::ODEChemistryModel<CompType, ThermoType>::tc() const
         this->thermo().rho()
     );
 
-    label nCells = rho.size();
-    label nReaction = reactions_.size();
+    tmp<volScalarField> tsource
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "tc",
+                this->time().timeName(),
+                this->mesh(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            this->mesh(),
+            dimensionedScalar("zero", dimTime, SMALL),
+            zeroGradientFvPatchScalarField::typeName
+        )
+    );
 
-    scalarField t(nCells, SMALL);
+    scalarField& t = tsource();
+
+    label nReaction = reactions_.size();
 
     if (this->chemistry_)
     {
@@ -509,25 +524,7 @@ Foam::ODEChemistryModel<CompType, ThermoType>::tc() const
         }
     }
 
-    tmp<volScalarField> tsource
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "tc",
-                this->mesh_.time().timeName(),
-                this->mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            this->mesh_,
-            dimensionedScalar("zero", dimTime, 0.0),
-            zeroGradientFvPatchScalarField::typeName
-        )
-    );
 
-    tsource().internalField() = t;
     tsource().correctBoundaryConditions();
 
     return tsource;
@@ -682,7 +679,7 @@ Foam::scalar Foam::ODEChemistryModel<CompType, ThermoType>::solve
 
     forAll(rho, celli)
     {
-        for (label i=0; i<nSpecie(); i++)
+        for (label i=0; i<nSpecie_; i++)
         {
             RR_[i][celli] = 0.0;
         }

From e6e8485e8394eb62585e0ee2a07fad1c0bb74fd5 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 8 Jul 2009 16:44:04 +0100
Subject: [PATCH 49/84] corrected typo in comment - compressibility->density

---
 .../chemistryModel/rhoChemistryModel/rhoChemistryModel.H        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.H
index 43df6e0406..8991f250f9 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/rhoChemistryModel/rhoChemistryModel.H
@@ -26,7 +26,7 @@ Class
     Foam::rhoChemistryModel
 
 Description
-    Chemistry model for compressibility-based thermodynamics
+    Chemistry model for density-based thermodynamics
 
 SourceFiles
     rhoChemistryModelI.H

From 54f9cc3fe9a656574b499f2a6ae3ef5f68906eba Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 8 Jul 2009 16:54:59 +0100
Subject: [PATCH 50/84] added output of heat release, dQ (got lost somewhere
 along the way...)

---
 .../solvers/combustion/dieselEngineFoam/dieselEngineFoam.C  | 5 ++++-
 applications/solvers/combustion/dieselFoam/dieselFoam.C     | 5 ++++-
 applications/solvers/combustion/reactingFoam/reactingFoam.C | 5 ++++-
 .../solvers/combustion/rhoReactingFoam/rhoReactingFoam.C    | 5 ++++-
 .../lagrangian/coalChemistryFoam/coalChemistryFoam.C        | 5 ++++-
 .../porousExplicitSourceReactingParcelFoam.C                | 6 ++++--
 .../lagrangian/reactingParcelFoam/reactingParcelFoam.C      | 5 ++++-
 7 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
index ba910bcf56..7d3022a86f 100644
--- a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
+++ b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
@@ -124,7 +124,10 @@ int main(int argc, char *argv[])
 
         rho = thermo.rho();
 
-        runTime.write();
+        if (runTime.write())
+        {
+            chemistry.dQ()().write();
+        }
 
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
             << "  ClockTime = " << runTime.elapsedClockTime() << " s"
diff --git a/applications/solvers/combustion/dieselFoam/dieselFoam.C b/applications/solvers/combustion/dieselFoam/dieselFoam.C
index 11cd91a488..1f2406ccd5 100644
--- a/applications/solvers/combustion/dieselFoam/dieselFoam.C
+++ b/applications/solvers/combustion/dieselFoam/dieselFoam.C
@@ -114,7 +114,10 @@ int main(int argc, char *argv[])
 
         rho = thermo.rho();
 
-        runTime.write();
+        if (runTime.write())
+        {
+            chemistry.dQ()().write();
+        }
 
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
             << "  ClockTime = " << runTime.elapsedClockTime() << " s"
diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C
index 2a9e34e577..abb28ffd44 100644
--- a/applications/solvers/combustion/reactingFoam/reactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C
@@ -86,7 +86,10 @@ int main(int argc, char *argv[])
 
         turbulence->correct();
 
-        rho = thermo.rho();
+        if (runTime.write())
+        {
+            chemistry.dQ()().write();
+        }
 
         runTime.write();
 
diff --git a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
index 16f49a197f..1c3b132cef 100644
--- a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
+++ b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
@@ -86,7 +86,10 @@ int main(int argc, char *argv[])
 
         rho = thermo.rho();
 
-        runTime.write();
+        if (runTime.write())
+        {
+            chemistry.dQ()().write();
+        }
 
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
             << "  ClockTime = " << runTime.elapsedClockTime() << " s"
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
index 0791c2e358..9c10a7a617 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
+++ b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
@@ -114,7 +114,10 @@ int main(int argc, char *argv[])
 
         rho = thermo.rho();
 
-        runTime.write();
+        if (runTime.write())
+        {
+            chemistry.dQ()().write();
+        }
 
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
             << "  ClockTime = " << runTime.elapsedClockTime() << " s"
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
index 760627de80..2922d0bdf8 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
@@ -99,12 +99,14 @@ int main(int argc, char *argv[])
             #include "pEqn.H"
         }
 
-
         turbulence->correct();
 
         rho = thermo.rho();
 
-        runTime.write();
+        if (runTime.write())
+        {
+            chemistry.dQ()().write();
+        }
 
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
             << "  ClockTime = " << runTime.elapsedClockTime() << " s"
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
index 8c26cb6528..4dd5f27934 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
+++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
@@ -101,7 +101,10 @@ int main(int argc, char *argv[])
 
         rho = thermo.rho();
 
-        runTime.write();
+        if (runTime.write())
+        {
+            chemistry.dQ()().write();
+        }
 
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
             << "  ClockTime = " << runTime.elapsedClockTime() << " s"

From d76820dc57beb42611876ccd9e82bcdaed750649 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Wed, 8 Jul 2009 17:09:51 +0100
Subject: [PATCH 51/84] Changed g from being read from environmentalProperties
 to being read directly as a uniformDimensionedVectorField.

---
 .../solvers/combustion/PDRFoam/PDRFoam.C      |  2 +-
 .../combustion/PDRFoam/PDRFoamAutoRefine.C    | 48 +++++++++----------
 .../solvers/combustion/XiFoam/XiFoam.C        |  2 +-
 .../combustion/dieselEngineFoam/createSpray.H |  2 +-
 .../dieselEngineFoam/dieselEngineFoam.C       |  2 +-
 .../combustion/dieselFoam/dieselFoam.C        |  2 +-
 .../combustion/reactingFoam/reactingFoam.C    |  2 +-
 .../rhoReactingFoam/rhoReactingFoam.C         |  2 +-
 .../buoyantBoussinesqPisoFoam.C               |  2 +-
 .../buoyantBoussinesqSimpleFoam.C             |  2 +-
 .../buoyantPisoFoam/buoyantPisoFoam.C         |  2 +-
 .../buoyantSimpleFoam/buoyantSimpleFoam.C     |  2 +-
 .../buoyantSimpleRadiationFoam.C              |  2 +-
 .../fluid/createFluidFields.H                 | 18 +++++++
 .../fluid/createFluidMeshes.H                 | 23 ---------
 .../fluid/setRegionFluidFields.H              |  8 +---
 ...ties.H => readGravitationalAcceleration.H} | 12 ++---
 .../shallowWaterFoam/shallowWaterFoam.C       |  2 +-
 .../coalChemistryFoam/coalChemistryFoam.C     |  2 +-
 .../porousExplicitSourceReactingParcelFoam.C  |  2 +-
 .../reactingParcelFoam/reactingParcelFoam.C   |  2 +-
 .../uncoupledKinematicParcelFoam.C            |  2 +-
 .../multiphase/bubbleFoam/bubbleFoam.C        |  2 +-
 .../compressibleInterDyMFoam.C                |  2 +-
 .../compressibleInterFoam.C                   |  2 +-
 .../multiphase/interDyMFoam/interDyMFoam.C    |  2 +-
 .../solvers/multiphase/interFoam/interFoam.C  |  2 +-
 .../interPhaseChangeFoam.C                    |  2 +-
 .../multiphaseInterFoam/multiphaseInterFoam.C |  2 +-
 .../multiphase/settlingFoam/settlingFoam.C    |  2 +-
 .../twoLiquidMixingFoam/twoLiquidMixingFoam.C |  2 +-
 .../twoPhaseEulerFoam/twoPhaseEulerFoam.C     |  2 +-
 .../cfdTools/general/include/fvCFD.H          |  1 +
 .../include/readEnvironmentalProperties.H     | 15 ------
 .../include/readGravitationalAcceleration.H   | 12 +++++
 .../buoyantPressureFvPatchScalarField.C       |  7 ++-
 ...ityHydrostaticPressureFvPatchScalarField.C |  8 ++--
 src/lagrangian/dieselSpray/spray/spray.C      |  6 +--
 src/lagrangian/dieselSpray/spray/spray.H      |  4 +-
 .../alphaFixedPressureFvPatchScalarField.C    |  7 ++-
 .../constant/environmentalProperties          | 21 --------
 .../XiFoam/les/pitzDaily/constant/g}          |  6 ++-
 .../constant/{environmentalProperties => g}   |  5 +-
 .../ras/moriyoshiHomogeneous/constant/g}      |  5 +-
 .../dieselFoam/aachenBomb/constant/g}         |  5 +-
 .../kivaTest/constant/g}                      |  5 +-
 .../hotRoom/constant/environmentalProperties  | 21 --------
 .../hotRoom/constant/g}                       |  5 +-
 .../hotRoom/constant/environmentalProperties  | 21 --------
 .../hotRoom/constant/g                        | 22 +++++++++
 .../constant/{environmentalProperties => g}   |  5 +-
 .../hotRoom/constant/environmentalProperties  | 21 --------
 .../buoyantPisoFoam/hotRoom/constant/g        | 22 +++++++++
 .../hotRoom/constant/environmentalProperties  | 21 --------
 .../buoyantSimpleFoam/hotRoom/constant/g      | 22 +++++++++
 .../constant/environmentalProperties          | 21 --------
 .../hotRadiationRoom/constant/g               | 22 +++++++++
 .../constant/environmentalProperties          | 21 --------
 .../hotRadiationRoomFvDOM/constant/g          | 22 +++++++++
 .../bottomAir/environmentalProperties         | 19 --------
 .../multiRegionHeater/constant/bottomAir/g    | 20 ++++++++
 .../constant/topAir/environmentalProperties   |  1 -
 .../multiRegionHeater/constant/topAir/g       |  0
 .../constant/{environmentalProperties => g}   |  7 +--
 .../simplifiedSiwek/constant/g}               |  5 +-
 .../filter/constant/g}                        |  5 +-
 .../evaporationTest/constant/g}               |  5 +-
 .../rhoPisoTwinParcelFoam.C                   |  2 +-
 .../constant/environmentalProperties          | 21 --------
 .../simplifiedSiwek/constant/g                | 22 +++++++++
 .../bottomAir/environmentalProperties         | 19 --------
 .../multiRegionMesh/constant/bottomAir/g      | 20 ++++++++
 .../constant/topAir/environmentalProperties   |  1 -
 .../multiRegionMesh/constant/topAir/g         |  0
 .../constant/environmentalProperties          | 21 --------
 .../bubbleFoam/bubbleColumn/constant/g        | 22 +++++++++
 .../constant/{environmentalProperties => g}   |  5 +-
 .../constant/{environmentalProperties => g}   |  5 +-
 .../constant/environmentalProperties          | 21 --------
 .../ras/damBreakWithObstacle/constant/g       | 22 +++++++++
 .../constant/{environmentalProperties => g}   |  5 +-
 .../constant/environmentalProperties          | 21 --------
 .../ras/sloshingTank2D3DoF/constant/g         | 22 +++++++++
 .../constant/environmentalProperties          | 21 --------
 .../ras/sloshingTank3D/constant/g             | 22 +++++++++
 .../constant/environmentalProperties          | 21 --------
 .../ras/sloshingTank3D3DoF/constant/g         | 22 +++++++++
 .../constant/environmentalProperties          | 21 --------
 .../ras/sloshingTank3D6DoF/constant/g         | 22 +++++++++
 .../MRFInterFoam/MRFInterFoam/MRFInterFoam.C  |  2 +-
 .../MRFInterFoam/mixerVessel2D/constant/g     | 21 ++++++++
 .../damBreak/constant/environmentalProperties | 21 --------
 .../interFoam/laminar/damBreak/constant/g     | 22 +++++++++
 .../interFoam/les/nozzleFlow2D/constant/g     | 22 +++++++++
 .../damBreak/constant/environmentalProperties | 21 --------
 .../interFoam/ras/damBreak/constant/g         | 22 +++++++++
 .../constant/environmentalProperties          | 21 --------
 .../laminar/damBreak4phase/constant/g         | 22 +++++++++
 .../constant/environmentalProperties          | 21 --------
 .../laminar/damBreak4phaseFine/constant/g     | 22 +++++++++
 .../ras/dahl/constant/environmentalProperties | 21 --------
 .../settlingFoam/ras/dahl/constant/g          | 22 +++++++++
 .../tank3D/constant/environmentalProperties   | 21 --------
 .../settlingFoam/ras/tank3D/constant/g        | 22 +++++++++
 .../twoPhaseEulerFoam/bed/constant/g}         |  5 +-
 .../bed2/constant/environmentalProperties     | 21 --------
 .../twoPhaseEulerFoam/bed2/constant/g         | 22 +++++++++
 .../constant/environmentalProperties          | 21 --------
 .../twoPhaseEulerFoam/bubbleColumn/constant/g | 22 +++++++++
 109 files changed, 676 insertions(+), 654 deletions(-)
 rename applications/solvers/incompressible/shallowWaterFoam/{readEnvironmentalProperties.H => readGravitationalAcceleration.H} (50%)
 delete mode 100644 src/finiteVolume/cfdTools/general/include/readEnvironmentalProperties.H
 create mode 100644 src/finiteVolume/cfdTools/general/include/readGravitationalAcceleration.H
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily/constant/environmentalProperties
 rename tutorials/{multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/environmentalProperties => combustion/XiFoam/les/pitzDaily/constant/g} (90%)
 rename tutorials/combustion/XiFoam/les/pitzDaily3D/constant/{environmentalProperties => g} (90%)
 rename tutorials/{multiphase/interFoam/les/nozzleFlow2D/constant/environmentalProperties => combustion/XiFoam/ras/moriyoshiHomogeneous/constant/g} (90%)
 rename tutorials/{multiphase/twoPhaseEulerFoam/bed/constant/environmentalProperties => combustion/dieselFoam/aachenBomb/constant/g} (90%)
 rename tutorials/combustion/{XiFoam/ras/moriyoshiHomogeneous/constant/environmentalProperties => engineFoam/kivaTest/constant/g} (90%)
 delete mode 100644 tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/environmentalProperties
 rename tutorials/{combustion/engineFoam/kivaTest/constant/environmentalProperties => heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/g} (90%)
 delete mode 100644 tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/environmentalProperties
 create mode 100644 tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g
 rename tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/{environmentalProperties => g} (90%)
 delete mode 100644 tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/environmentalProperties
 create mode 100644 tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/g
 delete mode 100644 tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/environmentalProperties
 create mode 100644 tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/g
 delete mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/environmentalProperties
 create mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/g
 delete mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/environmentalProperties
 create mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/g
 delete mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/environmentalProperties
 create mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g
 delete mode 120000 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/environmentalProperties
 create mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/g
 rename tutorials/incompressible/shallowWaterFoam/squareBump/constant/{environmentalProperties => g} (84%)
 rename tutorials/lagrangian/{porousExplicitSourceReactingParcelFoam/filter/constant/environmentalProperties => coalChemistryFoam/simplifiedSiwek/constant/g} (90%)
 rename tutorials/lagrangian/{reactingParcelFoam/evaporationTest/constant/environmentalProperties => porousExplicitSourceReactingParcelFoam/filter/constant/g} (90%)
 rename tutorials/lagrangian/{coalChemistryFoam/simplifiedSiwek/constant/environmentalProperties => reactingParcelFoam/evaporationTest/constant/g} (89%)
 delete mode 100644 tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/environmentalProperties
 create mode 100644 tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/g
 delete mode 100644 tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/environmentalProperties
 create mode 100644 tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/g
 delete mode 120000 tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/environmentalProperties
 create mode 100644 tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/g
 delete mode 100644 tutorials/multiphase/bubbleFoam/bubbleColumn/constant/environmentalProperties
 create mode 100644 tutorials/multiphase/bubbleFoam/bubbleColumn/constant/g
 rename tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/{environmentalProperties => g} (89%)
 rename tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/{environmentalProperties => g} (89%)
 delete mode 100644 tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/environmentalProperties
 create mode 100644 tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/g
 rename tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/{environmentalProperties => g} (89%)
 delete mode 100644 tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/environmentalProperties
 create mode 100644 tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/g
 delete mode 100644 tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/environmentalProperties
 create mode 100644 tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/g
 delete mode 100644 tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/environmentalProperties
 create mode 100644 tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/g
 delete mode 100644 tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/environmentalProperties
 create mode 100644 tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/g
 create mode 100644 tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/g
 delete mode 100644 tutorials/multiphase/interFoam/laminar/damBreak/constant/environmentalProperties
 create mode 100644 tutorials/multiphase/interFoam/laminar/damBreak/constant/g
 create mode 100644 tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/g
 delete mode 100644 tutorials/multiphase/interFoam/ras/damBreak/constant/environmentalProperties
 create mode 100644 tutorials/multiphase/interFoam/ras/damBreak/constant/g
 delete mode 100644 tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/environmentalProperties
 create mode 100644 tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g
 delete mode 100644 tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/environmentalProperties
 create mode 100644 tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g
 delete mode 100644 tutorials/multiphase/settlingFoam/ras/dahl/constant/environmentalProperties
 create mode 100644 tutorials/multiphase/settlingFoam/ras/dahl/constant/g
 delete mode 100644 tutorials/multiphase/settlingFoam/ras/tank3D/constant/environmentalProperties
 create mode 100644 tutorials/multiphase/settlingFoam/ras/tank3D/constant/g
 rename tutorials/{combustion/dieselFoam/aachenBomb/constant/environmentalProperties => multiphase/twoPhaseEulerFoam/bed/constant/g} (90%)
 delete mode 100644 tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/environmentalProperties
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/g
 delete mode 100644 tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/environmentalProperties
 create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/g

diff --git a/applications/solvers/combustion/PDRFoam/PDRFoam.C b/applications/solvers/combustion/PDRFoam/PDRFoam.C
index 58bea3ed99..61171f27b3 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoam.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoam.C
@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "readCombustionProperties.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
     #include "readTimeControls.H"
diff --git a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
index 1320b19d31..9b0344165a 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
@@ -72,31 +72,31 @@ Description
 
 int main(int argc, char *argv[])
 {
-#   include "setRootCase.H"
+    #include "setRootCase.H"
 
-#   include "createTime.H"
-#   include "createDynamicFvMesh.H"
-#   include "readCombustionProperties.H"
-#   include "readEnvironmentalProperties.H"
-#   include "createFields.H"
-#   include "readPISOControls.H"
-#   include "initContinuityErrs.H"
-#   include "readTimeControls.H"
-#   include "setInitialDeltaT.H"
+    #include "createTime.H"
+    #include "createDynamicFvMesh.H"
+    #include "readCombustionProperties.H"
+    #include "readGravitationalAcceleration.H"
+    #include "createFields.H"
+    #include "readPISOControls.H"
+    #include "initContinuityErrs.H"
+    #include "readTimeControls.H"
+    #include "setInitialDeltaT.H"
 
-scalar StCoNum = 0.0;
+    scalar StCoNum = 0.0;
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
 
     while (runTime.run())
     {
-#       include "readTimeControls.H"
-#       include "readPISOControls.H"
-#       include "CourantNo.H"
+        #include "readTimeControls.H"
+        #include "readPISOControls.H"
+        #include "CourantNo.H"
 
-#       include "setDeltaT.H"
+        #include "setDeltaT.H"
 
         runTime++;
 
@@ -157,7 +157,7 @@ scalar StCoNum = 0.0;
 
 //        if (mesh.moving() || meshChanged)
 //        {
-//#           include "correctPhi.H"
+//            #include "correctPhi.H"
 //        }
 
             // Make the fluxes relative to the mesh motion
@@ -165,23 +165,23 @@ scalar StCoNum = 0.0;
         }
 
 
-#       include "rhoEqn.H"
-#       include "UEqn.H"
+        #include "rhoEqn.H"
+        #include "UEqn.H"
 
         // --- PISO loop
         for (int corr=1; corr<=nCorr; corr++)
         {
-#           include "bEqn.H"
-#           include "ftEqn.H"
-#           include "huEqn.H"
-#           include "hEqn.H"
+            #include "bEqn.H"
+            #include "ftEqn.H"
+            #include "huEqn.H"
+            #include "hEqn.H"
 
             if (!ign.ignited())
             {
                 hu == h;
             }
 
-#           include "pEqn.H"
+            #include "pEqn.H"
         }
 
         turbulence->correct();
diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C
index 13a464a755..4c544b433e 100644
--- a/applications/solvers/combustion/XiFoam/XiFoam.C
+++ b/applications/solvers/combustion/XiFoam/XiFoam.C
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "readCombustionProperties.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
     #include "readTimeControls.H"
diff --git a/applications/solvers/combustion/dieselEngineFoam/createSpray.H b/applications/solvers/combustion/dieselEngineFoam/createSpray.H
index 4bc1a32f11..ea4d0121b6 100644
--- a/applications/solvers/combustion/dieselEngineFoam/createSpray.H
+++ b/applications/solvers/combustion/dieselEngineFoam/createSpray.H
@@ -23,7 +23,7 @@ spray dieselSpray
     composition,
     gasProperties,
     thermo,
-    environmentalProperties
+    g
 );
 
 scalar gasMass0 = fvc::domainIntegrate(rho).value();
diff --git a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
index ba910bcf56..e6b68fed3f 100644
--- a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
+++ b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
     #include "createEngineTime.H"
     #include "createEngineMesh.H"
     #include "createFields.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "readCombustionProperties.H"
     #include "createSpray.H"
     #include "initContinuityErrs.H"
diff --git a/applications/solvers/combustion/dieselFoam/dieselFoam.C b/applications/solvers/combustion/dieselFoam/dieselFoam.C
index 11cd91a488..77b7713796 100644
--- a/applications/solvers/combustion/dieselFoam/dieselFoam.C
+++ b/applications/solvers/combustion/dieselFoam/dieselFoam.C
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "createFields.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "readCombustionProperties.H"
     #include "createSpray.H"
     #include "initContinuityErrs.H"
diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C
index 2a9e34e577..1aecd98887 100644
--- a/applications/solvers/combustion/reactingFoam/reactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "readChemistryProperties.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
     #include "readTimeControls.H"
diff --git a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
index 16f49a197f..58b338f430 100644
--- a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
+++ b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "readChemistryProperties.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
     #include "readTimeControls.H"
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
index a8ff183742..efe70a0708 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
     #include "readTimeControls.H"
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
index 63b938fa36..fbb5b6c5dc 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
 
diff --git a/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C b/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
index b5055812c4..fb6ad9571a 100644
--- a/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
+++ b/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
     #include "readTimeControls.H"
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
index 52f915bd7a..c3a453bc4e 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
 
diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
index c869eff899..491ce1a091 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "createRadiationModel.H"
     #include "initContinuityErrs.H"
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
index 7aa01dee79..1826a77217 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
@@ -4,6 +4,7 @@
     PtrList<volScalarField> KFluid(fluidRegions.size());
     PtrList<volVectorField> UFluid(fluidRegions.size());
     PtrList<surfaceScalarField> phiFluid(fluidRegions.size());
+    PtrList<uniformDimensionedVectorField> gFluid(fluidRegions.size());
     PtrList<compressible::turbulenceModel> turbulence(fluidRegions.size());
     PtrList<volScalarField> DpDtFluid(fluidRegions.size());
 
@@ -95,6 +96,23 @@
             )
         );
 
+        Info<< "    Adding to gFluid\n" << endl;
+        gFluid.set
+        (
+            i,
+            new uniformDimensionedVectorField
+            (
+                IOobject
+                (
+                    "g",
+                    runTime.constant(),
+                    fluidRegions[i],
+                    IOobject::MUST_READ,
+                    IOobject::NO_WRITE
+                )
+            )
+        );
+
         Info<< "    Adding to turbulence\n" << endl;
         turbulence.set
         (
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidMeshes.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidMeshes.H
index aec08349ec..30a2e1089f 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidMeshes.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidMeshes.H
@@ -19,27 +19,4 @@
                 )
             )
         );
-
-        // Force calculation of geometric properties to prevent it being done
-        // later in e.g. some boundary evaluation
-        //(void)fluidRegions[i].weights();
-        //(void)fluidRegions[i].deltaCoeffs();
-
-        // Attach environmental properties to each region
-        autoPtr<IOdictionary> environmentalProperties
-        (
-            new IOdictionary
-            (
-                IOobject
-                (
-                    "environmentalProperties",
-                    runTime.constant(),
-                    fluidRegions[i],
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
-                )
-            )
-        );
-
-        environmentalProperties.ptr()->store();
     }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
index 29aea04466..50a3011484 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
@@ -5,6 +5,8 @@
     volScalarField& K = KFluid[i];
     volVectorField& U = UFluid[i];
     surfaceScalarField& phi = phiFluid[i];
+    const dimensionedVector& g = gFluid[i];
+
     compressible::turbulenceModel& turb = turbulence[i];
     volScalarField& DpDt = DpDtFluid[i];
 
@@ -13,9 +15,3 @@
     volScalarField& h = thermo.h();
 
     const dimensionedScalar massIni("massIni", dimMass, initialMassFluid[i]);
-
-    const dictionary& environmentalProperties =
-        fluidRegions[i].lookupObject<IOdictionary>
-        ("environmentalProperties");
-
-    const dimensionedVector g(environmentalProperties.lookup("g"));
diff --git a/applications/solvers/incompressible/shallowWaterFoam/readEnvironmentalProperties.H b/applications/solvers/incompressible/shallowWaterFoam/readGravitationalAcceleration.H
similarity index 50%
rename from applications/solvers/incompressible/shallowWaterFoam/readEnvironmentalProperties.H
rename to applications/solvers/incompressible/shallowWaterFoam/readGravitationalAcceleration.H
index 866335eef1..d609c18614 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/readEnvironmentalProperties.H
+++ b/applications/solvers/incompressible/shallowWaterFoam/readGravitationalAcceleration.H
@@ -1,10 +1,10 @@
-Info<< "\nReading environmentalProperties" << endl;
+Info<< "\nReading gravitationalProperties" << endl;
 
-IOdictionary environmentalProperties
+IOdictionary gravitationalProperties
 (
     IOobject
     (
-        "environmentalProperties",
+        "gravitationalProperties",
         runTime.constant(),
         mesh,
         IOobject::MUST_READ,
@@ -12,10 +12,10 @@ IOdictionary environmentalProperties
     )
 );
 
-const dimensionedVector g(environmentalProperties.lookup("g"));
-const Switch rotating(environmentalProperties.lookup("rotating"));
+const dimensionedVector g(gravitationalProperties.lookup("g"));
+const Switch rotating(gravitationalProperties.lookup("rotating"));
 const dimensionedVector Omega =
-    rotating ? environmentalProperties.lookup("Omega")
+    rotating ? gravitationalProperties.lookup("Omega")
              : dimensionedVector("Omega", -dimTime, vector(0,0,0));
 const dimensionedScalar magg = mag(g);
 const dimensionedVector gHat = g/magg;
diff --git a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
index 162d81ddaa..3fb6dee9fc 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
+++ b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
index 0791c2e358..8f0607bafa 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
+++ b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "readChemistryProperties.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "createClouds.H"
     #include "createRadiationModel.H"
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
index 760627de80..a18e177581 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "readChemistryProperties.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "createRadiationModel.H"
     #include "createClouds.H"
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
index 8c26cb6528..4b4015c990 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
+++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "readChemistryProperties.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "createClouds.H"
     #include "createRadiationModel.H"
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
index 2039346411..98ec825db4 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "compressibleCourantNo.H"
 
diff --git a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C b/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
index af6de6def0..e544c6e30b 100644
--- a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
+++ b/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
 
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
 
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C b/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
index 176900f0c6..afe1114d22 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "readControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
index ff5a669123..1ab9361f0b 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "readControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
diff --git a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
index 466333ff30..d353012e48 100644
--- a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
+++ b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "readPISOControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C
index b111351c39..c752b300e1 100644
--- a/applications/solvers/multiphase/interFoam/interFoam.C
+++ b/applications/solvers/multiphase/interFoam/interFoam.C
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "readPISOControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
index d50dcc0b0e..d08eec4159 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "readPISOControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
index b6968ca1a1..e2c9c643a6 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "readPISOControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
diff --git a/applications/solvers/multiphase/settlingFoam/settlingFoam.C b/applications/solvers/multiphase/settlingFoam/settlingFoam.C
index e68ddbb0f0..942ed729be 100644
--- a/applications/solvers/multiphase/settlingFoam/settlingFoam.C
+++ b/applications/solvers/multiphase/settlingFoam/settlingFoam.C
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
 
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
 
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
index 63991f149e..f7ebe5f721 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "readPIMPLEControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
index a28d929578..05888429bf 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
 
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "readPPProperties.H"
     #include "initContinuityErrs.H"
diff --git a/src/finiteVolume/cfdTools/general/include/fvCFD.H b/src/finiteVolume/cfdTools/general/include/fvCFD.H
index 4c89356452..95f566bb1b 100644
--- a/src/finiteVolume/cfdTools/general/include/fvCFD.H
+++ b/src/finiteVolume/cfdTools/general/include/fvCFD.H
@@ -9,6 +9,7 @@
 #include "fvMatrices.H"
 #include "fvm.H"
 #include "linear.H"
+#include "uniformDimensionedFields.H"
 #include "calculatedFvPatchFields.H"
 #include "fixedValueFvPatchFields.H"
 #include "adjustPhi.H"
diff --git a/src/finiteVolume/cfdTools/general/include/readEnvironmentalProperties.H b/src/finiteVolume/cfdTools/general/include/readEnvironmentalProperties.H
deleted file mode 100644
index 7f99d0153f..0000000000
--- a/src/finiteVolume/cfdTools/general/include/readEnvironmentalProperties.H
+++ /dev/null
@@ -1,15 +0,0 @@
-    Info << "\nReading environmentalProperties" << endl;
-
-    IOdictionary environmentalProperties
-    (
-        IOobject
-        (
-            "environmentalProperties",
-            runTime.constant(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE
-        )
-    );
-
-    dimensionedVector g(environmentalProperties.lookup("g"));
diff --git a/src/finiteVolume/cfdTools/general/include/readGravitationalAcceleration.H b/src/finiteVolume/cfdTools/general/include/readGravitationalAcceleration.H
new file mode 100644
index 0000000000..2389d0bd2b
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/include/readGravitationalAcceleration.H
@@ -0,0 +1,12 @@
+    Info << "\nReading g" << endl;
+    uniformDimensionedVectorField g
+    (
+        IOobject
+        (
+            "g",
+            runTime.constant(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        )
+    );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C
index cafc55aa3a..12544a105f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C
@@ -28,6 +28,7 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
+#include "uniformDimensionedFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -110,10 +111,8 @@ void buoyantPressureFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    const dictionary& environmentalProperties
-        = db().lookupObject<IOdictionary>("environmentalProperties");
-
-    dimensionedVector g(environmentalProperties.lookup("g"));
+    const uniformDimensionedVectorField& g =
+        db().lookupObject<uniformDimensionedVectorField>("g");
 
     const fvPatchField<scalar>& rho =
         patch().lookupPatchField<volScalarField, scalar>(rhoName_);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
index dfda8caf52..f47606f86e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
@@ -29,7 +29,7 @@ License
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
 #include "surfaceFields.H"
-
+#include "uniformDimensionedFields.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -126,10 +126,8 @@ void Foam::uniformDensityHydrostaticPressureFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    const dictionary& environmentalProperties
-        = db().lookupObject<IOdictionary>("environmentalProperties");
-
-    dimensionedVector g(environmentalProperties.lookup("g"));
+    const uniformDimensionedVectorField& g =
+        db().lookupObject<uniformDimensionedVectorField>("g");
 
     operator==
     (
diff --git a/src/lagrangian/dieselSpray/spray/spray.C b/src/lagrangian/dieselSpray/spray/spray.C
index 07dbcdbe7e..b6ab574d1d 100644
--- a/src/lagrangian/dieselSpray/spray/spray.C
+++ b/src/lagrangian/dieselSpray/spray/spray.C
@@ -59,7 +59,7 @@ Foam::spray::spray
     const basicMultiComponentMixture& composition,
     const PtrList<gasThermoPhysics>& gasProperties,
     const dictionary&,
-    const dictionary& environmentalProperties
+    const dimensionedVector& g
 )
 :
     Cloud<parcel>(U.mesh(), false), // suppress className checking on positions
@@ -181,7 +181,7 @@ Foam::spray::spray
     ),
 
     subCycles_(readLabel(sprayProperties_.lookup("subCycles"))),
-    g_(dimensionedVector(environmentalProperties.lookup("g")).value()),
+    g_(g.value()),
 
     gasProperties_(gasProperties),
     composition_(composition),
@@ -266,7 +266,7 @@ Foam::spray::spray
                 "const volScalarField& T, const combustionMixture& composition,"
                 "const PtrList<gasThermoPhsyics>& gaseousFuelProperties, "
                 "const dictionary& thermophysicalProperties, "
-                "const dictionary& environmentalProperties)"
+                "const dimensionedScalar& g)"
             )   << "spray::(...) only one wedgePolyPatch found. "
                    "Please check you BC-setup."
                 << abort(FatalError);
diff --git a/src/lagrangian/dieselSpray/spray/spray.H b/src/lagrangian/dieselSpray/spray/spray.H
index 044423fc75..27ec6a43ec 100644
--- a/src/lagrangian/dieselSpray/spray/spray.H
+++ b/src/lagrangian/dieselSpray/spray/spray.H
@@ -122,7 +122,7 @@ class spray
 
 
         //- Acceleration due to gravity
-        vector g_;
+        const vector& g_;
 
 
         // Composition properties
@@ -195,7 +195,7 @@ public:
             const basicMultiComponentMixture& composition,
             const PtrList<gasThermoPhysics>& gasProperties,
             const dictionary& thermophysicalProperties,
-            const dictionary& environmentalProperties
+            const dimensionedVector& g
         );
 
 
diff --git a/src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C b/src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
index c158c8b2ba..6c73d638f8 100644
--- a/src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
+++ b/src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
@@ -29,6 +29,7 @@ License
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
 #include "surfaceFields.H"
+#include "uniformDimensionedFields.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -140,10 +141,8 @@ void Foam::alphaFixedPressureFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    const dictionary& environmentalProperties
-        = db().lookupObject<IOdictionary>("environmentalProperties");
-
-    dimensionedVector g(environmentalProperties.lookup("g"));
+    const uniformDimensionedVectorField& g =
+        db().lookupObject<uniformDimensionedVectorField>("g");
 
     const fvPatchField<scalar>& rho =
         patch().lookupPatchField<volScalarField, scalar>("rho");
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/environmentalProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/environmentalProperties
deleted file mode 100644
index a866ff549f..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/environmentalProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/g
similarity index 90%
rename from tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/environmentalProperties
rename to tutorials/combustion/XiFoam/les/pitzDaily/constant/g
index 1f0ea06a3c..22bddf9891 100644
--- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/environmentalProperties
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/g
@@ -11,10 +11,12 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [0 1 -2 0 0 0 0] (0 0 0);
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/environmentalProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g
similarity index 90%
rename from tutorials/combustion/XiFoam/les/pitzDaily3D/constant/environmentalProperties
rename to tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g
index ce7f648b7f..e6c990ee7a 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/environmentalProperties
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g
@@ -11,11 +11,12 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 0 );
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 0 );
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/environmentalProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/g
similarity index 90%
rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/environmentalProperties
rename to tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/g
index 645c9af099..c86cc8bb1f 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/environmentalProperties
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/g
@@ -11,11 +11,12 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 0 );
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 0 );
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/environmentalProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/g
similarity index 90%
rename from tutorials/multiphase/twoPhaseEulerFoam/bed/constant/environmentalProperties
rename to tutorials/combustion/dieselFoam/aachenBomb/constant/g
index d1abb1921f..71a0e64789 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/environmentalProperties
+++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/g
@@ -11,11 +11,12 @@ FoamFile
     format      binary;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [ 0 1 -2 0 0 ] ( 0 0 -9.81 );
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
 
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/environmentalProperties b/tutorials/combustion/engineFoam/kivaTest/constant/g
similarity index 90%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/environmentalProperties
rename to tutorials/combustion/engineFoam/kivaTest/constant/g
index 645c9af099..c86cc8bb1f 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/environmentalProperties
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/g
@@ -11,11 +11,12 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 0 );
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 0 );
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/environmentalProperties b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/environmentalProperties
deleted file mode 100644
index a866ff549f..0000000000
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/environmentalProperties b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/g
similarity index 90%
rename from tutorials/combustion/engineFoam/kivaTest/constant/environmentalProperties
rename to tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/g
index 645c9af099..22bddf9891 100644
--- a/tutorials/combustion/engineFoam/kivaTest/constant/environmentalProperties
+++ b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/g
@@ -11,11 +11,12 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 0 );
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/environmentalProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/environmentalProperties
deleted file mode 100644
index a866ff549f..0000000000
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g
new file mode 100644
index 0000000000..22bddf9891
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/environmentalProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/g
similarity index 90%
rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/environmentalProperties
rename to tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/g
index 8ecb2a4402..4f39592714 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/environmentalProperties
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/g
@@ -11,10 +11,11 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [0 1 -2 0 0 0 0] (0 0 -9.81);
+dimensions      [0 1 -2 0 0 0 0];
+value           (0 0 -9.81);
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/environmentalProperties b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/environmentalProperties
deleted file mode 100644
index a866ff549f..0000000000
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/g b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/g
new file mode 100644
index 0000000000..22bddf9891
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/environmentalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/environmentalProperties
deleted file mode 100644
index a866ff549f..0000000000
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/g b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/g
new file mode 100644
index 0000000000..22bddf9891
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/environmentalProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/environmentalProperties
deleted file mode 100644
index 639bd90b06..0000000000
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/g b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/g
new file mode 100644
index 0000000000..427e0d5515
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/environmentalProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/environmentalProperties
deleted file mode 100644
index 639bd90b06..0000000000
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/g b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/g
new file mode 100644
index 0000000000..427e0d5515
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/environmentalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/environmentalProperties
deleted file mode 100644
index 03e0adce89..0000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/environmentalProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [0 1 -2 0 0 0 0] (0 -9.81 0);
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g
new file mode 100644
index 0000000000..4c5b83c843
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           (0 -9.81 0);
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/environmentalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/environmentalProperties
deleted file mode 120000
index 9cb87f2395..0000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/environmentalProperties
+++ /dev/null
@@ -1 +0,0 @@
-../bottomAir/environmentalProperties
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/g b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/g
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/constant/environmentalProperties b/tutorials/incompressible/shallowWaterFoam/squareBump/constant/g
similarity index 84%
rename from tutorials/incompressible/shallowWaterFoam/squareBump/constant/environmentalProperties
rename to tutorials/incompressible/shallowWaterFoam/squareBump/constant/g
index 8188039832..0125923f1e 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/constant/environmentalProperties
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/constant/g
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,11 +10,12 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [0 1 -2 0 0 0 0] (0 0 -9.81);
+dimensions      [0 1 -2 0 0 0 0];
+value           (0 0 -9.81);
 rotating true;
 Omega        Omega       [0 0 -1 0 0]  (0 0 7.292e-5);
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/environmentalProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g
similarity index 90%
rename from tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/environmentalProperties
rename to tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g
index e5124f2452..c9406d1b60 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/environmentalProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g
@@ -11,11 +11,12 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 0 );
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/environmentalProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/g
similarity index 90%
rename from tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/environmentalProperties
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/g
index e5124f2452..6d92743032 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/environmentalProperties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/g
@@ -11,11 +11,12 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 0 );
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 0 );
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/environmentalProperties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/g
similarity index 89%
rename from tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/environmentalProperties
rename to tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/g
index 4baaea2a25..6d92743032 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/environmentalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/g
@@ -11,11 +11,12 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 0 );
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C
index 77715fd48c..b20e73b487 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
 
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "createClouds.H"
     #include "readPISOControls.H"
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/environmentalProperties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/environmentalProperties
deleted file mode 100644
index a866ff549f..0000000000
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/g b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/g
new file mode 100644
index 0000000000..22bddf9891
--- /dev/null
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/environmentalProperties b/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/environmentalProperties
deleted file mode 100644
index 03e0adce89..0000000000
--- a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/environmentalProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [0 1 -2 0 0 0 0] (0 -9.81 0);
-
-// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/g b/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/g
new file mode 100644
index 0000000000..4c5b83c843
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/g
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           (0 -9.81 0);
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/environmentalProperties b/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/environmentalProperties
deleted file mode 120000
index 9cb87f2395..0000000000
--- a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/environmentalProperties
+++ /dev/null
@@ -1 +0,0 @@
-../bottomAir/environmentalProperties
\ No newline at end of file
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/g b/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/g
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/environmentalProperties b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/environmentalProperties
deleted file mode 100644
index a866ff549f..0000000000
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/g b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/g
new file mode 100644
index 0000000000..22bddf9891
--- /dev/null
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/environmentalProperties b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/g
similarity index 89%
rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/environmentalProperties
rename to tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/g
index 938322374a..5eec6f2b2e 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/environmentalProperties
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/g
@@ -11,11 +11,12 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/environmentalProperties b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/g
similarity index 89%
rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/environmentalProperties
rename to tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/g
index 938322374a..5eec6f2b2e 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/environmentalProperties
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/g
@@ -11,11 +11,12 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/environmentalProperties
deleted file mode 100644
index 639bd90b06..0000000000
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/g b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/g
new file mode 100644
index 0000000000..427e0d5515
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/g
similarity index 89%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/environmentalProperties
rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/g
index 9fd11e4ef2..c6d6aa8eef 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/environmentalProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/g
@@ -11,11 +11,12 @@ FoamFile
     format      ascii;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 -9.81 );
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/environmentalProperties
deleted file mode 100644
index 9fd11e4ef2..0000000000
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/g b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/g
new file mode 100644
index 0000000000..c6d6aa8eef
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/environmentalProperties
deleted file mode 100644
index 9fd11e4ef2..0000000000
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/g b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/g
new file mode 100644
index 0000000000..c6d6aa8eef
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/environmentalProperties
deleted file mode 100644
index 9fd11e4ef2..0000000000
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/g b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/g
new file mode 100644
index 0000000000..c6d6aa8eef
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/environmentalProperties
deleted file mode 100644
index 9fd11e4ef2..0000000000
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/g b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/g
new file mode 100644
index 0000000000..c6d6aa8eef
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/MRFInterFoam/MRFInterFoam.C b/tutorials/multiphase/interFoam/MRFInterFoam/MRFInterFoam/MRFInterFoam.C
index 9f1efad337..9daeb84554 100644
--- a/tutorials/multiphase/interFoam/MRFInterFoam/MRFInterFoam/MRFInterFoam.C
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/MRFInterFoam/MRFInterFoam.C
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
-    #include "readEnvironmentalProperties.H"
+    #include "readGravitationalAcceleration.H"
     #include "readPISOControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/g b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/g
new file mode 100644
index 0000000000..844d7a8378
--- /dev/null
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/g
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           (0 0 0);
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/environmentalProperties b/tutorials/multiphase/interFoam/laminar/damBreak/constant/environmentalProperties
deleted file mode 100644
index a866ff549f..0000000000
--- a/tutorials/multiphase/interFoam/laminar/damBreak/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/g b/tutorials/multiphase/interFoam/laminar/damBreak/constant/g
new file mode 100644
index 0000000000..22bddf9891
--- /dev/null
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/g b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/g
new file mode 100644
index 0000000000..c86cc8bb1f
--- /dev/null
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/environmentalProperties b/tutorials/multiphase/interFoam/ras/damBreak/constant/environmentalProperties
deleted file mode 100644
index a866ff549f..0000000000
--- a/tutorials/multiphase/interFoam/ras/damBreak/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/g b/tutorials/multiphase/interFoam/ras/damBreak/constant/g
new file mode 100644
index 0000000000..22bddf9891
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/damBreak/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/environmentalProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/environmentalProperties
deleted file mode 100644
index a866ff549f..0000000000
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g
new file mode 100644
index 0000000000..22bddf9891
--- /dev/null
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/environmentalProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/environmentalProperties
deleted file mode 100644
index a866ff549f..0000000000
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g
new file mode 100644
index 0000000000..22bddf9891
--- /dev/null
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/constant/environmentalProperties b/tutorials/multiphase/settlingFoam/ras/dahl/constant/environmentalProperties
deleted file mode 100644
index a866ff549f..0000000000
--- a/tutorials/multiphase/settlingFoam/ras/dahl/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/constant/g b/tutorials/multiphase/settlingFoam/ras/dahl/constant/g
new file mode 100644
index 0000000000..22bddf9891
--- /dev/null
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/constant/environmentalProperties b/tutorials/multiphase/settlingFoam/ras/tank3D/constant/environmentalProperties
deleted file mode 100644
index 938322374a..0000000000
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/constant/g b/tutorials/multiphase/settlingFoam/ras/tank3D/constant/g
new file mode 100644
index 0000000000..5eec6f2b2e
--- /dev/null
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/environmentalProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/g
similarity index 90%
rename from tutorials/combustion/dieselFoam/aachenBomb/constant/environmentalProperties
rename to tutorials/multiphase/twoPhaseEulerFoam/bed/constant/g
index b5ad4b1cfd..03586845f3 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/constant/environmentalProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/g
@@ -11,11 +11,12 @@ FoamFile
     format      binary;
     class       dictionary;
     location    "constant";
-    object      environmentalProperties;
+    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 -9.81 );
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/environmentalProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/environmentalProperties
deleted file mode 100644
index 6a8eb74fb8..0000000000
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/g
new file mode 100644
index 0000000000..22bddf9891
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/environmentalProperties b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/environmentalProperties
deleted file mode 100644
index a866ff549f..0000000000
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/g
new file mode 100644
index 0000000000..22bddf9891
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 -9.81 0 );
+
+
+// ************************************************************************* //

From f4d7096d45dffd0d8dc9a7b3ccbb9e1ae9bf2c39 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Wed, 8 Jul 2009 17:20:06 +0100
Subject: [PATCH 52/84] Don't initialise U; unnecessary edit.

---
 .../interFoam/MRFInterFoam/mixerVessel2D/system/setFieldsDict | 1 -
 .../interFoam/laminar/damBreak/constant/polyMesh/boundary     | 4 ++--
 .../interFoam/laminar/damBreak/system/setFieldsDict           | 1 -
 .../multiphase/interFoam/ras/damBreak/system/setFieldsDict    | 1 -
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/setFieldsDict b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/setFieldsDict
index 2de344506d..fed2eb2f6e 100644
--- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/setFieldsDict
@@ -18,7 +18,6 @@ FoamFile
 defaultFieldValues
 (
     volScalarFieldValue alpha1 0
-    volVectorFieldValue U (0 0 0)
 );
 
 regions
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/polyMesh/boundary b/tutorials/multiphase/interFoam/laminar/damBreak/constant/polyMesh/boundary
index 3a6342293a..41c06d5f3f 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/constant/polyMesh/boundary
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict
index d719028fc5..cd4857c7eb 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/setFieldsDict
@@ -18,7 +18,6 @@ FoamFile
 defaultFieldValues
 (
     volScalarFieldValue alpha1 0
-    volVectorFieldValue U (0 0 0)
 );
 
 regions
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict b/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict
index d719028fc5..cd4857c7eb 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict
@@ -18,7 +18,6 @@ FoamFile
 defaultFieldValues
 (
     volScalarFieldValue alpha1 0
-    volVectorFieldValue U (0 0 0)
 );
 
 regions

From cd3b5808dfe1197287fe8a15bac17bf9a560cc54 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Wed, 8 Jul 2009 22:45:05 +0100
Subject: [PATCH 53/84] Corrected class.

---
 tutorials/combustion/XiFoam/les/pitzDaily/constant/g            | 2 +-
 tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g          | 2 +-
 tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/g | 2 +-
 tutorials/combustion/dieselFoam/aachenBomb/constant/g           | 2 +-
 tutorials/combustion/engineFoam/kivaTest/constant/g             | 2 +-
 .../heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/g   | 2 +-
 .../heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g | 2 +-
 .../buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/g     | 2 +-
 tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/g       | 2 +-
 tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/g     | 2 +-
 .../buoyantSimpleRadiationFoam/hotRadiationRoom/constant/g      | 2 +-
 .../buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/g | 2 +-
 .../chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g   | 2 +-
 tutorials/incompressible/shallowWaterFoam/squareBump/constant/g | 2 +-
 .../lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g     | 2 +-
 .../porousExplicitSourceReactingParcelFoam/filter/constant/g    | 2 +-
 .../lagrangian/reactingParcelFoam/evaporationTest/constant/g    | 2 +-
 .../lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/g | 2 +-
 .../mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/g     | 2 +-
 tutorials/multiphase/bubbleFoam/bubbleColumn/constant/g         | 2 +-
 .../compressibleInterFoam/les/depthCharge2D/constant/g          | 2 +-
 .../compressibleInterFoam/les/depthCharge3D/constant/g          | 2 +-
 .../multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/g | 2 +-
 tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/g | 2 +-
 .../multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/g   | 2 +-
 tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/g | 2 +-
 .../multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/g   | 2 +-
 .../multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/g   | 2 +-
 .../multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/g  | 2 +-
 tutorials/multiphase/interFoam/laminar/damBreak/constant/g      | 2 +-
 tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/g      | 2 +-
 tutorials/multiphase/interFoam/ras/damBreak/constant/g          | 2 +-
 .../multiphaseInterFoam/laminar/damBreak4phase/constant/g       | 2 +-
 .../multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g   | 2 +-
 tutorials/multiphase/settlingFoam/ras/dahl/constant/g           | 2 +-
 tutorials/multiphase/settlingFoam/ras/tank3D/constant/g         | 2 +-
 tutorials/multiphase/twoPhaseEulerFoam/bed/constant/g           | 2 +-
 tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/g          | 2 +-
 tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/g  | 2 +-
 39 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/g b/tutorials/combustion/XiFoam/les/pitzDaily/constant/g
index 22bddf9891..2b77c937a2 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/g
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g
index e6c990ee7a..057403310a 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/g b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/g
index c86cc8bb1f..ebc338b6f9 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/g
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/g b/tutorials/combustion/dieselFoam/aachenBomb/constant/g
index 71a0e64789..8978a89abf 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/constant/g
+++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      binary;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/g b/tutorials/combustion/engineFoam/kivaTest/constant/g
index c86cc8bb1f..ebc338b6f9 100644
--- a/tutorials/combustion/engineFoam/kivaTest/constant/g
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/g b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/g
index 22bddf9891..2b77c937a2 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/g
+++ b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g
index 22bddf9891..2b77c937a2 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/g b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/g
index 4f39592714..772688943e 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/g
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/g b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/g
index 22bddf9891..2b77c937a2 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/g
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/g b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/g
index 22bddf9891..2b77c937a2 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/g
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/g b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/g
index 427e0d5515..52301bd399 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/g
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/g b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/g
index 427e0d5515..52301bd399 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/g
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g
index 4c5b83c843..4cada4ce7a 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/constant/g b/tutorials/incompressible/shallowWaterFoam/squareBump/constant/g
index 0125923f1e..5f7711c728 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/constant/g
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g
index c9406d1b60..2a85082e8b 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/g b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/g
index 6d92743032..bdd1817328 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/g
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/g b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/g
index 6d92743032..bdd1817328 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/g
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/g b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/g
index 22bddf9891..2b77c937a2 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/g
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/g b/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/g
index 4c5b83c843..4cada4ce7a 100644
--- a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/g
+++ b/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/g b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/g
index 22bddf9891..2b77c937a2 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/g
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/g b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/g
index 5eec6f2b2e..e0ac2653b5 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/g
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/g b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/g
index 5eec6f2b2e..e0ac2653b5 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/g
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/g b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/g
index 427e0d5515..52301bd399 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/g
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/g b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/g
index c6d6aa8eef..897615a50d 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/g
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/g b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/g
index c6d6aa8eef..897615a50d 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/g
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/g b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/g
index c6d6aa8eef..897615a50d 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/g
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/g b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/g
index c6d6aa8eef..897615a50d 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/g
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/g b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/g
index c6d6aa8eef..897615a50d 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/g
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/g b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/g
index 844d7a8378..7b4411955d 100644
--- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/g
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/g b/tutorials/multiphase/interFoam/laminar/damBreak/constant/g
index 22bddf9891..2b77c937a2 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/constant/g
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/g b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/g
index c86cc8bb1f..ebc338b6f9 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/g
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/g b/tutorials/multiphase/interFoam/ras/damBreak/constant/g
index 22bddf9891..2b77c937a2 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/constant/g
+++ b/tutorials/multiphase/interFoam/ras/damBreak/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g
index 22bddf9891..2b77c937a2 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g
index 22bddf9891..2b77c937a2 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/constant/g b/tutorials/multiphase/settlingFoam/ras/dahl/constant/g
index 22bddf9891..2b77c937a2 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/constant/g
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/constant/g b/tutorials/multiphase/settlingFoam/ras/tank3D/constant/g
index 5eec6f2b2e..e0ac2653b5 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/constant/g
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/g
index 03586845f3..8b2810b651 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      binary;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/g
index 22bddf9891..2b77c937a2 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/g
index 22bddf9891..2b77c937a2 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/g
@@ -9,7 +9,7 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       dictionary;
+    class       uniformDimensionedVectorField;
     location    "constant";
     object      g;
 }

From fda6bcbc0cc2df41ea07b9164c9673637c40e60c Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Wed, 8 Jul 2009 22:45:21 +0100
Subject: [PATCH 54/84] Minor correction to comments.

---
 .../fields/UniformDimensionedFields/UniformDimensionedField.H   | 2 +-
 .../fields/UniformDimensionedFields/uniformDimensionedFields.H  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H
index 2d3ff83144..1793a67c6f 100644
--- a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H
+++ b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H
@@ -60,7 +60,7 @@ class UniformDimensionedField
 public:
 
     //- Runtime type information
-    TypeName("DimensionedType");
+    TypeName("UniformDimensionedField");
 
 
     // Constructors
diff --git a/src/OpenFOAM/fields/UniformDimensionedFields/uniformDimensionedFields.H b/src/OpenFOAM/fields/UniformDimensionedFields/uniformDimensionedFields.H
index a59298e8d7..c84b153574 100644
--- a/src/OpenFOAM/fields/UniformDimensionedFields/uniformDimensionedFields.H
+++ b/src/OpenFOAM/fields/UniformDimensionedFields/uniformDimensionedFields.H
@@ -28,7 +28,7 @@ InClass
 Description
 
 SourceFiles
-    UniformDimensionedFields.C
+    uniformDimensionedFields.C
 
 \*---------------------------------------------------------------------------*/
 

From 3a37e1a0536c41a4ad68be2063dd88d988f9f3f4 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Thu, 9 Jul 2009 11:55:40 +0100
Subject: [PATCH 55/84] pass through readFields

---
 src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C
index 04ae825df5..fa2e239304 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C
@@ -37,7 +37,7 @@ Foam::molecule::molecule
     bool readFields
 )
 :
-    Particle<molecule>(cloud, is, true),
+    Particle<molecule>(cloud, is, readFields),
     Q_(tensor::zero),
     v_(vector::zero),
     a_(vector::zero),

From 4c13ef589b6831dfc8cbe4510b91a6cf00b0485b Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Thu, 9 Jul 2009 11:57:21 +0100
Subject: [PATCH 56/84] faceZone checking. wip

---
 .../utilities/mesh/manipulation/checkMesh/checkTopology.C  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
index 9ce34cda1c..fa51928f99 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
@@ -67,8 +67,13 @@ Foam::label Foam::checkTopology
     {
         forAll(mesh.faceZones(), zoneI)
         {
-            if (mesh.faceZones()[zoneI].checkParallelSync(true))
+            if (mesh.faceZones()[zoneI].checkParallelSync(false))
             {
+                Info<< " ***FaceZone " << mesh.faceZones()[zoneI].name()
+                    << " is not correctly synchronised"
+                    << " acrosss coupled boundaries."
+                    << " (coupled faces both"
+                    << " present in set but with opposite flipmap)" << endl;
                 noFailedChecks++;
             }
         }

From 990b54a3d3243a08bbbdf2bbd4169f022d347065 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Thu, 9 Jul 2009 12:43:40 +0100
Subject: [PATCH 57/84] new bc

---
 src/finiteVolume/Make/files                   |   1 +
 .../activeBaffleVelocityFvPatchVectorField.C  | 274 ++++++++++++++++++
 .../activeBaffleVelocityFvPatchVectorField.H  | 193 ++++++++++++
 3 files changed, 468 insertions(+)
 create mode 100644 src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
 create mode 100644 src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.H

diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 54bfbc7cf6..6be4b7f3f4 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -104,6 +104,7 @@ $(constraintFvPatchFields)/wedge/wedgeFvPatchFields.C
 $(constraintFvPatchFields)/wedge/wedgeFvPatchScalarField.C
 
 derivedFvPatchFields = $(fvPatchFields)/derived
+$(derivedFvPatchFields)/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
 $(derivedFvPatchFields)/advective/advectiveFvPatchFields.C
 $(derivedFvPatchFields)/directMappedFixedValue/directMappedFixedValueFvPatchFields.C
 $(derivedFvPatchFields)/directMappedVelocityFluxFixedValue/directMappedVelocityFluxFixedValueFvPatchField.C
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
new file mode 100644
index 0000000000..c090d52968
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
@@ -0,0 +1,274 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "activeBaffleVelocityFvPatchVectorField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "volFields.H"
+#include "surfaceFields.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::activeBaffleVelocityFvPatchVectorField::
+activeBaffleVelocityFvPatchVectorField
+(
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF
+)
+:
+    fixedValueFvPatchVectorField(p, iF),
+    pName_("p"),
+    cyclicPatchName_(),
+    cyclicPatchLabel_(-1),
+    orientation_(1),
+    initWallSf_(0),
+    initCyclicSf_(0),
+    openFraction_(0),
+    openingTime_(0),
+    maxOpenFractionDelta_(0),
+    curTimeIndex_(-1)
+{}
+
+
+Foam::activeBaffleVelocityFvPatchVectorField::
+activeBaffleVelocityFvPatchVectorField
+(
+    const activeBaffleVelocityFvPatchVectorField& ptf,
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchVectorField(ptf, p, iF, mapper),
+    pName_(ptf.pName_),
+    cyclicPatchName_(ptf.cyclicPatchName_),
+    cyclicPatchLabel_(ptf.cyclicPatchLabel_),
+    orientation_(ptf.orientation_),
+    initWallSf_(ptf.initWallSf_),
+    initCyclicSf_(ptf.initCyclicSf_),
+    openFraction_(ptf.openFraction_),
+    openingTime_(ptf.openingTime_),
+    maxOpenFractionDelta_(ptf.maxOpenFractionDelta_),
+    curTimeIndex_(-1)
+{}
+
+
+Foam::activeBaffleVelocityFvPatchVectorField::
+activeBaffleVelocityFvPatchVectorField
+(
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchVectorField(p, iF),
+    pName_("p"),
+    cyclicPatchName_(dict.lookup("cyclicPatch")),
+    cyclicPatchLabel_(p.patch().boundaryMesh().findPatchID(cyclicPatchName_)),
+    orientation_(readLabel(dict.lookup("orientation"))),
+    initWallSf_(p.Sf()),
+    initCyclicSf_(p.boundaryMesh()[cyclicPatchLabel_].Sf()),
+    openFraction_(readScalar(dict.lookup("openFraction"))),
+    openingTime_(readScalar(dict.lookup("openingTime"))),
+    maxOpenFractionDelta_(readScalar(dict.lookup("maxOpenFractionDelta"))),
+    curTimeIndex_(-1)
+{
+    fvPatchVectorField::operator=(vector::zero);
+
+    if (dict.found("p"))
+    {
+        dict.lookup("p") >> pName_;
+    }
+}
+
+
+Foam::activeBaffleVelocityFvPatchVectorField::
+activeBaffleVelocityFvPatchVectorField
+(
+    const activeBaffleVelocityFvPatchVectorField& ptf
+)
+:
+    fixedValueFvPatchVectorField(ptf),
+    pName_(ptf.pName_),
+    cyclicPatchName_(ptf.cyclicPatchName_),
+    cyclicPatchLabel_(ptf.cyclicPatchLabel_),
+    orientation_(ptf.orientation_),
+    initWallSf_(ptf.initWallSf_),
+    initCyclicSf_(ptf.initCyclicSf_),
+    openFraction_(ptf.openFraction_),
+    openingTime_(ptf.openingTime_),
+    maxOpenFractionDelta_(ptf.maxOpenFractionDelta_),
+    curTimeIndex_(-1)
+{}
+
+
+Foam::activeBaffleVelocityFvPatchVectorField::
+activeBaffleVelocityFvPatchVectorField
+(
+    const activeBaffleVelocityFvPatchVectorField& ptf,
+    const DimensionedField<vector, volMesh>& iF
+)
+:
+    fixedValueFvPatchVectorField(ptf, iF),
+    pName_(ptf.pName_),
+    cyclicPatchName_(ptf.cyclicPatchName_),
+    cyclicPatchLabel_(ptf.cyclicPatchLabel_),
+    orientation_(ptf.orientation_),
+    initWallSf_(ptf.initWallSf_),
+    initCyclicSf_(ptf.initCyclicSf_),
+    openFraction_(ptf.openFraction_),
+    openingTime_(ptf.openingTime_),
+    maxOpenFractionDelta_(ptf.maxOpenFractionDelta_),
+    curTimeIndex_(-1)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::activeBaffleVelocityFvPatchVectorField::autoMap
+(
+    const fvPatchFieldMapper& m
+)
+{
+    fixedValueFvPatchVectorField::autoMap(m);
+
+    //- Note: cannot map field from cyclic patch anyway so just recalculate
+    //  Areas should be consistent when doing autoMap except in case of
+    //  topo changes.
+    initWallSf_ = patch().Sf();
+    initCyclicSf_ = patch().boundaryMesh()[cyclicPatchLabel_].Sf();
+}
+
+void Foam::activeBaffleVelocityFvPatchVectorField::rmap
+(
+    const fvPatchVectorField& ptf,
+    const labelList& addr
+)
+{
+    fixedValueFvPatchVectorField::rmap(ptf, addr);
+
+    //- Note: cannot map field from cyclic patch anyway so just recalculate
+    //  Areas should be consistent when doing rmap (mainly reconstructPar)
+    initWallSf_ = patch().Sf();
+    initCyclicSf_ = patch().boundaryMesh()[cyclicPatchLabel_].Sf();
+}
+
+
+void Foam::activeBaffleVelocityFvPatchVectorField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    // Execute the change to the openFraction only once per time-step
+    if (curTimeIndex_ != this->db().time().timeIndex())
+    {
+        const volScalarField& p = db().lookupObject<volScalarField>
+        (
+            pName_
+        );
+
+        const fvPatch& cyclicPatch = patch().boundaryMesh()[cyclicPatchLabel_];
+        const labelList& cyclicFaceCells = cyclicPatch.patch().faceCells();
+        label nCyclicFaces = cyclicFaceCells.size();
+        label nCyclicFacesPerSide = nCyclicFaces/2;
+
+        scalar forceDiff = 0;
+
+        for (label facei=0; facei<nCyclicFacesPerSide; facei++)
+        {
+            forceDiff += p[cyclicFaceCells[facei]]*mag(initCyclicSf_[facei]);
+        }
+
+        for (label facei=nCyclicFacesPerSide; facei<nCyclicFaces; facei++)
+        {
+            forceDiff -= p[cyclicFaceCells[facei]]*mag(initCyclicSf_[facei]);
+        }
+
+        openFraction_ =
+            max(min(
+                openFraction_
+              + max
+                (
+                    this->db().time().deltaT().value()/openingTime_,
+                    maxOpenFractionDelta_
+                )
+               *(orientation_*sign(forceDiff)),
+              1 - 1e-6), 1e-6);
+
+        Info<< "openFraction = " << openFraction_ << endl;
+
+        vectorField::subField Sfw = patch().patch().faceAreas();
+        vectorField newSfw = (1 - openFraction_)*initWallSf_;
+        forAll(Sfw, facei)
+        {
+            Sfw[facei] = newSfw[facei];
+        }
+        const_cast<scalarField&>(patch().magSf()) = mag(patch().Sf());
+
+        const_cast<vectorField&>(cyclicPatch.Sf()) =
+            openFraction_*initCyclicSf_;
+        const_cast<scalarField&>(cyclicPatch.magSf()) =
+            mag(cyclicPatch.Sf());
+
+        curTimeIndex_ = this->db().time().timeIndex();
+    }
+
+    fixedValueFvPatchVectorField::updateCoeffs();
+}
+
+
+void Foam::activeBaffleVelocityFvPatchVectorField::write(Ostream& os) const
+{
+    fvPatchVectorField::write(os);
+    os.writeKeyword("cyclicPatch")
+        << cyclicPatchName_ << token::END_STATEMENT << nl;
+    os.writeKeyword("orientation")
+        << orientation_ << token::END_STATEMENT << nl;
+    os.writeKeyword("openingTime")
+        << openingTime_ << token::END_STATEMENT << nl;
+    os.writeKeyword("maxOpenFractionDelta")
+        << maxOpenFractionDelta_ << token::END_STATEMENT << nl;
+    os.writeKeyword("openFraction")
+        << openFraction_ << token::END_STATEMENT << nl;
+    os.writeKeyword("p")
+        << pName_ << token::END_STATEMENT << nl;
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makePatchTypeField
+    (
+        fvPatchVectorField,
+        activeBaffleVelocityFvPatchVectorField
+    );
+}
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.H
new file mode 100644
index 0000000000..1f4f3d2b90
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.H
@@ -0,0 +1,193 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::activeBaffleVelocityFvPatchVectorField
+
+Description
+    Boundary condition that modifies mesh areas based on velocity.
+
+SourceFiles
+    activeBaffleVelocityFvPatchVectorField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef activeBaffleVelocityFvPatchVectorField_H
+#define activeBaffleVelocityFvPatchVectorField_H
+
+#include "fvPatchFields.H"
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                 Class activeBaffleVelocityFvPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class activeBaffleVelocityFvPatchVectorField
+:
+    public fixedValueFvPatchVectorField
+{
+    // Private data
+
+        //- Name of the pressure field used to calculate the force
+        //  on the active baffle
+        word pName_;
+
+        //- Name of the cyclic patch used when the active baffle is open
+        word cyclicPatchName_;
+
+        //- Index of the cyclic patch used when the active baffle is open
+        label cyclicPatchLabel_;
+
+        //- Orientation (1 or -1) of the active baffle patch.
+        //  Used to change the direction of opening without the need for
+        //  reordering the patch faces
+        label orientation_;
+
+        //- Initial wall patch areas
+        vectorField initWallSf_;
+
+        //- Initial cyclic patch areas
+        vectorField initCyclicSf_;
+
+        //- Current fraction of the active baffle which is open
+        scalar openFraction_;
+
+        //- Time taken for the active baffle to open
+        scalar openingTime_;
+
+        //- Maximum fractional change to the active baffle openness
+        //  per time-step
+        scalar maxOpenFractionDelta_;
+
+        label curTimeIndex_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("activeBaffleVelocity");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        activeBaffleVelocityFvPatchVectorField
+        (
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        activeBaffleVelocityFvPatchVectorField
+        (
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given activeBaffleVelocityFvPatchVectorField
+        //  onto a new patch
+        activeBaffleVelocityFvPatchVectorField
+        (
+            const activeBaffleVelocityFvPatchVectorField&,
+            const fvPatch&,
+            const DimensionedField<vector, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        activeBaffleVelocityFvPatchVectorField
+        (
+            const activeBaffleVelocityFvPatchVectorField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchVectorField> clone() const
+        {
+            return tmp<fvPatchVectorField>
+            (
+                new activeBaffleVelocityFvPatchVectorField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        activeBaffleVelocityFvPatchVectorField
+        (
+            const activeBaffleVelocityFvPatchVectorField&,
+            const DimensionedField<vector, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchVectorField> clone
+        (
+            const DimensionedField<vector, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchVectorField>
+            (
+                new activeBaffleVelocityFvPatchVectorField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Mapping functions
+
+            //- Map (and resize as needed) from self given a mapping object
+            virtual void autoMap
+            (
+                const fvPatchFieldMapper&
+            );
+
+            //- Reverse map the given fvPatchField onto this fvPatchField
+            virtual void rmap
+            (
+                const fvPatchVectorField&,
+                const labelList&
+            );
+
+
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From caff5576b16ca3a82e71b17372c5de580ad85db7 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Thu, 9 Jul 2009 13:23:55 +0100
Subject: [PATCH 58/84] Reinstated "application" entry in controlDict. Upgraded
 1.4 cases to 1.5.

---
 .../DNS/dnsFoam/boxTurb16/system/controlDict  |  2 ++
 .../laplacianFoam/flange/system/controlDict   |  2 ++
 .../potentialFoam/cylinder/system/controlDict |  2 ++
 .../pitzDaily/system/controlDict              |  2 ++
 .../pitzDaily/system/controlDict              |  2 ++
 .../XiFoam/les/pitzDaily/system/controlDict   |  2 ++
 .../XiFoam/les/pitzDaily3D/system/controlDict |  2 ++
 .../moriyoshiHomogeneous/system/controlDict   |  2 ++
 .../dieselFoam/aachenBomb/system/controlDict  |  2 ++
 .../LadenburgJet60psi/system/controlDict      |  2 ++
 .../biconic25-55Run35/system/controlDict      |  2 ++
 .../forwardStep/system/controlDict            |  2 ++
 .../obliqueShock/system/controlDict           |  2 ++
 .../shockTube/system/controlDict              |  2 ++
 .../wedge15Ma5/system/controlDict             |  2 ++
 .../angledDuct/system/controlDict             |  2 ++
 .../les/pitzDaily/system/controlDict          |  2 ++
 .../rhoPisoFoam/ras/cavity/system/controlDict |  2 ++
 .../angledDuctExplicit/system/controlDict     |  2 ++
 .../angledDuctImplicit/system/controlDict     |  2 ++
 .../forwardStep/system/controlDict            |  2 ++
 .../rhoSonicFoam/shockTube/system/controlDict |  2 ++
 .../shockTube/system/controlDict              |  2 ++
 .../wedge15Ma5/system/controlDict             |  2 ++
 .../laminar/forwardStep/system/controlDict    |  2 ++
 .../laminar/shockTube/system/controlDict      |  2 ++
 .../ras/nacaAirfoil/system/controlDict        |  2 ++
 .../sonicFoam/ras/prism/system/controlDict    |  2 ++
 .../decompressionTank/system/controlDict      |  2 ++
 .../dsmc/freeSpacePeriodic/system/controlDict |  2 ++
 .../dsmc/freeSpaceStream/system/controlDict   |  2 ++
 .../dsmc/supersonicCorner/system/controlDict  |  2 ++
 .../dsmc/wedge15Ma5/system/controlDict        |  2 ++
 .../periodicCubeArgon/system/controlDict      |  2 ++
 .../periodicCubeWater/system/controlDict      |  2 ++
 .../mdFoam/nanoNozzle/system/controlDict      |  2 ++
 .../chargedWire/system/controlDict            |  2 ++
 .../mhdFoam/hartmann/system/controlDict       |  2 ++
 .../europeanCall/system/controlDict           |  2 ++
 .../hotRoom/system/controlDict                |  2 ++
 .../hotRoom/system/controlDict                |  2 ++
 .../iglooWithFridges/system/controlDict       |  2 ++
 .../hotRoom/system/controlDict                |  2 ++
 .../hotRoom/system/controlDict                |  2 ++
 .../hotRadiationRoom/system/controlDict       |  2 ++
 .../hotRadiationRoomFvDOM/system/controlDict  |  2 ++
 .../multiRegionHeater/system/controlDict      |  2 ++
 .../mixerVessel2D/system/controlDict          |  2 ++
 .../boundaryLaunderSharma/system/controlDict  |  2 ++
 .../boundaryWallFunctions/system/controlDict  |  2 ++
 .../channelFoam/channel395/system/controlDict |  2 ++
 .../icoFoam/cavity/system/controlDict         |  2 ++
 .../icoFoam/cavityClipped/system/controlDict  |  2 ++
 .../icoFoam/cavityGrade/system/controlDict    |  2 ++
 .../icoFoam/elbow/system/controlDict          |  2 ++
 .../offsetCylinder/system/controlDict         |  2 ++
 .../movingCone/system/controlDict             |  2 ++
 .../pimpleFoam/t-junction/system/controlDict  |  2 ++
 .../pisoFoam/les/pitzDaily/system/controlDict |  2 ++
 .../pitzDailyDirectMapped/system/controlDict  |  2 ++
 .../pisoFoam/ras/cavity/system/controlDict    |  2 ++
 .../constant/{g => gravitationalProperties}   | 11 +++---
 .../constant/polyMesh/blockMeshDict           | 22 ++++--------
 .../squareBump/system/controlDict             |  2 ++
 .../simpleFoam/airFoil2D/system/controlDict   |  2 ++
 .../simpleFoam/pitzDaily/system/controlDict   |  2 ++
 .../pitzDailyExptInlet/system/controlDict     |  2 ++
 .../simpleSRFFoam/mixer/system/controlDict    |  2 ++
 .../filter/system/controlDict                 |  2 ++
 .../evaporationTest/system/controlDict        |  2 ++
 .../simplifiedSiwek/system/controlDict        |  2 ++
 .../SnakeRiverCanyon/0/pointDisplacement      | 23 +++++-------
 .../SnakeRiverCanyon/constant/dynamicMeshDict | 22 +++++-------
 .../constant/transportProperties              | 23 +++++-------
 .../SnakeRiverCanyon/system/controlDict       | 25 +++++--------
 .../SnakeRiverCanyon/system/decomposeParDict  | 28 +--------------
 .../SnakeRiverCanyon/system/fvSchemes         | 23 +++++-------
 .../SnakeRiverCanyon/system/fvSolution        | 35 +++++--------------
 .../multiRegionMesh/system/controlDict        |  2 ++
 .../bubbleColumn/system/controlDict           |  2 ++
 .../les/throttle/system/controlDict           |  2 ++
 .../les/throttle3D/system/controlDict         |  2 ++
 .../ras/throttle/system/controlDict           |  2 ++
 .../les/depthCharge2D/system/controlDict      |  2 ++
 .../les/depthCharge3D/system/controlDict      |  2 ++
 .../damBreakWithObstacle/system/controlDict   |  2 ++
 .../ras/sloshingTank2D/system/controlDict     |  2 ++
 .../ras/sloshingTank2D3DoF/system/controlDict |  2 ++
 .../ras/sloshingTank3D/system/controlDict     |  2 ++
 .../ras/sloshingTank3D3DoF/system/controlDict |  2 ++
 .../ras/sloshingTank3D6DoF/system/controlDict |  2 ++
 .../mixerVessel2D/system/controlDict          |  2 ++
 .../laminar/damBreak/system/controlDict       |  2 ++
 .../les/nozzleFlow2D/system/controlDict       |  2 ++
 .../interFoam/ras/damBreak/system/controlDict |  2 ++
 .../laminar/damBreak4phase/system/controlDict |  2 ++
 .../damBreak4phaseFine/system/controlDict     |  2 ++
 .../settlingFoam/ras/dahl/system/controlDict  |  2 ++
 .../ras/tank3D/system/controlDict             |  2 ++
 .../twoPhaseEulerFoam/bed/system/controlDict  |  2 ++
 .../twoPhaseEulerFoam/bed2/system/controlDict |  2 ++
 .../bubbleColumn/system/controlDict           |  2 ++
 .../plateHole/system/controlDict              |  2 ++
 .../beamEndLoad/system/controlDict            |  2 ++
 104 files changed, 252 insertions(+), 150 deletions(-)
 rename tutorials/incompressible/shallowWaterFoam/squareBump/constant/{g => gravitationalProperties} (79%)

diff --git a/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict b/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict
index bbbc76ae09..d364fb9eff 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict
+++ b/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     dnsFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/basic/laplacianFoam/flange/system/controlDict b/tutorials/basic/laplacianFoam/flange/system/controlDict
index f936785ffa..c709023a0e 100644
--- a/tutorials/basic/laplacianFoam/flange/system/controlDict
+++ b/tutorials/basic/laplacianFoam/flange/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     laplacianFoam;
+
 startFrom       latestTime;
 
 startTime       0;
diff --git a/tutorials/basic/potentialFoam/cylinder/system/controlDict b/tutorials/basic/potentialFoam/cylinder/system/controlDict
index c160f2f414..5a1215ddd8 100644
--- a/tutorials/basic/potentialFoam/cylinder/system/controlDict
+++ b/tutorials/basic/potentialFoam/cylinder/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     potentialFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/basic/potentialFoam/pitzDaily/system/controlDict b/tutorials/basic/potentialFoam/pitzDaily/system/controlDict
index c160f2f414..5a1215ddd8 100644
--- a/tutorials/basic/potentialFoam/pitzDaily/system/controlDict
+++ b/tutorials/basic/potentialFoam/pitzDaily/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     potentialFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict b/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict
index 83058ea620..e3503c07da 100644
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     scalarTransportFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
index bc4e09f514..23b481bcaf 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     XiFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
index c507917d6c..b9073e146d 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     XiFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict
index 576ae51176..0345a04be3 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     XiFoam;
+
 startFrom       latestTime;
 
 startTime       0;
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict b/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict
index 081c1d7369..4e04649935 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict
+++ b/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     dieselFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict
index 3652392f93..03c341ba69 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhoCentralFoam;
+
 startFrom       latestTime;
 
 startTime       0;
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict
index b2f7a33295..bfd3bedeab 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhoCentralFoam;
+
 startFrom       latestTime;
 
 startTime       0.005;
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict b/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict
index 8b725998ed..800bed68a0 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhoCentralFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict
index 5fa869b4cd..7def1dc4ad 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhoCentralFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict b/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict
index 37f1018867..67c440e293 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhoCentralFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict
index a65835e805..26903b96f9 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhoCentralFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict
index d7d107cf4c..3bf2b82d26 100644
--- a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhoPimpleFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
index 3fccde63c4..4bcaa9191c 100644
--- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhoPisoFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict
index c90f2db15f..c420a4f51c 100644
--- a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict
+++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhoPisoFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict
index 23e7202b52..06a09839b7 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhoPorousSimpleFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict
index 85cf9616b9..5f4c0f7557 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhoPorousSimpleFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict b/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict
index 11edd652c6..79e2a46768 100644
--- a/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict
+++ b/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhoSonicFoam;
+
 startFrom       latestTime;
 
 startTime       0;
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict b/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict
index e22c10e25d..c9d4347215 100644
--- a/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhoSonicFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict b/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict
index 581f82c6b5..e1a3170a6a 100644
--- a/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhopSonicFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict
index a65835e805..3aca5f02ea 100644
--- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict
+++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhopSonicFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict
index 7bf4401d7d..826220ef25 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     sonicFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict b/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict
index e22c10e25d..61cc1551ef 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     sonicFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
index aad6ecd97e..2929b3f01f 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     sonicFoam;
+
 startFrom       latestTime;
 
 startTime       0;
diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/controlDict b/tutorials/compressible/sonicFoam/ras/prism/system/controlDict
index ebaf12e759..1daa0096a8 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/system/controlDict
+++ b/tutorials/compressible/sonicFoam/ras/prism/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     sonicFoam;
+
 startFrom       latestTime;
 
 startTime       0;
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict
index 8607f0b47e..db06a27ea6 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     sonicLiquidFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/discreteMethods/dsmc/freeSpacePeriodic/system/controlDict b/tutorials/discreteMethods/dsmc/freeSpacePeriodic/system/controlDict
index 2a3172775a..bcaa42ac59 100644
--- a/tutorials/discreteMethods/dsmc/freeSpacePeriodic/system/controlDict
+++ b/tutorials/discreteMethods/dsmc/freeSpacePeriodic/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     dsmc;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/discreteMethods/dsmc/freeSpaceStream/system/controlDict b/tutorials/discreteMethods/dsmc/freeSpaceStream/system/controlDict
index f123a03086..55367aef56 100644
--- a/tutorials/discreteMethods/dsmc/freeSpaceStream/system/controlDict
+++ b/tutorials/discreteMethods/dsmc/freeSpaceStream/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     dsmc;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/discreteMethods/dsmc/supersonicCorner/system/controlDict b/tutorials/discreteMethods/dsmc/supersonicCorner/system/controlDict
index 2e92a436f3..f494aa8edf 100644
--- a/tutorials/discreteMethods/dsmc/supersonicCorner/system/controlDict
+++ b/tutorials/discreteMethods/dsmc/supersonicCorner/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     dsmc;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/discreteMethods/dsmc/wedge15Ma5/system/controlDict b/tutorials/discreteMethods/dsmc/wedge15Ma5/system/controlDict
index b069a96856..2ae7d6767a 100644
--- a/tutorials/discreteMethods/dsmc/wedge15Ma5/system/controlDict
+++ b/tutorials/discreteMethods/dsmc/wedge15Ma5/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     dsmc;
+
 startFrom       latestTime;
 
 startTime       0;
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict
index 76f7ed8a7e..0059f938cb 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict
@@ -14,6 +14,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     molecularDynamics;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict
index 51a42ecc0e..35ef2b6286 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict
@@ -14,6 +14,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     molecularDynamics;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict
index 51a42ecc0e..35ef2b6286 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict
@@ -14,6 +14,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     molecularDynamics;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict
index 25b59d0c42..a9876dcd10 100644
--- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     electrostaticFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict b/tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict
index 4e7c7961ef..fa24046d94 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     mhdFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/financial/financialFoam/europeanCall/system/controlDict b/tutorials/financial/financialFoam/europeanCall/system/controlDict
index d24c182349..ddd946cc15 100644
--- a/tutorials/financial/financialFoam/europeanCall/system/controlDict
+++ b/tutorials/financial/financialFoam/europeanCall/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     financialFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/controlDict
index 26a1219ee0..d2c25a1dd4 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     buoyantBoussinesqPisoFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict
index bfc52cf914..448819d5ba 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     buoyantBoussinesqSimpleFoam;
+
 startFrom       latestTime;
 
 startTime       0;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict
index 46e7cd00c3..1bd2ee7655 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     buoyantBoussinesqSimpleFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/controlDict
index 26a1219ee0..0b0fa52f64 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     buoyantPisoFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/controlDict
index bfc52cf914..6444cdb4c7 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     buoyantSimpleFoam;
+
 startFrom       latestTime;
 
 startTime       0;
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/controlDict b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/controlDict
index bfc52cf914..79836223f4 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     buoyantSimpleRadiationFoam;
+
 startFrom       latestTime;
 
 startTime       0;
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/controlDict b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/controlDict
index 06eec5ead0..cc94e95fd8 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     buoyantSimpleRadiationFoam;
+
 startFrom       latestTime;
 
 startTime       0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
index ba30afed2a..d48d6c9db6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     chtMultiRegionFoam;
+
 startFrom       latestTime;
 
 startTime       0.001;
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/controlDict b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/controlDict
index 5ffeca45c1..fb109fe38d 100644
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/controlDict
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     MRFSimpleFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/controlDict b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/controlDict
index d3dd7b0ae5..3d317faf0c 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/controlDict
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     boundaryFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict
index d3dd7b0ae5..3d317faf0c 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     boundaryFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/incompressible/channelFoam/channel395/system/controlDict b/tutorials/incompressible/channelFoam/channel395/system/controlDict
index 43a6a70428..6f90b085f8 100644
--- a/tutorials/incompressible/channelFoam/channel395/system/controlDict
+++ b/tutorials/incompressible/channelFoam/channel395/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     channelFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/incompressible/icoFoam/cavity/system/controlDict b/tutorials/incompressible/icoFoam/cavity/system/controlDict
index d2d91fe2ec..389301fe14 100644
--- a/tutorials/incompressible/icoFoam/cavity/system/controlDict
+++ b/tutorials/incompressible/icoFoam/cavity/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     icoFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/system/controlDict b/tutorials/incompressible/icoFoam/cavityClipped/system/controlDict
index 07204830ae..e3a5ae8738 100644
--- a/tutorials/incompressible/icoFoam/cavityClipped/system/controlDict
+++ b/tutorials/incompressible/icoFoam/cavityClipped/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     icoFoam;
+
 startFrom       startTime;
 
 startTime       0.5;
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/system/controlDict b/tutorials/incompressible/icoFoam/cavityGrade/system/controlDict
index db02226048..cf1e5568d0 100644
--- a/tutorials/incompressible/icoFoam/cavityGrade/system/controlDict
+++ b/tutorials/incompressible/icoFoam/cavityGrade/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     icoFoam;
+
 startFrom       startTime;
 
 startTime       0.7;
diff --git a/tutorials/incompressible/icoFoam/elbow/system/controlDict b/tutorials/incompressible/icoFoam/elbow/system/controlDict
index da4697ad55..589cc5f873 100644
--- a/tutorials/incompressible/icoFoam/elbow/system/controlDict
+++ b/tutorials/incompressible/icoFoam/elbow/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     icoFoam;
+
 startFrom       latestTime;
 
 startTime       0;
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict
index 55886792bd..83863029a0 100644
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     nonNewtonianIcoFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict
index 3e9d4d5576..81b44e5ee6 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     pimpleDyMFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict b/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
index 2d7aaa81da..aab1b1fa25 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     pimpleFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
index a4b46af8cc..03fbddb7a8 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     pisoFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict
index 4f36f59c28..91b740c5c3 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     pisoFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict b/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict
index c7ddb43b7d..db3bfaaf82 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     pisoFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/constant/g b/tutorials/incompressible/shallowWaterFoam/squareBump/constant/gravitationalProperties
similarity index 79%
rename from tutorials/incompressible/shallowWaterFoam/squareBump/constant/g
rename to tutorials/incompressible/shallowWaterFoam/squareBump/constant/gravitationalProperties
index 5f7711c728..85d821d0f7 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/constant/g
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/constant/gravitationalProperties
@@ -9,14 +9,13 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       uniformDimensionedVectorField;
-    object      g;
+    class       dictionary;
+    object      gravitationalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [0 1 -2 0 0 0 0];
-value           (0 0 -9.81);
-rotating true;
-Omega        Omega       [0 0 -1 0 0]  (0 0 7.292e-5);
+g            g           [0 1 -2 0 0 0 0]  (0 0 -9.81);
+rotating     true;
+Omega        Omega       [0 0 -1 0 0 0 0]  (0 0 7.292e-5);
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/constant/polyMesh/blockMeshDict b/tutorials/incompressible/shallowWaterFoam/squareBump/constant/polyMesh/blockMeshDict
index 47585411fb..beb11eb7b1 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/constant/polyMesh/blockMeshDict
@@ -1,25 +1,17 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.4                                   |
-|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-
 FoamFile
 {
-    version         2.0;
-    format          ascii;
-
-    root            "";
-    case            "";
-    instance        "";
-    local           "";
-
-    class           dictionary;
-    object          blockMeshDict;
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      blockMeshDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 convertToMeters 1;
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict b/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict
index 0dee06d265..c141656ff2 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict
@@ -14,6 +14,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     shallowWaterFoam;
+
 startFrom       startTime;
 
 startTime      0;
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict b/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict
index 0b19a7dffe..3b82bd5fd3 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     simpleFoam;
+
 startFrom       latestTime;
 
 startTime       0;
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
index 29292679f2..7adb0530bd 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     simpleFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
index 29292679f2..7adb0530bd 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     simpleFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/system/controlDict b/tutorials/incompressible/simpleSRFFoam/mixer/system/controlDict
index 46e7cd00c3..37cfa54f25 100644
--- a/tutorials/incompressible/simpleSRFFoam/mixer/system/controlDict
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     simpleSRFFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict
index a1aa89cd09..4195af2aea 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     porousExplicitSourceReactingParcelFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict
index fb4a4c45a7..9aa53af3ad 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     reactingParcelFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/controlDict b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/controlDict
index 498ad80a54..036c3ab56d 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/controlDict
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     rhoPisoTwinParcelFoam;
+
 startFrom       latestTime;
 
 startTime       0;
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/0/pointDisplacement b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/0/pointDisplacement
index 5ffe633e92..4b04de43b1 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/0/pointDisplacement
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/0/pointDisplacement
@@ -1,25 +1,18 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.4                                   |
-|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-
 FoamFile
 {
-    version 2.0;
-    format ascii;
-
-    root "/home/hunt2/mattijs/OpenFOAM/mattijs-1.4/run/testLoop1.4/moveMesh";
-    case "cone";
-    instance "0";
-    local "";
-
-    class pointVectorField;
-    object pointMotionU;
+    version     2.0;
+    format      ascii;
+    class       pointVectorField;
+    location    "0";
+    object      pointMotionU;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 1 0 0 0 0 0];
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/dynamicMeshDict b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/dynamicMeshDict
index 65894a796c..a246aec3c1 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/dynamicMeshDict
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/dynamicMeshDict
@@ -1,23 +1,17 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.4                                   |
-|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-
 FoamFile
 {
-    version         2.0;
-    format          ascii;
-
-    root            "";
-    case            "";
-    instance        "";
-    local           "";
-
-    class           dictionary;
-    object          motionProperties;
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      dynamicMeshDict;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/transportProperties b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/transportProperties
index 7aed29e935..17862ed509 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/transportProperties
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/transportProperties
@@ -1,25 +1,18 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.4                                   |
-|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-
 FoamFile
 {
-    version         2.0;
-    format          ascii;
-
-    root            "";
-    case            "";
-    instance        "";
-    local           "";
-
-    class           dictionary;
-    object          transportProperties;
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      transportProperties;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 nu              nu [0 2 -1 0 0 0 0] 0.01;
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict
index 195bead7ba..4c7d3c41e6 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict
@@ -1,28 +1,21 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.4                                   |
-|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-
 FoamFile
 {
-    version         2.0;
-    format          ascii;
-
-    root            "";
-    case            "";
-    instance        "";
-    local           "";
-
-    class           dictionary;
-    object          controlDict;
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      controlDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application icoFoam;
+application     moveDynamicMesh;
 
 startFrom       startTime;
 
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/decomposeParDict b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/decomposeParDict
index 441595307a..cc32e107da 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/decomposeParDict
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/decomposeParDict
@@ -19,13 +19,7 @@ FoamFile
 
 numberOfSubdomains  2;
 
-// preservePatches (inlet);
-// preserveFaceZones (heater solid1 solid3);
-
-// method          simple;
 method          hierarchical;
-// method          metis;
-// method          manual;
 
 simpleCoeffs
 {
@@ -41,17 +35,7 @@ hierarchicalCoeffs
 }
 
 metisCoeffs
-{
- /*
-    processorWeights
-    (
-        1
-        1
-        1
-        1
-    );
-  */
-}
+{}
 
 manualCoeffs
 {
@@ -59,14 +43,4 @@ manualCoeffs
 }
 
 
-//// Is the case distributed
-//distributed     yes;
-//// Per slave (so nProcs-1 entries) the directory above the case.
-//roots           
-//(
-//    "/tmp"
-//    "/tmp"
-//);
-
-
 // ************************************************************************* //
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSchemes b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSchemes
index ebcd685575..1570532442 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSchemes
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSchemes
@@ -1,25 +1,18 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.4                                   |
-|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-
 FoamFile
 {
-    version         2.0;
-    format          ascii;
-
-    root            "";
-    case            "";
-    instance        "";
-    local           "";
-
-    class           dictionary;
-    object          fvSchemes;
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSchemes;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 ddtSchemes
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSolution b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSolution
index 9fff602af6..ea03559dfb 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSolution
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/fvSolution
@@ -1,25 +1,18 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.4                                   |
-|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-
 FoamFile
 {
-    version         2.0;
-    format          ascii;
-
-    root            "";
-    case            "";
-    instance        "";
-    local           "";
-
-    class           dictionary;
-    object          fvSolution;
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSolution;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 solvers
@@ -66,17 +59,5 @@ solvers
     };
 }
 
-//PISO
-//{
-//    nCorrectors     2;
-//    nNonOrthogonalCorrectors 2;
-//    pRefCell        0;
-//    pRefValue       0;
-//}
-//
-//relaxationFactors
-//{
-//}
-
 
 // ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/controlDict b/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/controlDict
index 71de8302ef..b4e6cadd37 100644
--- a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/controlDict
+++ b/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     snappyHexMesh;
+
 startFrom       latestTime;
 
 startTime       0.001;
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict
index 3691a7b810..d584775d4d 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     bubbleFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
index 2ba1fabc2b..430402cef8 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     cavitatingFoam;
+
 startFrom       latestTime;
 
 startTime       0;
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
index c87d60631d..e96753b556 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     cavitatingFoam;
+
 startFrom       latestTime;
 
 startTime       0;
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict
index d541a7c7ef..551e130622 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     cavitatingFoam;
+
 startFrom       latestTime;
 
 startTime       0;
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/controlDict b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/controlDict
index 53a30129f4..4c225df9c7 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     compressibleInterFoam;
+
 startFrom       latestTime;
 
 startTime       0;
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/controlDict b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/controlDict
index 53a30129f4..4c225df9c7 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     compressibleInterFoam;
+
 startFrom       latestTime;
 
 startTime       0;
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/controlDict
index 4790e5fc3f..ffd38fe43b 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     interDyMFoam;
+
 startFrom       latestTime;
 
 startTime       0;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
index 35735bacbb..2da46048d7 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     interDyMFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
index 9fe32ebf04..c0adba94fb 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     interDyMFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
index 5823d9fbbd..08aaf802e1 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     interDyMFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
index 5823d9fbbd..08aaf802e1 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     interDyMFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
index 5823d9fbbd..08aaf802e1 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     interDyMFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/controlDict b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/controlDict
index 249378f87c..bacc92bb3f 100644
--- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     interFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict b/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict
index 5546d05292..d2cc91af3f 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     interFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict
index 58243b4b8d..1473b07fb8 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     interFoam;
+
 startFrom       latestTime;
 
 startTime       0;
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict b/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict
index e2b799e52f..bfec9ff0e4 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     interFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict
index 7a68f62840..970e7d234b 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     multiphaseInterFoam;
+
 startFrom       latestTime;
 
 startTime       0;
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict
index 7a68f62840..970e7d234b 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     multiphaseInterFoam;
+
 startFrom       latestTime;
 
 startTime       0;
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict b/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict
index e4ca7a8049..50ff9097b0 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     settlingFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/system/controlDict b/tutorials/multiphase/settlingFoam/ras/tank3D/system/controlDict
index 1adf79151c..94a0abb1b7 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/system/controlDict
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     settlingFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
index 8fc8f27669..97e7ff813c 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     twoPhaseEulerFoam;
+
 startFrom       latestTime;
 
 startTime       0;
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
index d5eaba87fe..87b8ec7ad6 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     twoPhaseEulerFoam;
+
 startFrom       latestTime;
 
 startTime       0;
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
index 1b724308f1..15bbbbf318 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     twoPhaseEulerFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict
index a6c2f2ec34..9c2031f4a6 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     solidDisplacementFoam;
+
 startFrom       startTime;
 
 startTime       0;
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict
index 70865b72da..4d8455c81f 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict
@@ -15,6 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+application     solidEquilibriumDisplacementFoam;
+
 startFrom       startTime;
 
 startTime       0;

From d9a071536155d226388c55019fdc373696a7e6d1 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Thu, 9 Jul 2009 13:25:17 +0100
Subject: [PATCH 59/84] clean-up of dictionary

---
 .../simplifiedSiwek/constant/RASProperties    | 38 +------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/RASProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/RASProperties
index 907214c9f8..73b806fc21 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/RASProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/RASProperties
@@ -19,42 +19,6 @@ RASModel        kEpsilon;
 
 turbulence      on;
 
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
-    Cmu             0.09;
-    C1              1.44;
-    C2              1.92;
-    C3              -0.33;
-    alphah          1;
-    alphak          1;
-    alphaEps        0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
-}
-
-LaunderSharmaKECoeffs
-{
-}
-
-LRRCoeffs
-{
-}
-
-LaunderGibsonRSTMCoeffs
-{
-}
-
-wallFunctionCoeffs
-{
-    kappa           0.4187;
-    E               9;
-}
-
+printCoeffs     yes;
 
 // ************************************************************************* //

From e7109637ae2df23defd939bc339f8b6af7b6cdc5 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Thu, 9 Jul 2009 13:25:40 +0100
Subject: [PATCH 60/84] updating copyright notices

---
 .../reactingMultiphaseCloud/reactingMultiphaseCloud.C           | 2 +-
 .../reactingMultiphaseCloud/reactingMultiphaseCloud.H           | 2 +-
 .../intermediate/submodels/IO/DataEntry/polynomial/polynomial.C | 2 +-
 .../intermediate/submodels/IO/DataEntry/polynomial/polynomial.H | 2 +-
 .../submodels/IO/DataEntry/polynomial/polynomialIO.C            | 2 +-
 .../intermediate/submodels/IO/IOList/makeParcelIOList.H         | 2 +-
 .../PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C      | 2 +-
 .../PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H      | 2 +-
 .../Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C     | 2 +-
 .../Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H     | 2 +-
 .../PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C     | 2 +-
 .../PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C        | 2 +-
 .../PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H        | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C
index 2fbe3815c9..5124bbfb97 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C
+++ b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H
index 4cbe6f6917..acac7fd148 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C
index 276d54146b..6726b8c55f 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
index 6d3cd51f65..ccebe5f994 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C
index 05c34b645f..6b40fd8004 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/IO/IOList/makeParcelIOList.H b/src/lagrangian/intermediate/submodels/IO/IOList/makeParcelIOList.H
index fb463a8289..010ae252ef 100644
--- a/src/lagrangian/intermediate/submodels/IO/IOList/makeParcelIOList.H
+++ b/src/lagrangian/intermediate/submodels/IO/IOList/makeParcelIOList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
index 19429ba681..91274c2458 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
index 7e569736ca..6f0bf06c4b 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
index ee3779b22e..32a0c449ea 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
index 007fa73344..3b6effa402 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C
index efb611522a..3b317c5b05 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
index b9fbdb2011..c60f1bf903 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
index 2e0f03a3f5..7445ea6264 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 4665779145f66499b96a435179d69d17696001b3 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Thu, 9 Jul 2009 14:41:54 +0100
Subject: [PATCH 61/84] Renamed for consistency with other tutorials.

---
 .../{dsmc => dsmcFoam}/freeSpacePeriodic/0/boundaryT              | 0
 .../{dsmc => dsmcFoam}/freeSpacePeriodic/0/boundaryU              | 0
 .../{dsmc => dsmcFoam}/freeSpacePeriodic/0/dsmcRhoN               | 0
 .../discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/0/fD     | 0
 .../discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/0/iDof   | 0
 .../{dsmc => dsmcFoam}/freeSpacePeriodic/0/internalE              | 0
 .../{dsmc => dsmcFoam}/freeSpacePeriodic/0/linearKE               | 0
 .../{dsmc => dsmcFoam}/freeSpacePeriodic/0/momentum               | 0
 .../discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/0/q      | 0
 .../discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/0/rhoM   | 0
 .../discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/0/rhoN   | 0
 .../discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/Allclean | 0
 .../discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/Allrun   | 0
 .../{dsmc => dsmcFoam}/freeSpacePeriodic/constant/dsmcProperties  | 0
 .../freeSpacePeriodic/constant/polyMesh/blockMeshDict             | 0
 .../freeSpacePeriodic/constant/polyMesh/boundary                  | 0
 .../{dsmc => dsmcFoam}/freeSpacePeriodic/system/controlDict       | 0
 .../{dsmc => dsmcFoam}/freeSpacePeriodic/system/decomposeParDict  | 0
 .../freeSpacePeriodic/system/dsmcInitialiseDict                   | 0
 .../{dsmc => dsmcFoam}/freeSpacePeriodic/system/fvSchemes         | 0
 .../{dsmc => dsmcFoam}/freeSpacePeriodic/system/fvSolution        | 0
 .../{dsmc => dsmcFoam}/freeSpaceStream/0/boundaryT                | 0
 .../{dsmc => dsmcFoam}/freeSpaceStream/0/boundaryU                | 0
 .../discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/0/dsmcRhoN | 0
 tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/0/fD | 0
 .../discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/0/iDof     | 0
 .../{dsmc => dsmcFoam}/freeSpaceStream/0/internalE                | 0
 .../{dsmc => dsmcFoam}/freeSpaceStream/0/interpolaterhoN          | 0
 .../discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/0/linearKE | 0
 .../discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/0/momentum | 0
 tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/0/q  | 0
 .../discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/0/rhoM     | 0
 .../discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/0/rhoN     | 0
 .../discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/Allclean   | 0
 .../discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/Allrun     | 0
 .../{dsmc => dsmcFoam}/freeSpaceStream/constant/dsmcProperties    | 0
 .../freeSpaceStream/constant/polyMesh/blockMeshDict               | 0
 .../{dsmc => dsmcFoam}/freeSpaceStream/constant/polyMesh/boundary | 0
 .../{dsmc => dsmcFoam}/freeSpaceStream/system/controlDict         | 0
 .../{dsmc => dsmcFoam}/freeSpaceStream/system/decomposeParDict    | 0
 .../{dsmc => dsmcFoam}/freeSpaceStream/system/dsmcInitialiseDict  | 0
 .../{dsmc => dsmcFoam}/freeSpaceStream/system/fvSchemes           | 0
 .../{dsmc => dsmcFoam}/freeSpaceStream/system/fvSolution          | 0
 .../{dsmc => dsmcFoam}/supersonicCorner/0/boundaryT               | 0
 .../{dsmc => dsmcFoam}/supersonicCorner/0/boundaryU               | 0
 .../{dsmc => dsmcFoam}/supersonicCorner/0/dsmcRhoN                | 0
 .../discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/0/fD      | 0
 .../discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/0/iDof    | 0
 .../{dsmc => dsmcFoam}/supersonicCorner/0/internalE               | 0
 .../{dsmc => dsmcFoam}/supersonicCorner/0/linearKE                | 0
 .../{dsmc => dsmcFoam}/supersonicCorner/0/momentum                | 0
 tutorials/discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/0/q | 0
 .../discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/0/rhoM    | 0
 .../discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/0/rhoN    | 0
 .../discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/Allclean  | 0
 .../discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/Allrun    | 0
 .../{dsmc => dsmcFoam}/supersonicCorner/constant/dsmcProperties   | 0
 .../supersonicCorner/constant/polyMesh/blockMeshDict              | 0
 .../supersonicCorner/constant/polyMesh/boundary                   | 0
 .../{dsmc => dsmcFoam}/supersonicCorner/system/controlDict        | 0
 .../{dsmc => dsmcFoam}/supersonicCorner/system/decomposeParDict   | 0
 .../{dsmc => dsmcFoam}/supersonicCorner/system/dsmcInitialiseDict | 0
 .../{dsmc => dsmcFoam}/supersonicCorner/system/fvSchemes          | 0
 .../{dsmc => dsmcFoam}/supersonicCorner/system/fvSolution         | 0
 .../discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/0/boundaryT     | 0
 .../discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/0/boundaryU     | 0
 .../discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/0/dsmcRhoN      | 0
 tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/0/fD      | 0
 tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/0/iDof    | 0
 .../discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/0/internalE     | 0
 .../discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/0/linearKE      | 0
 .../discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/0/momentum      | 0
 tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/0/q       | 0
 tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/0/rhoM    | 0
 tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/0/rhoN    | 0
 tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/Allclean  | 0
 tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/Allrun    | 0
 .../{dsmc => dsmcFoam}/wedge15Ma5/constant/dsmcProperties         | 0
 .../{dsmc => dsmcFoam}/wedge15Ma5/constant/polyMesh/blockMeshDict | 0
 .../{dsmc => dsmcFoam}/wedge15Ma5/constant/polyMesh/boundary      | 0
 .../{dsmc => dsmcFoam}/wedge15Ma5/system/controlDict              | 0
 .../{dsmc => dsmcFoam}/wedge15Ma5/system/decomposeParDict         | 0
 .../{dsmc => dsmcFoam}/wedge15Ma5/system/dsmcInitialiseDict       | 0
 .../{dsmc => dsmcFoam}/wedge15Ma5/system/fvSchemes                | 0
 .../{dsmc => dsmcFoam}/wedge15Ma5/system/fvSolution               | 0
 85 files changed, 0 insertions(+), 0 deletions(-)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/0/boundaryT (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/0/boundaryU (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/0/dsmcRhoN (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/0/fD (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/0/iDof (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/0/internalE (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/0/linearKE (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/0/momentum (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/0/q (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/0/rhoM (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/0/rhoN (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/Allclean (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/Allrun (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/constant/dsmcProperties (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/constant/polyMesh/blockMeshDict (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/constant/polyMesh/boundary (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/system/controlDict (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/system/decomposeParDict (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/system/dsmcInitialiseDict (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/system/fvSchemes (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpacePeriodic/system/fvSolution (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/0/boundaryT (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/0/boundaryU (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/0/dsmcRhoN (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/0/fD (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/0/iDof (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/0/internalE (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/0/interpolaterhoN (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/0/linearKE (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/0/momentum (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/0/q (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/0/rhoM (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/0/rhoN (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/Allclean (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/Allrun (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/constant/dsmcProperties (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/constant/polyMesh/blockMeshDict (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/constant/polyMesh/boundary (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/system/controlDict (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/system/decomposeParDict (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/system/dsmcInitialiseDict (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/system/fvSchemes (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/freeSpaceStream/system/fvSolution (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/0/boundaryT (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/0/boundaryU (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/0/dsmcRhoN (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/0/fD (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/0/iDof (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/0/internalE (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/0/linearKE (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/0/momentum (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/0/q (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/0/rhoM (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/0/rhoN (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/Allclean (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/Allrun (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/constant/dsmcProperties (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/constant/polyMesh/blockMeshDict (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/constant/polyMesh/boundary (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/system/controlDict (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/system/decomposeParDict (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/system/dsmcInitialiseDict (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/system/fvSchemes (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/supersonicCorner/system/fvSolution (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/0/boundaryT (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/0/boundaryU (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/0/dsmcRhoN (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/0/fD (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/0/iDof (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/0/internalE (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/0/linearKE (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/0/momentum (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/0/q (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/0/rhoM (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/0/rhoN (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/Allclean (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/Allrun (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/constant/dsmcProperties (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/constant/polyMesh/blockMeshDict (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/constant/polyMesh/boundary (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/system/controlDict (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/system/decomposeParDict (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/system/dsmcInitialiseDict (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/system/fvSchemes (100%)
 rename tutorials/discreteMethods/{dsmc => dsmcFoam}/wedge15Ma5/system/fvSolution (100%)

diff --git a/tutorials/discreteMethods/dsmc/freeSpacePeriodic/0/boundaryT b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryT
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpacePeriodic/0/boundaryT
rename to tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryT
diff --git a/tutorials/discreteMethods/dsmc/freeSpacePeriodic/0/boundaryU b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryU
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpacePeriodic/0/boundaryU
rename to tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryU
diff --git a/tutorials/discreteMethods/dsmc/freeSpacePeriodic/0/dsmcRhoN b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/dsmcRhoN
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpacePeriodic/0/dsmcRhoN
rename to tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/dsmcRhoN
diff --git a/tutorials/discreteMethods/dsmc/freeSpacePeriodic/0/fD b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/fD
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpacePeriodic/0/fD
rename to tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/fD
diff --git a/tutorials/discreteMethods/dsmc/freeSpacePeriodic/0/iDof b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/iDof
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpacePeriodic/0/iDof
rename to tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/iDof
diff --git a/tutorials/discreteMethods/dsmc/freeSpacePeriodic/0/internalE b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/internalE
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpacePeriodic/0/internalE
rename to tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/internalE
diff --git a/tutorials/discreteMethods/dsmc/freeSpacePeriodic/0/linearKE b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/linearKE
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpacePeriodic/0/linearKE
rename to tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/linearKE
diff --git a/tutorials/discreteMethods/dsmc/freeSpacePeriodic/0/momentum b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/momentum
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpacePeriodic/0/momentum
rename to tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/momentum
diff --git a/tutorials/discreteMethods/dsmc/freeSpacePeriodic/0/q b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/q
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpacePeriodic/0/q
rename to tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/q
diff --git a/tutorials/discreteMethods/dsmc/freeSpacePeriodic/0/rhoM b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoM
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpacePeriodic/0/rhoM
rename to tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoM
diff --git a/tutorials/discreteMethods/dsmc/freeSpacePeriodic/0/rhoN b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoN
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpacePeriodic/0/rhoN
rename to tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoN
diff --git a/tutorials/discreteMethods/dsmc/freeSpacePeriodic/Allclean b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allclean
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpacePeriodic/Allclean
rename to tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allclean
diff --git a/tutorials/discreteMethods/dsmc/freeSpacePeriodic/Allrun b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpacePeriodic/Allrun
rename to tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun
diff --git a/tutorials/discreteMethods/dsmc/freeSpacePeriodic/constant/dsmcProperties b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/dsmcProperties
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpacePeriodic/constant/dsmcProperties
rename to tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/dsmcProperties
diff --git a/tutorials/discreteMethods/dsmc/freeSpacePeriodic/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpacePeriodic/constant/polyMesh/blockMeshDict
rename to tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/polyMesh/blockMeshDict
diff --git a/tutorials/discreteMethods/dsmc/freeSpacePeriodic/constant/polyMesh/boundary b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpacePeriodic/constant/polyMesh/boundary
rename to tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/polyMesh/boundary
diff --git a/tutorials/discreteMethods/dsmc/freeSpacePeriodic/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpacePeriodic/system/controlDict
rename to tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
diff --git a/tutorials/discreteMethods/dsmc/freeSpacePeriodic/system/decomposeParDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/decomposeParDict
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpacePeriodic/system/decomposeParDict
rename to tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/decomposeParDict
diff --git a/tutorials/discreteMethods/dsmc/freeSpacePeriodic/system/dsmcInitialiseDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/dsmcInitialiseDict
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpacePeriodic/system/dsmcInitialiseDict
rename to tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/dsmcInitialiseDict
diff --git a/tutorials/discreteMethods/dsmc/freeSpacePeriodic/system/fvSchemes b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSchemes
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpacePeriodic/system/fvSchemes
rename to tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSchemes
diff --git a/tutorials/discreteMethods/dsmc/freeSpacePeriodic/system/fvSolution b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSolution
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpacePeriodic/system/fvSolution
rename to tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSolution
diff --git a/tutorials/discreteMethods/dsmc/freeSpaceStream/0/boundaryT b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryT
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpaceStream/0/boundaryT
rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryT
diff --git a/tutorials/discreteMethods/dsmc/freeSpaceStream/0/boundaryU b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryU
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpaceStream/0/boundaryU
rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryU
diff --git a/tutorials/discreteMethods/dsmc/freeSpaceStream/0/dsmcRhoN b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/dsmcRhoN
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpaceStream/0/dsmcRhoN
rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/dsmcRhoN
diff --git a/tutorials/discreteMethods/dsmc/freeSpaceStream/0/fD b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/fD
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpaceStream/0/fD
rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/fD
diff --git a/tutorials/discreteMethods/dsmc/freeSpaceStream/0/iDof b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/iDof
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpaceStream/0/iDof
rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/iDof
diff --git a/tutorials/discreteMethods/dsmc/freeSpaceStream/0/internalE b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/internalE
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpaceStream/0/internalE
rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/internalE
diff --git a/tutorials/discreteMethods/dsmc/freeSpaceStream/0/interpolaterhoN b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/interpolaterhoN
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpaceStream/0/interpolaterhoN
rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/interpolaterhoN
diff --git a/tutorials/discreteMethods/dsmc/freeSpaceStream/0/linearKE b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/linearKE
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpaceStream/0/linearKE
rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/linearKE
diff --git a/tutorials/discreteMethods/dsmc/freeSpaceStream/0/momentum b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/momentum
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpaceStream/0/momentum
rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/momentum
diff --git a/tutorials/discreteMethods/dsmc/freeSpaceStream/0/q b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/q
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpaceStream/0/q
rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/q
diff --git a/tutorials/discreteMethods/dsmc/freeSpaceStream/0/rhoM b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoM
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpaceStream/0/rhoM
rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoM
diff --git a/tutorials/discreteMethods/dsmc/freeSpaceStream/0/rhoN b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoN
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpaceStream/0/rhoN
rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoN
diff --git a/tutorials/discreteMethods/dsmc/freeSpaceStream/Allclean b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allclean
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpaceStream/Allclean
rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allclean
diff --git a/tutorials/discreteMethods/dsmc/freeSpaceStream/Allrun b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpaceStream/Allrun
rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun
diff --git a/tutorials/discreteMethods/dsmc/freeSpaceStream/constant/dsmcProperties b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/dsmcProperties
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpaceStream/constant/dsmcProperties
rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/dsmcProperties
diff --git a/tutorials/discreteMethods/dsmc/freeSpaceStream/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpaceStream/constant/polyMesh/blockMeshDict
rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/polyMesh/blockMeshDict
diff --git a/tutorials/discreteMethods/dsmc/freeSpaceStream/constant/polyMesh/boundary b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpaceStream/constant/polyMesh/boundary
rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/polyMesh/boundary
diff --git a/tutorials/discreteMethods/dsmc/freeSpaceStream/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpaceStream/system/controlDict
rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
diff --git a/tutorials/discreteMethods/dsmc/freeSpaceStream/system/decomposeParDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/decomposeParDict
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpaceStream/system/decomposeParDict
rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/decomposeParDict
diff --git a/tutorials/discreteMethods/dsmc/freeSpaceStream/system/dsmcInitialiseDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/dsmcInitialiseDict
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpaceStream/system/dsmcInitialiseDict
rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/dsmcInitialiseDict
diff --git a/tutorials/discreteMethods/dsmc/freeSpaceStream/system/fvSchemes b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSchemes
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpaceStream/system/fvSchemes
rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSchemes
diff --git a/tutorials/discreteMethods/dsmc/freeSpaceStream/system/fvSolution b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSolution
similarity index 100%
rename from tutorials/discreteMethods/dsmc/freeSpaceStream/system/fvSolution
rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSolution
diff --git a/tutorials/discreteMethods/dsmc/supersonicCorner/0/boundaryT b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryT
similarity index 100%
rename from tutorials/discreteMethods/dsmc/supersonicCorner/0/boundaryT
rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryT
diff --git a/tutorials/discreteMethods/dsmc/supersonicCorner/0/boundaryU b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryU
similarity index 100%
rename from tutorials/discreteMethods/dsmc/supersonicCorner/0/boundaryU
rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryU
diff --git a/tutorials/discreteMethods/dsmc/supersonicCorner/0/dsmcRhoN b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/dsmcRhoN
similarity index 100%
rename from tutorials/discreteMethods/dsmc/supersonicCorner/0/dsmcRhoN
rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/dsmcRhoN
diff --git a/tutorials/discreteMethods/dsmc/supersonicCorner/0/fD b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/fD
similarity index 100%
rename from tutorials/discreteMethods/dsmc/supersonicCorner/0/fD
rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/fD
diff --git a/tutorials/discreteMethods/dsmc/supersonicCorner/0/iDof b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/iDof
similarity index 100%
rename from tutorials/discreteMethods/dsmc/supersonicCorner/0/iDof
rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/iDof
diff --git a/tutorials/discreteMethods/dsmc/supersonicCorner/0/internalE b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/internalE
similarity index 100%
rename from tutorials/discreteMethods/dsmc/supersonicCorner/0/internalE
rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/internalE
diff --git a/tutorials/discreteMethods/dsmc/supersonicCorner/0/linearKE b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/linearKE
similarity index 100%
rename from tutorials/discreteMethods/dsmc/supersonicCorner/0/linearKE
rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/linearKE
diff --git a/tutorials/discreteMethods/dsmc/supersonicCorner/0/momentum b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/momentum
similarity index 100%
rename from tutorials/discreteMethods/dsmc/supersonicCorner/0/momentum
rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/momentum
diff --git a/tutorials/discreteMethods/dsmc/supersonicCorner/0/q b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/q
similarity index 100%
rename from tutorials/discreteMethods/dsmc/supersonicCorner/0/q
rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/q
diff --git a/tutorials/discreteMethods/dsmc/supersonicCorner/0/rhoM b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoM
similarity index 100%
rename from tutorials/discreteMethods/dsmc/supersonicCorner/0/rhoM
rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoM
diff --git a/tutorials/discreteMethods/dsmc/supersonicCorner/0/rhoN b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoN
similarity index 100%
rename from tutorials/discreteMethods/dsmc/supersonicCorner/0/rhoN
rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoN
diff --git a/tutorials/discreteMethods/dsmc/supersonicCorner/Allclean b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean
similarity index 100%
rename from tutorials/discreteMethods/dsmc/supersonicCorner/Allclean
rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean
diff --git a/tutorials/discreteMethods/dsmc/supersonicCorner/Allrun b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun
similarity index 100%
rename from tutorials/discreteMethods/dsmc/supersonicCorner/Allrun
rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun
diff --git a/tutorials/discreteMethods/dsmc/supersonicCorner/constant/dsmcProperties b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/dsmcProperties
similarity index 100%
rename from tutorials/discreteMethods/dsmc/supersonicCorner/constant/dsmcProperties
rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/dsmcProperties
diff --git a/tutorials/discreteMethods/dsmc/supersonicCorner/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/discreteMethods/dsmc/supersonicCorner/constant/polyMesh/blockMeshDict
rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/polyMesh/blockMeshDict
diff --git a/tutorials/discreteMethods/dsmc/supersonicCorner/constant/polyMesh/boundary b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/discreteMethods/dsmc/supersonicCorner/constant/polyMesh/boundary
rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/polyMesh/boundary
diff --git a/tutorials/discreteMethods/dsmc/supersonicCorner/system/controlDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
similarity index 100%
rename from tutorials/discreteMethods/dsmc/supersonicCorner/system/controlDict
rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
diff --git a/tutorials/discreteMethods/dsmc/supersonicCorner/system/decomposeParDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/decomposeParDict
similarity index 100%
rename from tutorials/discreteMethods/dsmc/supersonicCorner/system/decomposeParDict
rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/decomposeParDict
diff --git a/tutorials/discreteMethods/dsmc/supersonicCorner/system/dsmcInitialiseDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/dsmcInitialiseDict
similarity index 100%
rename from tutorials/discreteMethods/dsmc/supersonicCorner/system/dsmcInitialiseDict
rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/dsmcInitialiseDict
diff --git a/tutorials/discreteMethods/dsmc/supersonicCorner/system/fvSchemes b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSchemes
similarity index 100%
rename from tutorials/discreteMethods/dsmc/supersonicCorner/system/fvSchemes
rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSchemes
diff --git a/tutorials/discreteMethods/dsmc/supersonicCorner/system/fvSolution b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSolution
similarity index 100%
rename from tutorials/discreteMethods/dsmc/supersonicCorner/system/fvSolution
rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSolution
diff --git a/tutorials/discreteMethods/dsmc/wedge15Ma5/0/boundaryT b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryT
similarity index 100%
rename from tutorials/discreteMethods/dsmc/wedge15Ma5/0/boundaryT
rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryT
diff --git a/tutorials/discreteMethods/dsmc/wedge15Ma5/0/boundaryU b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryU
similarity index 100%
rename from tutorials/discreteMethods/dsmc/wedge15Ma5/0/boundaryU
rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryU
diff --git a/tutorials/discreteMethods/dsmc/wedge15Ma5/0/dsmcRhoN b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/dsmcRhoN
similarity index 100%
rename from tutorials/discreteMethods/dsmc/wedge15Ma5/0/dsmcRhoN
rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/dsmcRhoN
diff --git a/tutorials/discreteMethods/dsmc/wedge15Ma5/0/fD b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/fD
similarity index 100%
rename from tutorials/discreteMethods/dsmc/wedge15Ma5/0/fD
rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/fD
diff --git a/tutorials/discreteMethods/dsmc/wedge15Ma5/0/iDof b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/iDof
similarity index 100%
rename from tutorials/discreteMethods/dsmc/wedge15Ma5/0/iDof
rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/iDof
diff --git a/tutorials/discreteMethods/dsmc/wedge15Ma5/0/internalE b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/internalE
similarity index 100%
rename from tutorials/discreteMethods/dsmc/wedge15Ma5/0/internalE
rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/internalE
diff --git a/tutorials/discreteMethods/dsmc/wedge15Ma5/0/linearKE b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/linearKE
similarity index 100%
rename from tutorials/discreteMethods/dsmc/wedge15Ma5/0/linearKE
rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/linearKE
diff --git a/tutorials/discreteMethods/dsmc/wedge15Ma5/0/momentum b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/momentum
similarity index 100%
rename from tutorials/discreteMethods/dsmc/wedge15Ma5/0/momentum
rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/momentum
diff --git a/tutorials/discreteMethods/dsmc/wedge15Ma5/0/q b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/q
similarity index 100%
rename from tutorials/discreteMethods/dsmc/wedge15Ma5/0/q
rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/q
diff --git a/tutorials/discreteMethods/dsmc/wedge15Ma5/0/rhoM b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoM
similarity index 100%
rename from tutorials/discreteMethods/dsmc/wedge15Ma5/0/rhoM
rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoM
diff --git a/tutorials/discreteMethods/dsmc/wedge15Ma5/0/rhoN b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoN
similarity index 100%
rename from tutorials/discreteMethods/dsmc/wedge15Ma5/0/rhoN
rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoN
diff --git a/tutorials/discreteMethods/dsmc/wedge15Ma5/Allclean b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean
similarity index 100%
rename from tutorials/discreteMethods/dsmc/wedge15Ma5/Allclean
rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean
diff --git a/tutorials/discreteMethods/dsmc/wedge15Ma5/Allrun b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun
similarity index 100%
rename from tutorials/discreteMethods/dsmc/wedge15Ma5/Allrun
rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun
diff --git a/tutorials/discreteMethods/dsmc/wedge15Ma5/constant/dsmcProperties b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/dsmcProperties
similarity index 100%
rename from tutorials/discreteMethods/dsmc/wedge15Ma5/constant/dsmcProperties
rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/dsmcProperties
diff --git a/tutorials/discreteMethods/dsmc/wedge15Ma5/constant/polyMesh/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/discreteMethods/dsmc/wedge15Ma5/constant/polyMesh/blockMeshDict
rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/polyMesh/blockMeshDict
diff --git a/tutorials/discreteMethods/dsmc/wedge15Ma5/constant/polyMesh/boundary b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/discreteMethods/dsmc/wedge15Ma5/constant/polyMesh/boundary
rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/polyMesh/boundary
diff --git a/tutorials/discreteMethods/dsmc/wedge15Ma5/system/controlDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
similarity index 100%
rename from tutorials/discreteMethods/dsmc/wedge15Ma5/system/controlDict
rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
diff --git a/tutorials/discreteMethods/dsmc/wedge15Ma5/system/decomposeParDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/decomposeParDict
similarity index 100%
rename from tutorials/discreteMethods/dsmc/wedge15Ma5/system/decomposeParDict
rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/decomposeParDict
diff --git a/tutorials/discreteMethods/dsmc/wedge15Ma5/system/dsmcInitialiseDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/dsmcInitialiseDict
similarity index 100%
rename from tutorials/discreteMethods/dsmc/wedge15Ma5/system/dsmcInitialiseDict
rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/dsmcInitialiseDict
diff --git a/tutorials/discreteMethods/dsmc/wedge15Ma5/system/fvSchemes b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSchemes
similarity index 100%
rename from tutorials/discreteMethods/dsmc/wedge15Ma5/system/fvSchemes
rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSchemes
diff --git a/tutorials/discreteMethods/dsmc/wedge15Ma5/system/fvSolution b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSolution
similarity index 100%
rename from tutorials/discreteMethods/dsmc/wedge15Ma5/system/fvSolution
rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSolution

From 4c3c9f2c38cc3d9e7e7da83464e0c6cb07dac6c8 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Thu, 9 Jul 2009 14:42:17 +0100
Subject: [PATCH 62/84] Corrected application entry.

---
 tutorials/combustion/engineFoam/kivaTest/system/controlDict     | 2 +-
 tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st | 2 +-
 tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd | 2 +-
 .../dsmcFoam/freeSpacePeriodic/system/controlDict               | 2 +-
 .../discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict | 2 +-
 .../dsmcFoam/supersonicCorner/system/controlDict                | 2 +-
 .../discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict      | 2 +-
 .../mdEquilibrationFoam/periodicCubeArgon/system/controlDict    | 2 +-
 .../mdEquilibrationFoam/periodicCubeWater/system/controlDict    | 2 +-
 .../molecularDynamics/mdFoam/nanoNozzle/system/controlDict      | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict b/tutorials/combustion/engineFoam/kivaTest/system/controlDict
index 2ae209cb5f..987fc847a9 100644
--- a/tutorials/combustion/engineFoam/kivaTest/system/controlDict
+++ b/tutorials/combustion/engineFoam/kivaTest/system/controlDict
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-applicationClass engineFoam;
+application     engineFoam;
 
 startFrom       startTime;
 
diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st
index 2ae209cb5f..987fc847a9 100644
--- a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st
+++ b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-applicationClass engineFoam;
+application     engineFoam;
 
 startFrom       startTime;
 
diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd
index 4ec457ba62..fe08c9afe3 100644
--- a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd
+++ b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-applicationClass engineFoam;
+application     engineFoam;
 
 startFrom       startTime;
 
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
index bcaa42ac59..d423b5c236 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     dsmc;
+application     dsmcFoam;
 
 startFrom       startTime;
 
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
index 55367aef56..0c87d7f4fc 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     dsmc;
+application     dsmcFoam;
 
 startFrom       startTime;
 
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
index f494aa8edf..6cb632a80f 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     dsmc;
+application     dsmcFoam;
 
 startFrom       startTime;
 
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
index 2ae7d6767a..7add42226a 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     dsmc;
+application     dsmcFoam;
 
 startFrom       latestTime;
 
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict
index 0059f938cb..948cb3fe85 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     molecularDynamics;
+application     mdEquilibrationFoam;
 
 startFrom       startTime;
 
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict
index 35ef2b6286..678ba34929 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     molecularDynamics;
+application     mdEquilibrationFoam;
 
 startFrom       startTime;
 
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict
index 35ef2b6286..801608a895 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     molecularDynamics;
+application     mdFoam;
 
 startFrom       startTime;
 

From e6cdada5d6e336755f0559c6cd233d2b5509f36d Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Thu, 9 Jul 2009 16:01:36 +0100
Subject: [PATCH 63/84] correct extrudeMesh

---
 .../mesh/generation/extrudeMesh/extrudeMesh.C | 26 ++++--
 .../extrudeModel/linearNormal/linearNormal.C  |  9 ++-
 .../generation/extrudeMesh/extrudeProperties  | 21 +++--
 .../extrudeMesh/extrudedMesh/extrudedMesh.C   | 80 ++++++++++++-------
 4 files changed, 94 insertions(+), 42 deletions(-)

diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C
index 69dc36bccf..7380562664 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C
@@ -23,8 +23,9 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Description
-    Extrude mesh from existing patch (flipped so has inwards pointing
-    normals) or from patch read from file.
+    Extrude mesh from existing patch (by default outwards facing normals;
+    optional flips faces)
+    or from patch read from file.
     Note: Merges close points so be careful.
 
     Type of extrusion prescribed by run-time selectable model.
@@ -108,14 +109,11 @@ int main(int argc, char *argv[])
 
         const polyPatch& pp = mesh.boundaryMesh()[patchID];
         fMesh.reset(new faceMesh(pp.localFaces(), pp.localPoints()));
-        fMesh().flip();
 
         {
-            fileName surfName(patchName + ".sMesh");
-
-            Info<< "Writing (flipped) patch as surfaceMesh to "
+            fileName surfName(runTime.path()/patchName + ".sMesh");
+            Info<< "Writing patch as surfaceMesh to "
                 << surfName << nl << endl;
-
             OFstream os(surfName);
             os << fMesh() << nl;
         }
@@ -142,6 +140,20 @@ int main(int argc, char *argv[])
             << "patch or surface." << exit(FatalError);
     }
 
+    Switch flipNormals(dict.lookup("flipNormals"));
+
+    if (flipNormals)
+    {
+        Info<< "Flipping faces." << nl << endl;
+
+        faceList faces(fMesh().size());
+        forAll(faces, i)
+        {
+            faces[i] = fMesh()[i].reverseFace();
+        }
+        fMesh.reset(new faceMesh(faces, fMesh().localPoints()));
+    }
+
 
     Info<< "Extruding patch with :" << nl
             << "    points     : " << fMesh().points().size() << nl
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearNormal/linearNormal.C b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearNormal/linearNormal.C
index 99c02d214f..c36098ab1e 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearNormal/linearNormal.C
+++ b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearNormal/linearNormal.C
@@ -47,7 +47,14 @@ linearNormal::linearNormal(const dictionary& dict)
 :
     extrudeModel(typeName, dict),
     thickness_(readScalar(coeffDict_.lookup("thickness")))
-{}
+{
+    if (thickness_ <= 0)
+    {
+        FatalErrorIn("linearNormal(const dictionary&)")
+            << "thickness should be positive : " << thickness_
+            << exit(FatalError);
+    }
+}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeProperties b/applications/utilities/mesh/generation/extrudeMesh/extrudeProperties
index 20de7b2152..8bf73c4bf2 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudeProperties
+++ b/applications/utilities/mesh/generation/extrudeMesh/extrudeProperties
@@ -19,31 +19,40 @@ FoamFile
 constructFrom patch;    //surface;
 
 // If construct from (flipped) patch
-sourceCase "../cavity";
+sourceCase "$FOAM_RUN/icoFoam/cavity";
 sourcePatch movingWall;
 
+// Flip surface normals before usage.
+flipNormals false;
+
 // If construct from surface
 surface "movingWall.sMesh";
 
 
-// Do front and back need to be merged?
-mergeFaces false;
+// Do front and back need to be merged? Usually only makes sense for 360
+// degree wedges.
+mergeFaces true;
+
 
 //- Linear extrusion in point-normal direction
 //extrudeModel        linearNormal;
+
 //- Wedge extrusion. If nLayers is 1 assumes symmetry around plane.
 extrudeModel        wedge;
+
 //- Extrudes into sphere around (0 0 0)
 //extrudeModel        linearRadial;
+
+//- Extrudes into sphere with grading according to pressure (atmospherics)
 //extrudeModel        sigmaRadial;
 
-nLayers             6;
+nLayers             20;
 
 wedgeCoeffs
 {
     axisPt      (0 0.1 0);
-    axis        (1 0 0);
-    angle       90.0;   // For nLayers=1 assume symmetry so angle/2 on each side
+    axis        (-1 0 0);
+    angle       360;  // For nLayers=1 assume symmetry so angle/2 on each side
 }
 
 linearNormalCoeffs
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudedMesh/extrudedMesh.C b/applications/utilities/mesh/generation/extrudeMesh/extrudedMesh/extrudedMesh.C
index b258c59445..16bab41094 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudedMesh/extrudedMesh.C
+++ b/applications/utilities/mesh/generation/extrudeMesh/extrudedMesh/extrudedMesh.C
@@ -109,15 +109,33 @@ Foam::Xfer<Foam::faceList> Foam::extrudedMesh::extrudedFaces
         label currentLayerOffset = layer*surfacePoints.size();
         label nextLayerOffset = currentLayerOffset + surfacePoints.size();
 
-        // Side faces from layer to layer+1
-        for (label i=0; i<nInternalEdges; i++)
+        // Vertical faces from layer to layer+1
+        for (label edgeI=0; edgeI<nInternalEdges; edgeI++)
         {
-            quad[0] = surfaceEdges[i][1] + currentLayerOffset;
-            quad[1] = surfaceEdges[i][0] + currentLayerOffset;
-            quad[2] = surfaceEdges[i][0] + nextLayerOffset;
-            quad[3] = surfaceEdges[i][1] + nextLayerOffset;
+            const edge& e = surfaceEdges[edgeI];
+            const labelList& edgeFaces = extrudePatch.edgeFaces()[edgeI];
 
-            eFaces[facei++] = face(quad).reverseFace();
+            face& f = eFaces[facei++];
+            f.setSize(4);
+
+            if
+            (
+                (edgeFaces[0] < edgeFaces[1])
+             == sameOrder(surfaceFaces[edgeFaces[0]], e)
+            )
+            {
+                f[0] = e[0] + currentLayerOffset;
+                f[1] = e[1] + currentLayerOffset;
+                f[2] = e[1] + nextLayerOffset;
+                f[3] = e[0] + nextLayerOffset;
+            }
+            else
+            {
+                f[0] = e[1] + currentLayerOffset;
+                f[1] = e[0] + currentLayerOffset;
+                f[2] = e[0] + nextLayerOffset;
+                f[3] = e[1] + nextLayerOffset;
+            }
         }
 
         // Faces between layer and layer+1
@@ -128,9 +146,9 @@ Foam::Xfer<Foam::faceList> Foam::extrudedMesh::extrudedFaces
                 eFaces[facei++] =
                     face
                     (
-                        surfaceFaces[i].reverseFace()
+                        surfaceFaces[i] //.reverseFace()
                       + nextLayerOffset
-                    ).reverseFace();
+                    );
             }
         }
     }
@@ -142,40 +160,46 @@ Foam::Xfer<Foam::faceList> Foam::extrudedMesh::extrudedFaces
         label nextLayerOffset = currentLayerOffset + surfacePoints.size();
 
         // Side faces across layer
-        for (label i=nInternalEdges; i<surfaceEdges.size(); i++)
+        for (label edgeI=nInternalEdges; edgeI<surfaceEdges.size(); edgeI++)
         {
-            const edge& e = surfaceEdges[i];
-            quad[0] = e[1] + currentLayerOffset;
-            quad[1] = e[0] + currentLayerOffset;
-            quad[2] = e[0] + nextLayerOffset;
-            quad[3] = e[1] + nextLayerOffset;
+            const edge& e = surfaceEdges[edgeI];
+            const labelList& edgeFaces = extrudePatch.edgeFaces()[edgeI];
 
-            label ownerFace = extrudePatch.edgeFaces()[i][0];
+            face& f = eFaces[facei++];
+            f.setSize(4);
 
-            if (sameOrder(surfaceFaces[ownerFace], e))
+            if (sameOrder(surfaceFaces[edgeFaces[0]], e))
             {
-                reverse(quad);
+                f[0] = e[0] + currentLayerOffset;
+                f[1] = e[1] + currentLayerOffset;
+                f[2] = e[1] + nextLayerOffset;
+                f[3] = e[0] + nextLayerOffset;
+            }
+            else
+            {
+                f[0] = e[1] + currentLayerOffset;
+                f[1] = e[0] + currentLayerOffset;
+                f[2] = e[0] + nextLayerOffset;
+                f[3] = e[1] + nextLayerOffset;
             }
-
-            eFaces[facei++] = face(quad);
         }
     }
 
-    // Top faces
-    forAll(surfaceFaces, i)
-    {
-        eFaces[facei++] = face(surfaceFaces[i]).reverseFace();
-    }
-
     // Bottom faces
     forAll(surfaceFaces, i)
+    {
+        eFaces[facei++] = face(surfaceFaces[i]).reverseFace();
+    }
+
+    // Top faces
+    forAll(surfaceFaces, i)
     {
         eFaces[facei++] =
             face
             (
-                surfaceFaces[i].reverseFace()
+                surfaceFaces[i]
               + nLayers*surfacePoints.size()
-            ).reverseFace();
+            );
     }
 
     // return points for transferring

From 13ad54a518b4e9eeb1c42ae350eadc2c69c20191 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Thu, 9 Jul 2009 17:27:03 +0100
Subject: [PATCH 64/84] removing name - was big penalty in poly thermo

---
 .../functions/Polynomial/Polynomial.C         | 19 +++++--------------
 .../functions/Polynomial/Polynomial.H         | 10 ++--------
 .../functions/Polynomial/PolynomialIO.C       |  3 +--
 .../thermo/hPolynomial/hPolynomialThermo.C    |  4 ++--
 4 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C
index 8f3381ea45..e2d1463f7d 100644
--- a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C
+++ b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C
@@ -32,7 +32,6 @@ template<int PolySize>
 Foam::Polynomial<PolySize>::Polynomial()
 :
     VectorSpace<Polynomial<PolySize>, scalar, PolySize>(),
-    name_("unknownPolynomialName"),
     logActive_(false),
     logCoeff_(0.0)
 {}
@@ -42,16 +41,17 @@ template<int PolySize>
 Foam::Polynomial<PolySize>::Polynomial(const word& name, Istream& is)
 :
     VectorSpace<Polynomial<PolySize>, scalar, PolySize>(),
-    name_(is),
     logActive_(false),
     logCoeff_(0.0)
 {
-    if (name_ != name)
+    word isName(is);
+
+    if (isName != name)
     {
         FatalErrorIn
         (
             "Polynomial<PolySize>::Polynomial(const word&, Istream&)"
-        )   << "Expected polynomial name " << name << " but read " << name_
+        )   << "Expected polynomial name " << name << " but read " << isName
             << nl << exit(FatalError);
     }
 
@@ -63,7 +63,7 @@ Foam::Polynomial<PolySize>::Polynomial(const word& name, Istream& is)
         FatalErrorIn
         (
             "Polynomial<PolySize>::Polynomial(const word&, Istream&)"
-        )   << "Polynomial coefficients for entry " << name_
+        )   << "Polynomial coefficients for entry " << isName
             << " are invalid (empty)" << nl << exit(FatalError);
     }
 }
@@ -72,12 +72,10 @@ Foam::Polynomial<PolySize>::Polynomial(const word& name, Istream& is)
 template<int PolySize>
 Foam::Polynomial<PolySize>::Polynomial
 (
-    const word& name,
     const Polynomial<PolySize>& poly
 )
 :
     VectorSpace<Polynomial<PolySize>, scalar, PolySize>(poly),
-    name_(name),
     logActive_(poly.logActive_),
     logCoeff_(poly.logCoeff_)
 {}
@@ -85,13 +83,6 @@ Foam::Polynomial<PolySize>::Polynomial
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<int PolySize>
-const Foam::word& Foam::Polynomial<PolySize>::name() const
-{
-    return name_;
-}
-
-
 template<int PolySize>
 bool& Foam::Polynomial<PolySize>::logActive()
 {
diff --git a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H
index c1e2b58009..9d787f6c1b 100644
--- a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H
+++ b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H
@@ -82,9 +82,6 @@ class Polynomial
 {
     // Private data
 
-        //- Polynomial name
-        word name_;
-
         //- Include the log term? - only activated using integrateMinus1()
         bool logActive_;
 
@@ -107,17 +104,14 @@ public:
         //- Construct from name and Istream
         Polynomial(const word& name, Istream& is);
 
-        //- Copy constructor with name
-        Polynomial(const word& name, const Polynomial& poly);
+        //- Copy constructor
+        Polynomial(const Polynomial& poly);
 
 
     // Member Functions
 
         // Access
 
-            //- Return const access to the polynomial name
-            const word& name() const;
-
             //- Return access to the log term active flag
             bool& logActive();
 
diff --git a/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C b/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C
index 2a0d2187aa..5da0a67d64 100644
--- a/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C
+++ b/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C
@@ -35,8 +35,7 @@ Foam::Ostream& Foam::operator<<
     const Polynomial<PolySize>& poly
 )
 {
-    os  << poly.name_ << token::SPACE
-        << static_cast
+    os  << static_cast
             <VectorSpace<Polynomial<PolySize>, scalar, PolySize> >(poly);
 
     // Check state of Ostream
diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
index 294a96005a..284b9b7049 100644
--- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
@@ -36,8 +36,8 @@ Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo(Istream& i
     Hf_(readScalar(is)),
     Sf_(readScalar(is)),
     cpPolynomial_("cpPolynomial", is),
-    dhPolynomial_("dhPolynomial", cpPolynomial_.integrate()),
-    sPolynomial_("sPolynomial", cpPolynomial_.integrateMinus1())
+    dhPolynomial_(cpPolynomial_.integrate()),
+    sPolynomial_(cpPolynomial_.integrateMinus1())
 {}
 
 

From 8841735912cc5014888b6c54e4803e904dc4d7c1 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Thu, 9 Jul 2009 17:32:21 +0100
Subject: [PATCH 65/84] minor code formatting change

---
 .../specie/thermo/hPolynomial/hPolynomialThermo.C            | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
index 284b9b7049..7264041083 100644
--- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
@@ -30,7 +30,10 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class EquationOfState, int PolySize>
-Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo(Istream& is)
+Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
+(
+    Istream& is
+)
 :
     EquationOfState(is),
     Hf_(readScalar(is)),

From 9f46545159d90fd7b30ee757c493cb62de95104d Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Thu, 9 Jul 2009 17:44:50 +0100
Subject: [PATCH 66/84] Get the application from the controlDict where
 necessary.

---
 bin/foamRunTutorials                          |  2 +-
 bin/tools/RunFunctions                        |  5 ++
 tutorials/DNS/dnsFoam/boxTurb16/Allrun        |  4 +-
 tutorials/basic/laplacianFoam/flange/Allrun   |  4 +-
 tutorials/basic/potentialFoam/cylinder/Allrun |  2 +-
 .../basic/potentialFoam/pitzDaily/Allrun      |  2 +-
 tutorials/combustion/XiFoam/ras/Allrun        |  2 +-
 .../combustion/engineFoam/kivaTest/Allrun     |  4 +-
 tutorials/compressible/rhoCentralFoam/Allrun  |  4 +-
 .../rhoSonicFoam/shockTube/Allrun             |  5 +-
 .../rhopSonicFoam/shockTube/Allrun            |  2 +-
 tutorials/compressible/sonicFoam/Allrun       |  5 --
 .../compressible/sonicFoam/laminar/Allrun     | 22 ---------
 .../sonicFoam/laminar/shockTube/Allrun        |  2 +-
 tutorials/compressible/sonicFoam/ras/Allrun   | 29 -----------
 .../sonicFoam/ras/nacaAirfoil/Allrun          | 23 +++++++++
 .../ras/{ => nacaAirfoil}/Running_Notes       | 10 ++--
 tutorials/compressible/sonicLiquidFoam/Allrun |  4 +-
 .../molecularDynamics/mdFoam/Allclean         | 10 ----
 .../molecularDynamics/mdFoam/Allrun           | 19 --------
 .../mdFoam/nanoNozzle/Allclean                |  8 ++++
 .../mdFoam/nanoNozzle/Allrun                  | 16 +++++++
 tutorials/electromagnetics/mhdFoam/Allrun     |  2 +-
 .../buoyantBoussinesqPisoFoam/hotRoom/Allrun  |  2 +-
 .../hotRoom/Allrun                            |  2 +-
 .../buoyantPisoFoam/hotRoom/Allrun            |  4 +-
 .../buoyantSimpleFoam/hotRoom/Allrun          |  2 +-
 .../MRFSimpleFoam/mixerVessel2D/Allrun        |  2 +-
 .../channelFoam/channel395/Allrun             |  2 +-
 tutorials/incompressible/icoFoam/Allrun       |  4 +-
 .../incompressible/icoFoam/resetFixedWallsScr |  8 ++++
 tutorials/incompressible/pisoFoam/Allrun      | 37 --------------
 .../les/pitzDaily/constant/polyMesh/boundary  |  2 +-
 .../pisoFoam/les/pitzDailyDirectMapped/Allrun |  4 +-
 .../simpleFoam/airFoil2D/Allrun               |  2 +-
 .../filter/Allrun                             |  2 +-
 .../multiphase/cavitatingFoam/les/Allrun      |  1 +
 .../cavitatingFoam/ras/throttle/Allrun        |  2 +-
 .../les/depthCharge2D/Allrun                  |  4 +-
 .../les/depthCharge3D/Allrun                  |  4 +-
 tutorials/multiphase/interFoam/Allrun         | 48 -------------------
 .../MRFInterFoam/mixerVessel2D/Allrun         |  2 +-
 tutorials/multiphase/interFoam/laminar/Allrun |  2 +-
 .../interFoam/les/nozzleFlow2D/Allrun         |  4 +-
 tutorials/multiphase/interFoam/ras/Allrun     |  3 +-
 .../multiphase/interFoam/ras/damBreak/Allrun  |  4 +-
 .../multiphase/settlingFoam/ras/tank3D/Allrun |  2 +-
 47 files changed, 112 insertions(+), 223 deletions(-)
 delete mode 100755 tutorials/compressible/sonicFoam/Allrun
 delete mode 100755 tutorials/compressible/sonicFoam/laminar/Allrun
 delete mode 100755 tutorials/compressible/sonicFoam/ras/Allrun
 create mode 100755 tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun
 rename tutorials/compressible/sonicFoam/ras/{ => nacaAirfoil}/Running_Notes (65%)
 delete mode 100755 tutorials/discreteMethods/molecularDynamics/mdFoam/Allclean
 delete mode 100755 tutorials/discreteMethods/molecularDynamics/mdFoam/Allrun
 create mode 100755 tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean
 create mode 100755 tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun
 create mode 100644 tutorials/incompressible/icoFoam/resetFixedWallsScr
 delete mode 100755 tutorials/incompressible/pisoFoam/Allrun
 delete mode 100755 tutorials/multiphase/interFoam/Allrun

diff --git a/bin/foamRunTutorials b/bin/foamRunTutorials
index c4d7c85acb..210b1bcc60 100755
--- a/bin/foamRunTutorials
+++ b/bin/foamRunTutorials
@@ -50,7 +50,7 @@ elif [ -d "./system" ]
 then
     # Normal case.
     parentDir=`dirname $PWD`
-    application=`basename $parentDir`
+    application=`getApplication`
     runApplication blockMesh
     runApplication $application
 else
diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions
index 5afb39a950..6907b291ef 100644
--- a/bin/tools/RunFunctions
+++ b/bin/tools/RunFunctions
@@ -29,6 +29,11 @@
 #
 #------------------------------------------------------------------------------
 
+getApplication ()
+{
+    grep application system/controlDict | sed "s/application *\([a-zA-Z]*\);/\1/"
+}
+
 runApplication ()
 {
     APP_RUN=$1; shift
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/Allrun b/tutorials/DNS/dnsFoam/boxTurb16/Allrun
index b78ade21c1..e005157d09 100755
--- a/tutorials/DNS/dnsFoam/boxTurb16/Allrun
+++ b/tutorials/DNS/dnsFoam/boxTurb16/Allrun
@@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name from directory
-application="dnsFoam"
+# Get application name
+application=`getApplication`
 
 runApplication blockMesh
 runApplication boxTurb
diff --git a/tutorials/basic/laplacianFoam/flange/Allrun b/tutorials/basic/laplacianFoam/flange/Allrun
index 497eed73f8..d6a968af46 100755
--- a/tutorials/basic/laplacianFoam/flange/Allrun
+++ b/tutorials/basic/laplacianFoam/flange/Allrun
@@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application directory
-application="laplacianFoam"
+# Get application name
+application=`getApplication`
 
 runAnsysToFoam()
 {
diff --git a/tutorials/basic/potentialFoam/cylinder/Allrun b/tutorials/basic/potentialFoam/cylinder/Allrun
index b4a0869ee5..36e2229aa6 100755
--- a/tutorials/basic/potentialFoam/cylinder/Allrun
+++ b/tutorials/basic/potentialFoam/cylinder/Allrun
@@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application="potentialFoam"
+application=`getApplication`
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/basic/potentialFoam/pitzDaily/Allrun b/tutorials/basic/potentialFoam/pitzDaily/Allrun
index 6019032881..cadfe86d27 100755
--- a/tutorials/basic/potentialFoam/pitzDaily/Allrun
+++ b/tutorials/basic/potentialFoam/pitzDaily/Allrun
@@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application="potentialFoam"
+application=`getApplication`
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/combustion/XiFoam/ras/Allrun b/tutorials/combustion/XiFoam/ras/Allrun
index a48aed068d..0c311946f1 100755
--- a/tutorials/combustion/XiFoam/ras/Allrun
+++ b/tutorials/combustion/XiFoam/ras/Allrun
@@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name from directory
+# Set application name
 application="XiFoam"
 
 setControlDict () {
diff --git a/tutorials/combustion/engineFoam/kivaTest/Allrun b/tutorials/combustion/engineFoam/kivaTest/Allrun
index 0912af15e2..e8de444229 100755
--- a/tutorials/combustion/engineFoam/kivaTest/Allrun
+++ b/tutorials/combustion/engineFoam/kivaTest/Allrun
@@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name from directory
-application="engineFoam"
+# Get application name
+application=`getApplication`
 
 runKivaToFoam ()
 {
diff --git a/tutorials/compressible/rhoCentralFoam/Allrun b/tutorials/compressible/rhoCentralFoam/Allrun
index dbd8b7758f..d20d46fdd9 100755
--- a/tutorials/compressible/rhoCentralFoam/Allrun
+++ b/tutorials/compressible/rhoCentralFoam/Allrun
@@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name from directory
-application=${PWD##*/}
+# Get application name
+application="rhoCentralFoam"
 
 cases=" \
 shockTube \
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/Allrun b/tutorials/compressible/rhoSonicFoam/shockTube/Allrun
index 6ce183dba8..4f0a80edd8 100755
--- a/tutorials/compressible/rhoSonicFoam/shockTube/Allrun
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/Allrun
@@ -1,9 +1,10 @@
 #!/bin/sh
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name from directory
-application="rhoSonicFoam"
+# Get application name
+application=`getApplication`
 
 runApplication blockMesh
 runApplication setFields
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/Allrun b/tutorials/compressible/rhopSonicFoam/shockTube/Allrun
index 6415109243..eede9049d7 100755
--- a/tutorials/compressible/rhopSonicFoam/shockTube/Allrun
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/Allrun
@@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application="rhopSonicFoam"
+application=`getApplication`
 
 runApplication blockMesh
 runApplication setFields
diff --git a/tutorials/compressible/sonicFoam/Allrun b/tutorials/compressible/sonicFoam/Allrun
deleted file mode 100755
index 4f1a1e464a..0000000000
--- a/tutorials/compressible/sonicFoam/Allrun
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -x
-
-(cd laminar && ./Allrun)
-(cd ras && ./Allrun)
diff --git a/tutorials/compressible/sonicFoam/laminar/Allrun b/tutorials/compressible/sonicFoam/laminar/Allrun
deleted file mode 100755
index 573ff3a12d..0000000000
--- a/tutorials/compressible/sonicFoam/laminar/Allrun
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# Get application name from directory
-application=sonicFoam
-
-cases=" \
-forwardStep \
-shockTube \
-"
-for case in $cases
-do
-    (cd $case && runApplication blockMesh)
-#
-    if [ "$case" = "shockTube" ] ; then
-        (cd $case && ./Allrun)
-    else
-        (cd $case && runApplication $application)
-    fi
-#
-done
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun b/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun
index 6dc6509c85..bb2d19c9ea 100755
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun
@@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application="sonicFoam"
+application=`getApplication`
 
 runApplication blockMesh
 runApplication setFields
diff --git a/tutorials/compressible/sonicFoam/ras/Allrun b/tutorials/compressible/sonicFoam/ras/Allrun
deleted file mode 100755
index 810c6525eb..0000000000
--- a/tutorials/compressible/sonicFoam/ras/Allrun
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# Get application name from directory
-application=${PWD##*/}
-
-runStarToFoam ()
-{
-    if [ -f log.starToFoam ] ; then
-        echo "starToFoam already run on $PWD: remove log file to run"
-    else
-        echo "starToFoam: converting mesh $1"
-        starToFoam $1 > log.starToFoam 2>&1
-    fi
-}
-
-# Do prism
-(cd prism && foamRunTutorials)
-
-# Special handling for nacaAirfoil
-cd nacaAirfoil
-    runStarToFoam prostar/nacaAirfoil
-    mv constant/polyMesh/boundary temp
-    sed -e s/"\([\t ]*type[\t ]*\)symmetryPlane"/"\1empty"/g \
-        temp > constant/polyMesh/boundary
-    rm temp
-    runApplication $application
-cd ..
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun
new file mode 100755
index 0000000000..29cc29abd5
--- /dev/null
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+# Get application name
+application=`getApplication`
+
+runStarToFoam ()
+{
+    if [ -f log.starToFoam ] ; then
+        echo "starToFoam already run on $PWD: remove log file to run"
+    else
+        echo "starToFoam: converting mesh $1"
+        starToFoam $1 > log.starToFoam 2>&1
+    fi
+}
+
+runStarToFoam prostar/nacaAirfoil
+mv constant/polyMesh/boundary temp
+sed -e s/"\([\t ]*type[\t ]*\)symmetryPlane"/"\1empty"/g \
+    temp > constant/polyMesh/boundary
+rm temp
+runApplication $application
diff --git a/tutorials/compressible/sonicFoam/ras/Running_Notes b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Running_Notes
similarity index 65%
rename from tutorials/compressible/sonicFoam/ras/Running_Notes
rename to tutorials/compressible/sonicFoam/ras/nacaAirfoil/Running_Notes
index b666005280..5bfc37a862 100644
--- a/tutorials/compressible/sonicFoam/ras/Running_Notes
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Running_Notes
@@ -2,11 +2,7 @@ nacaAirfoil
 ~~~~~~~~~~~
 * large domain with airfoil section near centre
 * extremely non-orthogonal, highly skew mesh refined around the airfoil
-* running at Mach 1.78 
+* running at Mach 1.78
 * limited 0.5 on all laplacianSchemes because the mesh is so poor
-* run to t = 0.02 with nextWrite; change to stopAt endTime to continue running 
-* deltaT can be increased later in the run to 2e-07 
-
-prism
-~~~~~
-* run to t = 0.0014 for convergence 
+* run to t = 0.02 with nextWrite; change to stopAt endTime to continue running
+* deltaT can be increased later in the run to 2e-07
diff --git a/tutorials/compressible/sonicLiquidFoam/Allrun b/tutorials/compressible/sonicLiquidFoam/Allrun
index db8cdfa08a..6d1d356b34 100755
--- a/tutorials/compressible/sonicLiquidFoam/Allrun
+++ b/tutorials/compressible/sonicLiquidFoam/Allrun
@@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name from directory
-application=${PWD##*/}
+# Set application name
+application="sonicLiquidFoam"
 
 setDecompressionTankFine ()
 {
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/Allclean b/tutorials/discreteMethods/molecularDynamics/mdFoam/Allclean
deleted file mode 100755
index 7ff7776cb1..0000000000
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/Allclean
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-
-cd nanoNozzle
-    rm -rf constant/polyMesh/sets
-    rm -rf processor[0-9]
-    cleanCase
-cd ..
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/Allrun b/tutorials/discreteMethods/molecularDynamics/mdFoam/Allrun
deleted file mode 100755
index c756b2ca7e..0000000000
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/Allrun
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-application="mdFoam"
-
-cd nanoNozzle
-    runApplication blockMesh
-
-    runApplication decomposePar
-    hostname > system/machines
-
-    runParallel mdInitialise 4 system/machines
-    runParallel $application 4 system/machines
-
-    runApplication reconstructPar
-cd ..
-
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean
new file mode 100755
index 0000000000..8b3a55f408
--- /dev/null
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+rm -rf constant/polyMesh/sets
+rm -rf processor[0-9]
+cleanCase
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun
new file mode 100755
index 0000000000..defa2cb875
--- /dev/null
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+application=`getApplication`
+
+runApplication blockMesh
+
+runApplication decomposePar
+hostname > system/machines
+
+runParallel mdInitialise 4 system/machines
+runParallel $application 4 system/machines
+
+runApplication reconstructPar
diff --git a/tutorials/electromagnetics/mhdFoam/Allrun b/tutorials/electromagnetics/mhdFoam/Allrun
index aca66b3533..f664a09698 100755
--- a/tutorials/electromagnetics/mhdFoam/Allrun
+++ b/tutorials/electromagnetics/mhdFoam/Allrun
@@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name from directory
+# Set application name
 application="mhdFoam"
 
 (cd hartmann && runApplication blockMesh)
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allrun
index 92490b5b5e..c3373651df 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allrun
@@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application="buoyantBoussinesqPisoFoam"
+application=`getApplication`
 
 compileApplication ../../buoyantPisoFoam/hotRoom/setHotRoom
 runApplication blockMesh
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun
index 628624c702..c3373651df 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun
@@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application="buoyantBoussinesqSimpleFoam"
+application=`getApplication`
 
 compileApplication ../../buoyantPisoFoam/hotRoom/setHotRoom
 runApplication blockMesh
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun
index 165068eca7..e9bbb2d0c0 100755
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun
@@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name from directory
-application="buoyantPisoFoam"
+# Get application name
+application=`getApplication`
 
 compileApplication setHotRoom
 runApplication blockMesh
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun
index 6a98e5715d..c3373651df 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun
@@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application="buoyantSimpleFoam"
+application=`getApplication`
 
 compileApplication ../../buoyantPisoFoam/hotRoom/setHotRoom
 runApplication blockMesh
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/Allrun b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/Allrun
index f0d118b12b..836276fe9c 100755
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/Allrun
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/Allrun
@@ -3,7 +3,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application="MRFSimpleFoam"
+application=`getApplication`
 
 ./makeMesh
 runApplication $application
diff --git a/tutorials/incompressible/channelFoam/channel395/Allrun b/tutorials/incompressible/channelFoam/channel395/Allrun
index d4e6877e32..05cd6dfdf0 100755
--- a/tutorials/incompressible/channelFoam/channel395/Allrun
+++ b/tutorials/incompressible/channelFoam/channel395/Allrun
@@ -3,7 +3,7 @@
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application directory
-application="channelFoam"
+application=`getApplication`
 
 runApplication blockMesh
 runApplication $application
diff --git a/tutorials/incompressible/icoFoam/Allrun b/tutorials/incompressible/icoFoam/Allrun
index 914e53d07d..1a93d4eb32 100755
--- a/tutorials/incompressible/icoFoam/Allrun
+++ b/tutorials/incompressible/icoFoam/Allrun
@@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name from directory
-application=${PWD##*/}
+# Get application name
+application="icoFoam"
 
 cavityCases="cavity cavityFine cavityGrade cavityHighRe cavityClipped"
 
diff --git a/tutorials/incompressible/icoFoam/resetFixedWallsScr b/tutorials/incompressible/icoFoam/resetFixedWallsScr
new file mode 100644
index 0000000000..5a8d98ce46
--- /dev/null
+++ b/tutorials/incompressible/icoFoam/resetFixedWallsScr
@@ -0,0 +1,8 @@
+/fixedWalls/,/}/{
+/fixedWalls/p
+/{/p
+/type            fixedValue;/p
+s/value[ \t]*nonuniform[ \t]*List<vector>[ \t]*/value           uniform (0 0 0);/p
+/}/p
+d
+}
diff --git a/tutorials/incompressible/pisoFoam/Allrun b/tutorials/incompressible/pisoFoam/Allrun
deleted file mode 100755
index 7d6114dd50..0000000000
--- a/tutorials/incompressible/pisoFoam/Allrun
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# Get application name from directory
-application="pisoFoam"
-
-rasCases="cavity"
-lesCases="pitzDaily pitzDailyDirectMapped"
-
-computeCase()
-{
-    if [ -f Allrun ] ; then
-        ./Allrun
-    else
-        runApplication blockMesh
-        runApplication $application
-    fi
-}
-
-cd ras
-for case in $rasCases
-do
-    cd $case
-    computeCase
-    cd ..
-done
-cd ..
-
-cd les
-for case in $lesCases
-do
-    cd $case
-    computeCase
-    cd ..
-done
-cd ..
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/boundary b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/boundary
index 903f3ef57e..313dcceba1 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/boundary
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun
index d23000a160..aeb984814c 100755
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun
@@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name from directory
-application="pisoFoam"
+# Get application name
+application=`getApplication`
 
 runApplication blockMesh
 runApplication changeDictionary
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/Allrun b/tutorials/incompressible/simpleFoam/airFoil2D/Allrun
index 97fb4bc591..411704d783 100755
--- a/tutorials/incompressible/simpleFoam/airFoil2D/Allrun
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/Allrun
@@ -3,6 +3,6 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application="simpleFoam"
+application=`getApplication`
 
 runApplication $application
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun
index 701d55dc28..04eb8794e0 100755
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun
@@ -3,7 +3,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application="porousExplicitSourceReactingParcelFoam"
+application=`getApplication`
 
 # create mesh
 runApplication blockMesh
diff --git a/tutorials/multiphase/cavitatingFoam/les/Allrun b/tutorials/multiphase/cavitatingFoam/les/Allrun
index 45b6257d4b..ba35093d07 100755
--- a/tutorials/multiphase/cavitatingFoam/les/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/les/Allrun
@@ -3,6 +3,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
+# Set application name
 application="cavitatingFoam"
 
 refineMeshByCellSet()
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
index 0a3298e8e8..7f095c44f1 100755
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
@@ -3,7 +3,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application="cavitatingFoam"
+application=`getApplication`
 
 refineMeshByCellSet()
 {
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun
index f2a0345d68..a3d54875d4 100755
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun
@@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name from directory
-application="compressibleInterFoam"
+# Get application name
+application=`getApplication`
 
 runApplication blockMesh
 cp 0/alpha1.org 0/alpha1
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun
index 7b9b11445e..0f09de5ddc 100755
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun
@@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name from directory
-application="compressibleInterFoam"
+# Get application name
+application=`getApplication`
 
 runApplication blockMesh
 cp 0/alpha1.org 0/alpha1
diff --git a/tutorials/multiphase/interFoam/Allrun b/tutorials/multiphase/interFoam/Allrun
deleted file mode 100755
index 91f49e0a7f..0000000000
--- a/tutorials/multiphase/interFoam/Allrun
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# Get application name from directory
-application="interFoam"
-
-laminarCases="damBreak"
-rasCases="damBreak"
-lesCases="nozzleFlow2D"
-
-computeCase()
-{
-    if [ -f Allrun ] ; then
-        ./Allrun
-    else
-        runApplication blockMesh
-        runApplication changeDictionary
-        runApplication $application
-    fi
-}
-
-cd laminar
-for case in $laminarCases
-do
-    cd $case
-    computeCase
-    cd ..
-done
-cd ..
-
-cd ras
-for case in $rasCases
-do
-    cd $case
-    computeCase
-    cd ..
-done
-cd ..
-
-cd les
-for case in $lesCases
-do
-    cd $case
-    computeCase
-    cd ..
-done
-cd ..
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun
index e8e310bf86..836276fe9c 100755
--- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun
@@ -3,7 +3,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application="MRFInterFoam"
+application=`getApplication`
 
 ./makeMesh
 runApplication $application
diff --git a/tutorials/multiphase/interFoam/laminar/Allrun b/tutorials/multiphase/interFoam/laminar/Allrun
index 9f2498ca88..22d86c6b68 100755
--- a/tutorials/multiphase/interFoam/laminar/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/Allrun
@@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name from directory
+# Set application name
 application="interFoam"
 
 setDamBreakFine ()
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
index 8f801cc9ce..655eb4c887 100755
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
@@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name from directory
-application="interFoam"
+# Get application name
+application=`getApplication`
 
 runRefineMesh ()
 {
diff --git a/tutorials/multiphase/interFoam/ras/Allrun b/tutorials/multiphase/interFoam/ras/Allrun
index e222cf7e15..45bd89d849 100755
--- a/tutorials/multiphase/interFoam/ras/Allrun
+++ b/tutorials/multiphase/interFoam/ras/Allrun
@@ -2,7 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application="rasInterFoam"
+# Set application name
+application="interFoam"
 
 setDamBreakFine ()
 {
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/Allrun b/tutorials/multiphase/interFoam/ras/damBreak/Allrun
index 599b286f3d..90917ec795 100755
--- a/tutorials/multiphase/interFoam/ras/damBreak/Allrun
+++ b/tutorials/multiphase/interFoam/ras/damBreak/Allrun
@@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name from directory
-application="interFoam"
+# Get application name
+application=`getApplication`
 
 runApplication blockMesh
 runApplication setFields
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun b/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun
index 1ce228b8f6..231be44262 100755
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun
@@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application="settlingFoam"
+application=`getApplication`
 
 #runApplication blockMesh
 runApplication $application

From 0f98438bef35382967712ef7bc56e3f5765154bf Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Thu, 9 Jul 2009 18:12:01 +0100
Subject: [PATCH 67/84] using Switch instead of bool

---
 .../timeActivatedExplicitMulticomponentPointSource.H            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitMulticomponentPointSource/timeActivatedExplicitMulticomponentPointSource.H b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitMulticomponentPointSource/timeActivatedExplicitMulticomponentPointSource.H
index a1d74268f9..0247f26389 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitMulticomponentPointSource/timeActivatedExplicitMulticomponentPointSource.H
+++ b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitMulticomponentPointSource/timeActivatedExplicitMulticomponentPointSource.H
@@ -111,7 +111,7 @@ protected:
         const PtrList<volScalarField>& carrierFields_;
 
         //- Active flag
-        bool active_;
+        Switch active_;
 
         //- List of point source properties
         List<pointSourceProperties> pointSources_;

From 43607987479ef6cc592161a7c54f1d54773f8170 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Thu, 9 Jul 2009 18:15:02 +0100
Subject: [PATCH 68/84] activating point mass sources

---
 .../filter/constant/pointMassSourcesProperties                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/pointMassSourcesProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/pointMassSourcesProperties
index 063399d211..2f17b0b095 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/pointMassSourcesProperties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/pointMassSourcesProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-active          false;
+active          true;
 
 pointSources
 (

From 37b0fe0adedaace19ca6f88b37a3d08800fe0fdf Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Thu, 9 Jul 2009 23:28:54 +0100
Subject: [PATCH 69/84] Corrections to get the tutorial test loop to run
 cleanly.

---
 .../compressible/rhoCentralFoam/Make/options  |  5 +--
 .../mesh/generation/blockMesh/blockMeshApp.C  |  3 +-
 .../foamToEnsight/foamToEnsight.C             |  2 +
 .../dataConversion/foamToGMV/foamToGMV.C      |  2 +-
 .../postProcessing/foamCalc/foamCalc.C        |  2 +
 .../postProcessing/velocityField/Co/Co.C      |  2 +
 .../velocityField/Lambda2/Lambda2.C           |  4 +-
 .../postProcessing/velocityField/Mach/Mach.C  |  2 +
 .../postProcessing/velocityField/Pe/Pe.C      |  5 ++-
 .../postProcessing/velocityField/Q/Q.C        |  5 ++-
 .../velocityField/enstrophy/enstrophy.C       |  2 +
 .../velocityField/flowType/flowType.C         |  4 +-
 .../streamFunction/streamFunction.C           |  4 +-
 .../velocityField/uprime/uprime.C             |  5 ++-
 .../velocityField/vorticity/vorticity.C       |  5 ++-
 .../rhoPisoFoam/les/pitzDaily/0/alphaSgs}     | 40 +++++++++++++------
 .../rhoPisoFoam/les/pitzDaily/0/muSgs         | 10 ++---
 .../les/pitzDaily/constant/polyMesh/boundary  |  5 ++-
 .../les/pitzDaily/system/controlDict          |  5 +++
 .../iglooWithFridges/Allrun                   |  1 -
 .../iglooWithFridges/system/snappyHexMeshDict |  5 +--
 .../multiRegionHeater/constant/bottomAir/g    |  4 +-
 .../multiRegionHeater/constant/topAir/g       |  1 +
 .../motorBike/system/snappyHexMeshDict        | 15 ++++---
 .../ras/damBreakWithObstacle/0-orig/p         |  6 ++-
 .../interDyMFoam/ras/damBreakWithObstacle/0/p |  6 ++-
 .../interDyMFoam/ras/sloshingTank2D/0/p       |  3 +-
 .../ras/sloshingTank2D/system/controlDict     |  4 +-
 .../interDyMFoam/ras/sloshingTank2D3DoF/0/p   |  3 +-
 .../constant/polyMesh/blockMeshDict           |  4 +-
 .../constant/polyMesh/boundary                |  4 +-
 .../ras/sloshingTank2D3DoF/system/controlDict |  7 ++--
 .../interDyMFoam/ras/sloshingTank3D/0/p       |  3 +-
 .../ras/sloshingTank3D/system/controlDict     |  2 +-
 .../interDyMFoam/ras/sloshingTank3D3DoF/0/p   |  3 +-
 .../ras/sloshingTank3D3DoF/system/controlDict |  2 +-
 .../interDyMFoam/ras/sloshingTank3D6DoF/0/p   |  3 +-
 .../ras/sloshingTank3D6DoF/system/controlDict |  2 +-
 38 files changed, 124 insertions(+), 66 deletions(-)
 rename tutorials/{multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha1 => compressible/rhoPisoFoam/les/pitzDaily/0/alphaSgs} (66%)
 mode change 100644 => 120000 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/g

diff --git a/applications/solvers/compressible/rhoCentralFoam/Make/options b/applications/solvers/compressible/rhoCentralFoam/Make/options
index b6ede7054d..4714ca611c 100644
--- a/applications/solvers/compressible/rhoCentralFoam/Make/options
+++ b/applications/solvers/compressible/rhoCentralFoam/Make/options
@@ -2,11 +2,10 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-	-IBCs/lnInclude \
+    -IBCs/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude
 EXE_LIBS = \
     -lfiniteVolume \
     -lbasicThermophysicalModels \
-	-lspecie \
-    -L$(FOAM_USER_LIBBIN) \
+    -lspecie \
     -lrhoCentralFoam
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
index 1d034714ef..b4bd379d75 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
@@ -348,7 +348,8 @@ int main(int argc, char *argv[])
             << exit(FatalError);
     }
 
-    Info<< nl << "end" << endl;
+    Info<< nl << "End" << endl;
+
     return 0;
 }
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
index 881bb4b05a..fc0c3db61c 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
@@ -492,6 +492,8 @@ int main(int argc, char *argv[])
         delete ensightCaseFilePtr;
     }
 
+    Info<< "End\n" << endl;
+
     return 0;
 }
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C b/applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C
index 6c7e23ebae..66d4b6e43e 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C
@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    Info << nl << "Translation Complete." << nl;
+    Info<< "\nEnd\n" << endl;
 
     return 0;
 }
diff --git a/applications/utilities/postProcessing/foamCalc/foamCalc.C b/applications/utilities/postProcessing/foamCalc/foamCalc.C
index 717a63e1ec..c673ed2455 100644
--- a/applications/utilities/postProcessing/foamCalc/foamCalc.C
+++ b/applications/utilities/postProcessing/foamCalc/foamCalc.C
@@ -84,6 +84,8 @@ int main(int argc, char *argv[])
 
     utility().tryPostCalc(args, runTime, mesh);
 
+    Info<< "End\n" << endl;
+
     return 0;
 }
 
diff --git a/applications/utilities/postProcessing/velocityField/Co/Co.C b/applications/utilities/postProcessing/velocityField/Co/Co.C
index 23d7b008a7..2faa212583 100644
--- a/applications/utilities/postProcessing/velocityField/Co/Co.C
+++ b/applications/utilities/postProcessing/velocityField/Co/Co.C
@@ -179,6 +179,8 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
     {
         Info<< "    No phi" << endl;
     }
+
+    Info<< "\nEnd\n" << endl;
 }
 
 // ************************************************************************* //
diff --git a/applications/utilities/postProcessing/velocityField/Lambda2/Lambda2.C b/applications/utilities/postProcessing/velocityField/Lambda2/Lambda2.C
index 0b42de1404..0b64ebd163 100644
--- a/applications/utilities/postProcessing/velocityField/Lambda2/Lambda2.C
+++ b/applications/utilities/postProcessing/velocityField/Lambda2/Lambda2.C
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------*\
+/*---------------------------------------------------------------------------* \
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
@@ -78,6 +78,8 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
     {
         Info<< "    No U" << endl;
     }
+
+    Info<< "\nEnd\n" << endl;
 }
 
 
diff --git a/applications/utilities/postProcessing/velocityField/Mach/Mach.C b/applications/utilities/postProcessing/velocityField/Mach/Mach.C
index 2e7c517e9d..cec41457f3 100644
--- a/applications/utilities/postProcessing/velocityField/Mach/Mach.C
+++ b/applications/utilities/postProcessing/velocityField/Mach/Mach.C
@@ -134,6 +134,8 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
     {
         Info<< "    Missing U or T" << endl;
     }
+
+    Info<< "\nEnd\n" << endl;
 }
 
 
diff --git a/applications/utilities/postProcessing/velocityField/Pe/Pe.C b/applications/utilities/postProcessing/velocityField/Pe/Pe.C
index 05c9ca1a0d..0af52d405a 100644
--- a/applications/utilities/postProcessing/velocityField/Pe/Pe.C
+++ b/applications/utilities/postProcessing/velocityField/Pe/Pe.C
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------*\
+/*---------------------------------------------------------------------------* \
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
@@ -361,6 +361,9 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
     {
         Info<< "    No phi" << endl;
     }
+
+    Info<< "\nEnd\n" << endl;
 }
 
+
 // ************************************************************************* //
diff --git a/applications/utilities/postProcessing/velocityField/Q/Q.C b/applications/utilities/postProcessing/velocityField/Q/Q.C
index 34a09790d1..08c214a394 100644
--- a/applications/utilities/postProcessing/velocityField/Q/Q.C
+++ b/applications/utilities/postProcessing/velocityField/Q/Q.C
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------*\
+/*---------------------------------------------------------------------------* \
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
@@ -105,6 +105,9 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
     {
         Info<< "    No U" << endl;
     }
+
+    Info<< "\nEnd\n" << endl;
 }
 
+
 // ************************************************************************* //
diff --git a/applications/utilities/postProcessing/velocityField/enstrophy/enstrophy.C b/applications/utilities/postProcessing/velocityField/enstrophy/enstrophy.C
index 96ccb4b907..d510ee3849 100644
--- a/applications/utilities/postProcessing/velocityField/enstrophy/enstrophy.C
+++ b/applications/utilities/postProcessing/velocityField/enstrophy/enstrophy.C
@@ -80,6 +80,8 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
     {
         Info<< "    No U" << endl;
     }
+
+    Info<< "\nEnd\n" << endl;
 }
 
 
diff --git a/applications/utilities/postProcessing/velocityField/flowType/flowType.C b/applications/utilities/postProcessing/velocityField/flowType/flowType.C
index 20e425864d..343ff0517d 100644
--- a/applications/utilities/postProcessing/velocityField/flowType/flowType.C
+++ b/applications/utilities/postProcessing/velocityField/flowType/flowType.C
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------*\
+/*---------------------------------------------------------------------------* \
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
@@ -87,6 +87,8 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
     {
         Info<< "    No U" << endl;
     }
+
+    Info<< "\nEnd\n" << endl;
 }
 
 
diff --git a/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C b/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C
index 68d4c8d698..44ab386d9f 100644
--- a/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C
+++ b/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------*\
+/*---------------------------------------------------------------------------* \
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
@@ -460,7 +460,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    Info<< "End\n" << endl;
+    Info<< "\nEnd\n" << endl;
 
     return 0;
 }
diff --git a/applications/utilities/postProcessing/velocityField/uprime/uprime.C b/applications/utilities/postProcessing/velocityField/uprime/uprime.C
index c1f7071f74..54012aef9a 100644
--- a/applications/utilities/postProcessing/velocityField/uprime/uprime.C
+++ b/applications/utilities/postProcessing/velocityField/uprime/uprime.C
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------*\
+/*---------------------------------------------------------------------------* \
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
@@ -80,6 +80,9 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
     {
         Info<< "    No k" << endl;
     }
+
+    Info<< "\nEnd\n" << endl;
 }
 
+
 // ************************************************************************* //
diff --git a/applications/utilities/postProcessing/velocityField/vorticity/vorticity.C b/applications/utilities/postProcessing/velocityField/vorticity/vorticity.C
index 3b4a85ca3e..e59384f3c0 100644
--- a/applications/utilities/postProcessing/velocityField/vorticity/vorticity.C
+++ b/applications/utilities/postProcessing/velocityField/vorticity/vorticity.C
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------*\
+/*---------------------------------------------------------------------------* \
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
@@ -93,6 +93,9 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
     {
         Info<< "    No U" << endl;
     }
+
+    Info<< "\nEnd\n" << endl;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha1 b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/alphaSgs
similarity index 66%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha1
rename to tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/alphaSgs
index 8e28c332b7..5ce0dfcc52 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha1
+++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/alphaSgs
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,28 +10,42 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha1;
+    location    "0";
+    object      alphat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [0 0 0 0 0 0 0];
+dimensions      [1 -1 -1 0 0 0 0];
 
 internalField   uniform 0;
 
 boundaryField
 {
-    front
-    {
-        type            empty;
-    }
-    back
-    {
-        type            empty;
-    }
-    walls
+    inlet
     {
         type            zeroGradient;
     }
+
+    outlet
+    {
+        type            zeroGradient;
+    }
+
+    upperWall
+    {
+        type            zeroGradient;
+    }
+
+    lowerWall
+    {
+        type            zeroGradient;
+    }
+
+    frontAndBack
+    {
+        type            empty;
+    }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/muSgs b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/muSgs
index 242527194d..334ab2c339 100644
--- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/muSgs
+++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/muSgs
@@ -20,27 +20,27 @@ internalField   uniform 0;
 
 boundaryField
 {
-    inlet           
+    inlet
     {
         type            zeroGradient;
     }
 
-    outlet          
+    outlet
     {
         type            zeroGradient;
     }
 
-    upperWall       
+    upperWall
     {
         type            zeroGradient;
     }
 
-    lowerWall       
+    lowerWall
     {
         type            zeroGradient;
     }
 
-    frontAndBack    
+    frontAndBack
     {
         type            empty;
     }
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/polyMesh/boundary b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/polyMesh/boundary
index 9a319af977..313dcceba1 100644
--- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       polyBoundaryMesh;
+    location    "constant/polyMesh";
     object      boundary;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
index 4bcaa9191c..685eac20a3 100644
--- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
@@ -45,6 +45,11 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
+adjustTimeStep  no;
+
+maxCo           0.5;
+
+
 functions
 {
     fieldAverage1
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun
index 79dc3f4b95..79d959124f 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun
@@ -4,6 +4,5 @@
 
 runApplication blockMesh
 runApplication snappyHexMesh -overwrite
-runApplication setFields
 runApplication buoyantBoussinesqSimpleFoam
 
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
index d31010ace7..019b09810f 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
@@ -10,9 +10,8 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      autoHexMeshDict;
+    object      snappyHexMeshDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Which of the steps to run
@@ -317,7 +316,6 @@ addLayersControls
     // Create buffer region for new layer terminations
     nBufferCellsNoExtrude 0;
 
-
     // Overall max number of layer addition iterations
     nLayerIter 50;
 }
@@ -391,4 +389,5 @@ debug 0;
 // Note: the write tolerance needs to be higher than this.
 mergeTolerance 1E-6;
 
+
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g
index 4cada4ce7a..2b77c937a2 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g
@@ -10,11 +10,13 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
+    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 1 -2 0 0 0 0];
-value           (0 -9.81 0);
+value           ( 0 -9.81 0 );
+
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/g b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/g
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/g b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/g
new file mode 120000
index 0000000000..fe0384ff08
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/g
@@ -0,0 +1 @@
+../bottomAir/g
\ No newline at end of file
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
index 1006a1e1b6..b3c3a08e9e 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
@@ -1,11 +1,10 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.0                                   |
-|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-
 FoamFile
 {
     version     2.0;
@@ -13,7 +12,6 @@ FoamFile
     class       dictionary;
     object      snappyHexMeshDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Which of the steps to run
@@ -176,6 +174,8 @@ snapControls
 // Settings for the layer addition.
 addLayersControls
 {
+    relativeSizes true;
+
     // Per final patch (so not geometry!) the layer information
     layers
     {
@@ -460,7 +460,7 @@ addLayersControls
     //  is the
     //  thickness of the layer furthest away from the wall.
     //  Relative to undistorted size of cell outside layer.
-    finalLayerRatio 0.3;
+    finalLayerThickness 0.3;
 
     //- Minimum thickness of cell layer. If for any reason layer
     //  cannot be above minThickness do not add layer.
@@ -504,6 +504,9 @@ addLayersControls
 
     // Create buffer region for new layer terminations
     nBufferCellsNoExtrude 0;
+
+    // Overall max number of layer addition iterations
+    nLayerIter 50;
 }
 
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/p b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/p
index b3a944b216..5149e92434 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/p
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/p
@@ -22,12 +22,14 @@ boundaryField
 {
     walls
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     obstacle
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     atmosphere
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/p b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/p
index b3a944b216..5149e92434 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/p
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/p
@@ -22,12 +22,14 @@ boundaryField
 {
     walls
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     obstacle
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     atmosphere
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p
index c69b424dc7..db8d5ad9f6 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p
@@ -30,7 +30,8 @@ boundaryField
     }
     walls
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 }
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
index 2da46048d7..b8d66af38a 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
@@ -56,7 +56,7 @@ functions
     probes
     {
         type            probes;
-        functionObjectLibs ( "libsampling.so" );
+        functionObjectLibs ("libsampling.so");
         outputControl   timeStep;
         outputInterval  1;
         probeLocations
@@ -73,7 +73,7 @@ functions
     wallPressure
     {
         type            surfaces;
-        functionObjectLibs ( "libsampling.so" );
+        functionObjectLibs ("libsampling.so");
         outputControl   timeStep;
         outputInterval  10;
         surfaceFormat   raw;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p
index c69b424dc7..db8d5ad9f6 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p
@@ -30,7 +30,8 @@ boundaryField
     }
     walls
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 }
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict
index c7d3ee2dcd..4a938bd66e 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict
@@ -15,9 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // General m4 macros
 
-
-
-
+  
 
 
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/boundary
index 53b37c41f6..067ff53cc9 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/boundary
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
index c0adba94fb..b8d66af38a 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
@@ -56,9 +56,9 @@ functions
     probes
     {
         type            probes;
-        name            probes;
+        functionObjectLibs ("libsampling.so");
         outputControl   timeStep;
-        outputInterval  10;
+        outputInterval  1;
         probeLocations
         (
             ( 0 9.95 19.77 )
@@ -73,7 +73,7 @@ functions
     wallPressure
     {
         type            surfaces;
-        functionObjectLibs ( "libsampling.so" );
+        functionObjectLibs ("libsampling.so");
         outputControl   timeStep;
         outputInterval  10;
         surfaceFormat   raw;
@@ -81,6 +81,7 @@ functions
         (
             p
         );
+
         surfaces
         (
             walls
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p
index d27ad70eb9..ce3e974b7e 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p
@@ -22,7 +22,8 @@ boundaryField
 {
     walls
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 }
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
index 08aaf802e1..a3b08d083b 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
@@ -56,7 +56,7 @@ functions
     probes
     {
         type            probes;
-        name            probes;
+        functionObjectLibs ("libsampling.so");
         outputControl   timeStep;
         outputInterval  1;
         probeLocations
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p
index d27ad70eb9..ce3e974b7e 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p
@@ -22,7 +22,8 @@ boundaryField
 {
     walls
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 }
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
index 08aaf802e1..a3b08d083b 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
@@ -56,7 +56,7 @@ functions
     probes
     {
         type            probes;
-        name            probes;
+        functionObjectLibs ("libsampling.so");
         outputControl   timeStep;
         outputInterval  1;
         probeLocations
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p
index d27ad70eb9..ce3e974b7e 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p
@@ -22,7 +22,8 @@ boundaryField
 {
     walls
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 }
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
index 08aaf802e1..a3b08d083b 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
@@ -56,7 +56,7 @@ functions
     probes
     {
         type            probes;
-        name            probes;
+        functionObjectLibs ("libsampling.so");
         outputControl   timeStep;
         outputInterval  1;
         probeLocations

From 5f246c45e697a7354cb10d4dfe6049cb3e3d0465 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Fri, 10 Jul 2009 11:55:50 +0100
Subject: [PATCH 70/84] Improved the basic tutorial clean functions.

---
 bin/tools/CleanFunctions                       |  16 +++++++---------
 .../dsmcFoam/supersonicCorner/Allclean         |   2 --
 .../dsmcFoam/wedge15Ma5/Allclean               |   3 ---
 .../multiRegionHeater/Allclean                 |  10 ----------
 .../pisoFoam/les/pitzDaily/system/controlDict  |   6 +++---
 .../ras/damBreakWithObstacle/VTK/c0/c0_1.vtk   | Bin 230571 -> 0 bytes
 6 files changed, 10 insertions(+), 27 deletions(-)
 delete mode 100755 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean
 delete mode 100644 tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/VTK/c0/c0_1.vtk

diff --git a/bin/tools/CleanFunctions b/bin/tools/CleanFunctions
index e7a5da0753..4a2015febf 100644
--- a/bin/tools/CleanFunctions
+++ b/bin/tools/CleanFunctions
@@ -61,12 +61,17 @@ cleanTimeDirectories ()
 cleanCase ()
 {
     cleanTimeDirectories
+    rm -rf processor* > /dev/null 2>&1
+    rm -rf probes* > /dev/null 2>&1
+    rm -rf forces* > /dev/null 2>&1
 
-    rm -rf constant/polyMesh/{allOwner*,cell*,face*,meshModifiers*} \
+    rm -rf system/machines \
+           constant/polyMesh/{allOwner*,cell*,face*,meshModifiers*} \
            constant/polyMesh/{owner*,neighbour*,point*,edge*} \
            constant/polyMesh/{cellLevel*,pointLevel*,refinementHistory*,surfaceIndex*} \
-           constant/{cellLevel*,pointLevel*} \
+           constant/{cellToRegion,cellLevel*,pointLevel*} \
            constant/polyMesh/sets/ \
+           VTK \
            > /dev/null 2>&1
 
     for f in `find . -name "*Dict"`
@@ -76,13 +81,6 @@ cleanCase ()
     done
 }
 
-cleanParallelCase ()
-{
-    cleanCase
-
-    rm -rf processor* > /dev/null 2>&1
-}
-
 removeCase ()
 {
     echo "Removing $case case"
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean
index 5622060c8e..1cc972be26 100755
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean
@@ -5,5 +5,3 @@
 
 cleanCase
 rm -rf 0/lagrangian 0/dsmcSigmaTcRMax
-rm -rf processor*
-rm -f system/machines
\ No newline at end of file
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean
index a81bd94599..1cc972be26 100755
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean
@@ -5,6 +5,3 @@
 
 cleanCase
 rm -rf 0/lagrangian 0/dsmcSigmaTcRMax
-rm -rf processor*
-rm -rf forces1
-rm -f system/machines
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean
deleted file mode 100755
index 2954f18bad..0000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-
-cleanCase
-rm -rf VTK
-rm -rf constant/cellToRegion constant/polyMesh/sets
-
-# -----------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
index 03fbddb7a8..98d278dccc 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
@@ -47,10 +47,10 @@ runTimeModifiable yes;
 
 functions
 {
-    probes1
+    probes
     {
         type            probes;
-        functionObjectLibs ( "libsampling.so" );
+        functionObjectLibs ("libsampling.so");
         enabled         true;
         outputControl   timeStep;
         outputInterval  1;
@@ -74,7 +74,7 @@ functions
     fieldAverage1
     {
         type            fieldAverage;
-        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        functionObjectLibs ("libfieldFunctionObjects.so");
         enabled         true;
         outputControl   outputTime;
         fields
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/VTK/c0/c0_1.vtk b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/VTK/c0/c0_1.vtk
deleted file mode 100644
index af03eba46538789965e6f8ab0137eb890e833a2b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 230571
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


From 3d4f910bc3b35266299291a35e3967dfa0082712 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 10 Jul 2009 11:58:51 +0100
Subject: [PATCH 71/84] moving correctMassFractions() to multiComponentMixture

---
 .../basicMultiComponentMixture.C              | 21 ++---------------
 .../basicMultiComponentMixture.H              |  6 -----
 .../multiComponentMixture.C                   | 23 ++++++++++++++++++-
 3 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.C
index 1016a33a97..984c06bdf2 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.C
@@ -26,24 +26,6 @@ License
 
 #include "basicMultiComponentMixture.H"
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void Foam::basicMultiComponentMixture::correctMassFractions()
-{
-    volScalarField Yt = Y_[0];
-
-    for(label n=1; n<Y_.size(); n++)
-    {
-        Yt += Y_[n];
-    }
-
-    forAll (Y_, n)
-    {
-        Y_[n] /= Yt;
-    }
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::basicMultiComponentMixture::basicMultiComponentMixture
@@ -120,7 +102,8 @@ Foam::basicMultiComponentMixture::basicMultiComponentMixture
         }
     }
 
-    correctMassFractions();
+    // Do not enforce constraint of sum of mass fractions to equal 1 here
+    // - not applicable to all models
 }
 
 
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.H
index a21485889a..4a83754c0f 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.H
@@ -63,12 +63,6 @@ protected:
         PtrList<volScalarField> Y_;
 
 
-    // Protected member functions
-
-        //- Correct the mass fractions to sum to 1
-        void correctMassFractions();
-
-
 public:
 
     // Constructors
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
index 521959a2e9..62458df464 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
@@ -47,6 +47,23 @@ const ThermoType& Foam::multiComponentMixture<ThermoType>::constructSpeciesData
 }
 
 
+template<class ThermoType>
+void Foam::multiComponentMixture<ThermoType>::correctMassFractions()
+{
+    volScalarField Yt = Y_[0];
+
+    for (label n=1; n<Y_.size(); n++)
+    {
+        Yt += Y_[n];
+    }
+
+    forAll (Y_, n)
+    {
+        Y_[n] /= Yt;
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class ThermoType>
@@ -70,6 +87,8 @@ Foam::multiComponentMixture<ThermoType>::multiComponentMixture
             new ThermoType(*specieThermoData[species_[i]])
         );
     }
+
+    correctMassFractions();
 }
 
 
@@ -83,7 +102,9 @@ Foam::multiComponentMixture<ThermoType>::multiComponentMixture
     basicMultiComponentMixture(thermoDict, thermoDict.lookup("species"), mesh),
     speciesData_(species_.size()),
     mixture_("mixture", constructSpeciesData(thermoDict))
-{}
+{
+    correctMassFractions();
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //

From e461ef53e9d379fd90be1b4136c1fdcd6e078afa Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Fri, 10 Jul 2009 12:04:42 +0100
Subject: [PATCH 72/84] Removed support for LAM.

---
 bin/tools/RunFunctions                                 | 10 ----------
 .../discreteMethods/dsmcFoam/supersonicCorner/Allrun   |  5 ++---
 tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun   |  5 ++---
 .../molecularDynamics/mdFoam/nanoNozzle/Allrun         |  5 ++---
 .../chtMultiRegionFoam/multiRegionHeater/Allrun        |  3 +--
 tutorials/mesh/snappyHexMesh/multiRegionMesh/Allrun    |  3 +--
 tutorials/multiphase/cavitatingFoam/les/Allrun         |  3 +--
 .../compressibleInterFoam/les/depthCharge3D/Allrun     |  3 +--
 tutorials/multiphase/interFoam/laminar/Allrun          |  3 +--
 tutorials/multiphase/interFoam/ras/Allrun              |  3 +--
 10 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions
index 6907b291ef..62ce3e27ef 100644
--- a/bin/tools/RunFunctions
+++ b/bin/tools/RunFunctions
@@ -53,18 +53,8 @@ runParallel ()
     if [ -f $log.$APP_RUN ] ; then
         echo "$APP_RUN already run on $PWD: remove log file to run"
     else
-        if [ "$WM_MPLIB" = LAM ]
-        then
-            echo "Starting LAM using $2 machines file"
-            lamboot -v $2
-        fi
         echo "Running $APP_RUN in parallel on $PWD using $1 processes"
         ( mpirun -np $1 $APP_RUN -parallel < /dev/null > log.$APP_RUN 2>&1 )
-        if [ "$WM_MPLIB" = LAM ]
-        then
-            echo "Stopping LAM"
-            lamclean
-        fi
     fi
 }
 
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun
index 402135df74..b369081128 100755
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun
@@ -4,8 +4,7 @@
 
 runApplication blockMesh
 runApplication decomposePar
-runParallel dsmcInitialise 4 system/machines
-hostname > system/machines
-runParallel dsmcFoam 4 system/machines
+runParallel dsmcInitialise 4
+runParallel dsmcFoam 4
 runApplication reconstructPar -noLagrangian
 
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun
index 402135df74..b369081128 100755
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun
@@ -4,8 +4,7 @@
 
 runApplication blockMesh
 runApplication decomposePar
-runParallel dsmcInitialise 4 system/machines
-hostname > system/machines
-runParallel dsmcFoam 4 system/machines
+runParallel dsmcInitialise 4
+runParallel dsmcFoam 4
 runApplication reconstructPar -noLagrangian
 
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun
index defa2cb875..0e158046d9 100755
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun
@@ -8,9 +8,8 @@ application=`getApplication`
 runApplication blockMesh
 
 runApplication decomposePar
-hostname > system/machines
 
-runParallel mdInitialise 4 system/machines
-runParallel $application 4 system/machines
+runParallel mdInitialise 4
+runParallel $application 4
 
 runApplication reconstructPar
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
index c3c4b5e504..9acc76c443 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
@@ -41,8 +41,7 @@ do
 done
 
 # Run
-hostname > system/machines
-runParallel chtMultiRegionFoam 4 system/machines
+runParallel chtMultiRegionFoam 4
 
 # Reconstruct
 for i in bottomAir topAir heater leftSolid rightSolid
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/Allrun b/tutorials/mesh/snappyHexMesh/multiRegionMesh/Allrun
index 28b6133b28..5b96ab937d 100755
--- a/tutorials/mesh/snappyHexMesh/multiRegionMesh/Allrun
+++ b/tutorials/mesh/snappyHexMesh/multiRegionMesh/Allrun
@@ -38,8 +38,7 @@ runApplication chtMultiRegionFoam
 #done
 #
 ## Run
-#hostname > system/machines
-#runParallel chtMultiRegionFoam 4 system/machines
+#runParallel chtMultiRegionFoam 4
 #
 ## Reconstruct
 #for i in bottomAir topAir heater leftSolid rightSolid
diff --git a/tutorials/multiphase/cavitatingFoam/les/Allrun b/tutorials/multiphase/cavitatingFoam/les/Allrun
index ba35093d07..c6b98bda75 100755
--- a/tutorials/multiphase/cavitatingFoam/les/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/les/Allrun
@@ -36,8 +36,7 @@ cd throttle3D
     mapFields ../throttle -sourceTime latestTime >& log.mapFields
 
     runApplication decomposePar
-    hostname > system/machines
-    runParallel $application 4 system/machines
+    runParallel $application 4
     runApplication reconstructPar
 cd ..
 
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun
index 0f09de5ddc..695ef4d671 100755
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun
@@ -10,6 +10,5 @@ cp 0/alpha1.org 0/alpha1
 cp 0/p.org 0/p
 runApplication setFields
 runApplication decomposePar
-hostname > system/machines
-runParallel $application 4 system/machines
+runParallel $application 4
 runApplication reconstructPar
diff --git a/tutorials/multiphase/interFoam/laminar/Allrun b/tutorials/multiphase/interFoam/laminar/Allrun
index 22d86c6b68..03ffbeecde 100755
--- a/tutorials/multiphase/interFoam/laminar/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/Allrun
@@ -42,7 +42,6 @@ cd damBreakFine
     runApplication blockMesh
     runApplication setFields
     runApplication decomposePar
-    hostname > system/machines
-    runParallel $application 4 system/machines
+    runParallel $application 4
     runApplication reconstructPar
 cd ..
diff --git a/tutorials/multiphase/interFoam/ras/Allrun b/tutorials/multiphase/interFoam/ras/Allrun
index 45bd89d849..c01559fc77 100755
--- a/tutorials/multiphase/interFoam/ras/Allrun
+++ b/tutorials/multiphase/interFoam/ras/Allrun
@@ -38,7 +38,6 @@ cd damBreakFine
     runApplication blockMesh
     runApplication setFields
     runApplication decomposePar
-    hostname > system/machines
-    runParallel $application 4 system/machines
+    runParallel $application 4
     runApplication reconstructPar
 cd ..

From 439af63d58fbe1742912e4195f7cdd7b99da2875 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 10 Jul 2009 12:49:23 +0100
Subject: [PATCH 73/84] moved g initialisation above sub-model creation to
 avoid sigsev

---
 src/lagrangian/dieselSpray/spray/spray.C |  2 +-
 src/lagrangian/dieselSpray/spray/spray.H | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/lagrangian/dieselSpray/spray/spray.C b/src/lagrangian/dieselSpray/spray/spray.C
index b6ab574d1d..3280fefdc9 100644
--- a/src/lagrangian/dieselSpray/spray/spray.C
+++ b/src/lagrangian/dieselSpray/spray/spray.C
@@ -67,6 +67,7 @@ Foam::spray::spray
     time0_(runTime_.value()),
     mesh_(U.mesh()),
     rndGen_(label(0)),
+    g_(g.value()),
 
     U_(U),
     rho_(rho),
@@ -181,7 +182,6 @@ Foam::spray::spray
     ),
 
     subCycles_(readLabel(sprayProperties_.lookup("subCycles"))),
-    g_(g.value()),
 
     gasProperties_(gasProperties),
     composition_(composition),
diff --git a/src/lagrangian/dieselSpray/spray/spray.H b/src/lagrangian/dieselSpray/spray/spray.H
index 27ec6a43ec..60127656e7 100644
--- a/src/lagrangian/dieselSpray/spray/spray.H
+++ b/src/lagrangian/dieselSpray/spray/spray.H
@@ -79,6 +79,9 @@ class spray
             //- Random number generator
             Random rndGen_;
 
+        //- Acceleration due to gravity
+        const vector& g_;
+
 
         // References to the physical fields
 
@@ -93,14 +96,14 @@ class spray
 
 
         //- Ambient Pressure
-            scalar ambientPressure_;
+        scalar ambientPressure_;
 
         //- Ambient Temperature
-            scalar ambientTemperature_;
+        scalar ambientTemperature_;
 
 
         //- The injectors
-            IOPtrList<injector> injectors_;
+        IOPtrList<injector> injectors_;
 
 
         // References to the spray sub-models
@@ -121,10 +124,6 @@ class spray
         const label subCycles_;
 
 
-        //- Acceleration due to gravity
-        const vector& g_;
-
-
         // Composition properties
 
             const PtrList<gasThermoPhysics>& gasProperties_;

From 90298600e07ddcdda745ced8e9528abfddf80e76 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Fri, 10 Jul 2009 12:59:51 +0100
Subject: [PATCH 74/84] Corrected buoyancy BCs for p.

---
 bin/tools/RunFunctions                        |  7 +-
 .../XiFoam/les/pitzDaily/constant/g           |  3 +-
 .../XiFoam/les/pitzDaily3D/constant/g         |  3 +-
 .../combustion/dieselFoam/aachenBomb/0/p      | 10 +--
 .../engineFoam/kivaTest/-180/epsilon          |  6 +-
 .../combustion/engineFoam/kivaTest/-180/k     |  6 +-
 .../multiRegionMesh/constant/topAir/g         |  1 +
 .../bubbleFoam/bubbleColumn/0.org/p           | 11 +--
 .../multiphase/bubbleFoam/bubbleColumn/0/p    | 13 +--
 .../MRFInterFoam/mixerVessel2D/Allrun         |  2 +-
 .../multiphase/interFoam/laminar/damBreak/0/p |  9 ++-
 .../multiphase/interFoam/ras/damBreak/0/p     |  9 ++-
 .../laminar/damBreak4phase/0/p                |  9 ++-
 .../laminar/damBreak4phaseFine/0/p            |  9 ++-
 .../multiphase/settlingFoam/ras/dahl/0/p      | 18 +++--
 .../multiphase/settlingFoam/ras/tank3D/0/p    | 79 +++++++++++--------
 .../multiphase/twoPhaseEulerFoam/bed/0/p      |  6 +-
 .../twoPhaseEulerFoam/bubbleColumn/0/p        | 13 +--
 18 files changed, 123 insertions(+), 91 deletions(-)
 mode change 100644 => 120000 tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/g

diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions
index 62ce3e27ef..e2c335b05b 100644
--- a/bin/tools/RunFunctions
+++ b/bin/tools/RunFunctions
@@ -37,12 +37,13 @@ getApplication ()
 runApplication ()
 {
     APP_RUN=$1; shift
+    APP_NAME=${APP_RUN##*/}
 
-    if [ -f log.$APP_RUN ] ; then
-        echo "$APP_RUN already run on $PWD: remove log file to run"
+    if [ -f log.$APP_NAME ] ; then
+        echo "$APP_NAME already run on $PWD: remove log file to run"
     else
         echo "Running $APP_RUN on $PWD"
-        $APP_RUN $* > log.$APP_RUN 2>&1
+        $APP_RUN $* > log.$APP_NAME 2>&1
     fi
 }
 
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/g b/tutorials/combustion/XiFoam/les/pitzDaily/constant/g
index 2b77c937a2..7b4411955d 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/g
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/g
@@ -16,7 +16,6 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 1 -2 0 0 0 0];
-value           ( 0 -9.81 0 );
-
+value           (0 0 0);
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g
index 057403310a..d182180d95 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g
@@ -16,7 +16,6 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 1 -2 0 0 0 0];
-value           ( 0 0 0 );
-
+value           (0 0 0);
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/p b/tutorials/combustion/dieselFoam/aachenBomb/0/p
index bc33200d5e..b5ab5ef15b 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/0/p
+++ b/tutorials/combustion/dieselFoam/aachenBomb/0/p
@@ -22,19 +22,19 @@ boundaryField
 {
     walls
     {
-        type                zeroGradient;
+        type            buoyantPressure;
+        value           uniform 5e+06;
     }
-    
+
     front
     {
-        type                wedge;
+        type            wedge;
     }
 
     back
     {
-        type                wedge;
+        type            wedge;
     }
-
 }
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/epsilon b/tutorials/combustion/engineFoam/kivaTest/-180/epsilon
index a686c35955..f52dbcdfbf 100644
--- a/tutorials/combustion/engineFoam/kivaTest/-180/epsilon
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/epsilon
@@ -23,17 +23,17 @@ boundaryField
 {
     piston
     {
-        type            epsilonWallFunction;
+        type            compressible::epsilonWallFunction;
         value           uniform 450;
     }
     liner
     {
-        type            epsilonWallFunction;
+        type            compressible::epsilonWallFunction;
         value           uniform 450;
     }
     cylinderHead
     {
-        type            epsilonWallFunction;
+        type            compressible::epsilonWallFunction;
         value           uniform 450;
     }
 }
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/k b/tutorials/combustion/engineFoam/kivaTest/-180/k
index e643a368e6..b97d4da7fd 100644
--- a/tutorials/combustion/engineFoam/kivaTest/-180/k
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/k
@@ -23,17 +23,17 @@ boundaryField
 {
     piston
     {
-        type            kQRWallFunction;
+        type            compressible::kQRWallFunction;
         value           uniform 4;
     }
     liner
     {
-        type            kQRWallFunction;
+        type            compressible::kQRWallFunction;
         value           uniform 4;
     }
     cylinderHead
     {
-        type            kQRWallFunction;
+        type            compressible::kQRWallFunction;
         value           uniform 4;
     }
 }
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/g b/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/g
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/g b/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/g
new file mode 120000
index 0000000000..fe0384ff08
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/g
@@ -0,0 +1 @@
+../bottomAir/g
\ No newline at end of file
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p
index ced7047d43..841cfca2e6 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p
@@ -20,23 +20,24 @@ internalField   uniform 0;
 
 boundaryField
 {
-    inlet           
+    inlet
     {
         type            zeroGradient;
     }
 
-    outlet          
+    outlet
     {
         type            fixedValue;
         value           uniform 0;
     }
 
-    walls           
+    walls
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
-    defaultFaces    
+    defaultFaces
     {
         type            empty;
     }
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p
index 339131c645..e247f867f5 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p
@@ -16,7 +16,7 @@ FoamFile
 
 dimensions      [1 -1 -2 0 0 0 0];
 
-internalField   nonuniform List<scalar> 
+internalField   nonuniform List<scalar>
 1875
 (
 6296.13
@@ -1899,23 +1899,24 @@ internalField   nonuniform List<scalar>
 
 boundaryField
 {
-    inlet           
+    inlet
     {
         type            zeroGradient;
     }
 
-    outlet          
+    outlet
     {
         type            fixedValue;
         value           uniform 0;
     }
 
-    walls           
+    walls
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
-    defaultFaces    
+    defaultFaces
     {
         type            empty;
     }
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun
index 836276fe9c..99a20900eb 100755
--- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun
@@ -5,5 +5,5 @@
 
 application=`getApplication`
 
-./makeMesh
+runApplication ./makeMesh
 runApplication $application
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/0/p b/tutorials/multiphase/interFoam/laminar/damBreak/0/p
index 15ab9897a8..f8cc9e9f25 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/0/p
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/0/p
@@ -22,17 +22,20 @@ boundaryField
 {
     leftWall
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     rightWall
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     lowerWall
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     atmosphere
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/p b/tutorials/multiphase/interFoam/ras/damBreak/0/p
index 15ab9897a8..f8cc9e9f25 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/0/p
+++ b/tutorials/multiphase/interFoam/ras/damBreak/0/p
@@ -22,17 +22,20 @@ boundaryField
 {
     leftWall
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     rightWall
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     lowerWall
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     atmosphere
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p
index 15ab9897a8..f8cc9e9f25 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p
@@ -22,17 +22,20 @@ boundaryField
 {
     leftWall
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     rightWall
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     lowerWall
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     atmosphere
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/p b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/p
index 15ab9897a8..f8cc9e9f25 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/p
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/p
@@ -22,17 +22,20 @@ boundaryField
 {
     leftWall
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     rightWall
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     lowerWall
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     atmosphere
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/0/p b/tutorials/multiphase/settlingFoam/ras/dahl/0/p
index 2f9b3db7ac..a19f18a1fd 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/0/p
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/0/p
@@ -20,33 +20,35 @@ internalField   uniform 0;
 
 boundaryField
 {
-    inlet           
+    inlet
     {
         type            zeroGradient;
     }
 
-    outlet          
+    outlet
     {
         type            fixedValue;
         value           uniform 0;
     }
 
-    bottomWall      
+    bottomWall
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
-    endWall         
+    endWall
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
-    top             
+    top
     {
         type            symmetryPlane;
     }
 
-    frontAndBack    
+    frontAndBack
     {
         type            empty;
     }
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/0/p b/tutorials/multiphase/settlingFoam/ras/tank3D/0/p
index d12a701172..02b3ad272c 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/0/p
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/0/p
@@ -20,102 +20,115 @@ internalField   uniform 0;
 
 boundaryField
 {
-    SYMP3           
+    SYMP3
     {
         type            symmetryPlane;
     }
 
-    INLE1           
+    INLE1
     {
         type            zeroGradient;
     }
 
-    OUTL9           
+    OUTL9
     {
         type            zeroGradient;
     }
 
-    OUTL10          
+    OUTL10
     {
         type            zeroGradient;
     }
 
-    OUTL11          
+    OUTL11
     {
         type            zeroGradient;
     }
 
-    OUTL12          
+    OUTL12
     {
         type            zeroGradient;
     }
 
-    WALL6           
+    WALL6
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
-    WALL8           
+    WALL8
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
-    WALL61          
+    WALL61
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
-    WALL62          
+    WALL62
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
-    WALL63          
+    WALL63
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
-    WALL64          
+    WALL64
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
-    WALL65          
+    WALL65
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
-    WALL66          
+    WALL66
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
-    WALL67          
+    WALL67
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
-    WALL68          
+    WALL68
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
-    WALL69          
+    WALL69
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
-    WALL7           
+    WALL7
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
-    WALL70          
+    WALL70
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
-    OUTL15          
+    OUTL15
     {
         type            fixedValue;
         value           uniform 0;
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/p b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/p
index 6dc161ca6f..9c8370323f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/p
@@ -22,7 +22,8 @@ boundaryField
 {
     bottom
     {
-        type               zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     top
@@ -33,7 +34,8 @@ boundaryField
 
     walls
     {
-        type               zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     frontBack
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p
index 339131c645..e247f867f5 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p
@@ -16,7 +16,7 @@ FoamFile
 
 dimensions      [1 -1 -2 0 0 0 0];
 
-internalField   nonuniform List<scalar> 
+internalField   nonuniform List<scalar>
 1875
 (
 6296.13
@@ -1899,23 +1899,24 @@ internalField   nonuniform List<scalar>
 
 boundaryField
 {
-    inlet           
+    inlet
     {
         type            zeroGradient;
     }
 
-    outlet          
+    outlet
     {
         type            fixedValue;
         value           uniform 0;
     }
 
-    walls           
+    walls
     {
-        type            zeroGradient;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
-    defaultFaces    
+    defaultFaces
     {
         type            empty;
     }

From 44e5bf5fac8cbfd321fd5e1e78f671bd0b2af7d5 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 10 Jul 2009 13:32:37 +0100
Subject: [PATCH 75/84] cosmetics - output message

---
 .../clouds/Templates/KinematicCloud/KinematicCloud.C          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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       = "

From bda2936ee740873beb475316e746a54775efaa49 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 10 Jul 2009 13:38:11 +0100
Subject: [PATCH 76/84] moved warning messages to within debug scope

---
 src/thermophysicalModels/solids/C/C.C         | 9 ++++++---
 src/thermophysicalModels/solids/CaCO3/CaCO3.C | 9 ++++++---
 src/thermophysicalModels/solids/ash/ash.C     | 9 ++++++---
 3 files changed, 18 insertions(+), 9 deletions(-)

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;
+    }
 }
 
 

From 52e1525df7963d6b29a291657aeb76e3e1b5d5f2 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 10 Jul 2009 13:39:48 +0100
Subject: [PATCH 77/84] removed info msg - handled already by factory new
 method

---
 .../radiation/include/createRadiationModel.H                     | 1 -
 1 file changed, 1 deletion(-)

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())

From 028cd0ede2354f0aa7ce4a1e4330ca0698a8916a Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 10 Jul 2009 14:33:11 +0100
Subject: [PATCH 78/84] updated header comment

---
 .../Kinematic/InjectionModel/InjectionModel/InjectionModel.H  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index ad42a27030..05e009f4c6 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]

From 5a83c4660cbb707e1fcd75522ab66d6063fcd64c Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Fri, 10 Jul 2009 14:42:23 +0100
Subject: [PATCH 79/84] Added rho for the buoyantPressure BC.

---
 .../solvers/multiphase/bubbleFoam/alphaEqn.H     |  2 ++
 .../solvers/multiphase/bubbleFoam/createFields.H | 10 ++++++++++
 .../multiphase/twoPhaseEulerFoam/alphaEqn.H      |  2 ++
 .../multiphase/twoPhaseEulerFoam/createFields.H  | 10 ++++++++++
 .../ras/throttle/constant/polyMesh/boundary      | 16 ++++++++--------
 5 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/applications/solvers/multiphase/bubbleFoam/alphaEqn.H b/applications/solvers/multiphase/bubbleFoam/alphaEqn.H
index 065aa19c6c..a985c6eb95 100644
--- a/applications/solvers/multiphase/bubbleFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/bubbleFoam/alphaEqn.H
@@ -46,3 +46,5 @@
         << "  Max(alpha) = " << max(alpha).value()
         << endl;
 }
+
+rho = alpha*rhoa + beta*rhob;
diff --git a/applications/solvers/multiphase/bubbleFoam/createFields.H b/applications/solvers/multiphase/bubbleFoam/createFields.H
index 9aca6933fc..9367838a52 100644
--- a/applications/solvers/multiphase/bubbleFoam/createFields.H
+++ b/applications/solvers/multiphase/bubbleFoam/createFields.H
@@ -156,6 +156,16 @@
       + fvc::interpolate(beta)*phib
     );
 
+    volScalarField rho
+    (
+        IOobject
+        (
+            "rho",
+            runTime.timeName(),
+            mesh
+        ),
+        alpha*rhoa + beta*rhob
+    );
 
     #include "createRASTurbulence.H"
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/alphaEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/alphaEqn.H
index e8b056ed7e..47057c0efb 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/alphaEqn.H
@@ -52,3 +52,5 @@
             << endl;
     }
 }
+
+rho = alpha*rhoa + beta*rhob;
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
index 1fdaf944bb..8a17615715 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
@@ -145,6 +145,16 @@
         fvc::interpolate(alpha)*phia + fvc::interpolate(beta)*phib
     );
 
+    volScalarField rho
+    (
+        IOobject
+        (
+            "rho",
+            runTime.timeName(),
+            mesh
+        ),
+        alpha*rhoa + beta*rhob
+    );
 
     IOdictionary RASProperties
     (
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary
index 59f24d80d0..03d26bcf3c 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -21,25 +21,25 @@ FoamFile
     {
         type            patch;
         nFaces          51;
-        startFace       15151;
+        startFace       57362;
     }
     outlet
     {
         type            patch;
         nFaces          51;
-        startFace       15202;
+        startFace       57413;
     }
     walls
     {
         type            wall;
-        nFaces          436;
-        startFace       15253;
+        nFaces          836;
+        startFace       57464;
     }
     frontBack
     {
         type            empty;
-        nFaces          15420;
-        startFace       15689;
+        nFaces          57540;
+        startFace       58300;
     }
 )
 

From 40877432e8e316e4b25af701f13f557c1d39e4b4 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 10 Jul 2009 14:52:17 +0100
Subject: [PATCH 80/84] removed volumeFraction - unnecessary

---
 .../InjectionModel/InjectionModel/InjectionModel.C   | 12 ++++--------
 .../InjectionModel/InjectionModel/InjectionModel.H   |  4 ----
 .../InjectionModel/InjectionModel/InjectionModelI.H  | 10 ----------
 3 files changed, 4 insertions(+), 22 deletions(-)

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 05e009f4c6..dc3b9ff61b 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -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_;
-}
-
-
 // ************************************************************************* //

From 9ef30424ccb28b11fc0113ee0e47fb64ba2133fa Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Fri, 10 Jul 2009 16:50:00 +0100
Subject: [PATCH 81/84] Type in SymmTensor.H, six components, not nine.

---
 src/OpenFOAM/primitives/SymmTensor/SymmTensor.H | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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,

From 2158923839b21f47f36a73b1a714ef803a186062 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 10 Jul 2009 17:27:35 +0100
Subject: [PATCH 82/84] updating to use wall function framework - had been
 missed

---
 .../RAS/LaunderSharmaKE/LaunderSharmaKE.C     | 52 ++++++++++++++++---
 .../RAS/LaunderSharmaKE/LaunderSharmaKE.H     | 30 ++++++-----
 .../RAS/SpalartAllmaras/SpalartAllmaras.C     | 30 ++++++++++-
 .../RAS/SpalartAllmaras/SpalartAllmaras.H     | 33 +++++++-----
 .../RAS/LamBremhorstKE/LamBremhorstKE.C       | 28 ++++++++--
 5 files changed, 136 insertions(+), 37 deletions(-)

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/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/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();
 }
 
 

From 26e04aab19a86d8eb4f86119e7464a69d89e437c Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 10 Jul 2009 17:53:12 +0100
Subject: [PATCH 83/84] tidying headers + assignments to turb fields

---
 src/turbulenceModels/compressible/RAS/LRR/LRR.C        |  6 +++---
 .../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C          | 10 ++++------
 .../compressible/RAS/RNGkEpsilon/RNGkEpsilon.C         |  9 ++++-----
 .../compressible/RAS/kEpsilon/kEpsilon.C               |  9 ++++-----
 .../compressible/RAS/kOmegaSST/kOmegaSST.C             |  9 ++++-----
 .../compressible/RAS/realizableKE/realizableKE.C       |  9 ++++-----
 src/turbulenceModels/incompressible/RAS/LRR/LRR.C      |  4 ++--
 .../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C          |  2 +-
 .../incompressible/RAS/LienCubicKE/LienCubicKE.C       |  5 ++---
 .../incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C       |  5 ++---
 .../incompressible/RAS/kEpsilon/kEpsilon.C             |  1 -
 .../incompressible/RAS/kOmega/kOmega.C                 |  5 ++---
 .../incompressible/RAS/kOmegaSST/kOmegaSST.C           |  5 ++---
 .../incompressible/RAS/realizableKE/realizableKE.C     |  5 ++---
 14 files changed, 36 insertions(+), 48 deletions(-)

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/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/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/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/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/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();
 }
 

From a8f0153506aac9889f1165846cdf4c1c94ccd9c6 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 10 Jul 2009 19:21:21 +0100
Subject: [PATCH 84/84] code clean-up

---
 .../MeshedSurfaceIOAllocator.C                |   4 -
 .../MeshedSurfaceIOAllocator.H                |   3 +-
 .../MeshedSurfaceProxy/MeshedSurfaceProxy.C   |  17 --
 .../MeshedSurfaceProxy/MeshedSurfaceProxy.H   |  81 ++++----
 .../UnsortedMeshedSurface.C                   |  12 --
 .../UnsortedMeshedSurface.H                   | 174 +++++++++---------
 .../UnsortedMeshedSurfaceNew.C                |   4 +-
 .../UnsortedMeshedSurfacesFwd.H               |   2 +
 .../surfFields/surfFields/surfGeoMesh.H       |   1 -
 .../surfPointFields/surfPointGeoMesh.H        |   1 -
 src/surfMesh/surfMesh/surfMesh.C              |   7 +-
 src/surfMesh/surfMesh/surfMesh.H              |   7 +-
 src/surfMesh/surfMesh/surfMeshIO.C            |   2 -
 src/surfMesh/surfZone/surfZone/surfZone.C     |   1 -
 src/surfMesh/surfZone/surfZone/surfZone.H     |   2 +
 .../surfZone/surfZone/surfZoneIOList.C        |   5 -
 .../surfZone/surfZone/surfZoneIOList.H        |  10 +-
 .../surfZoneIdentifier/surfZoneIdentifier.C   |   4 +-
 .../surfZoneIdentifier/surfZoneIdentifier.H   |   1 +
 .../surfaceFormats/ac3d/AC3DsurfaceFormat.C   |   6 +-
 .../surfaceFormats/ac3d/AC3DsurfaceFormat.H   |   5 +-
 .../ac3d/AC3DsurfaceFormatCore.C              |   3 -
 .../ac3d/AC3DsurfaceFormatCore.H              |  36 ++--
 .../ac3d/AC3DsurfaceFormatCoreTemplates.C     |   1 -
 .../ac3d/AC3DsurfaceFormatRunTime.C           |   1 +
 .../surfaceFormats/ftr/FTRsurfaceFormat.C     |   3 +-
 .../surfaceFormats/ftr/FTRsurfaceFormat.H     |   4 +-
 .../ftr/FTRsurfaceFormatRunTime.C             |   1 +
 .../surfaceFormats/gts/GTSsurfaceFormat.C     |   4 -
 .../surfaceFormats/gts/GTSsurfaceFormat.H     |  12 +-
 .../gts/GTSsurfaceFormatRunTime.C             |   1 +
 .../surfaceFormats/nas/NASsurfaceFormat.C     |   6 +-
 .../surfaceFormats/nas/NASsurfaceFormat.H     |   5 +-
 .../surfaceFormats/nas/NASsurfaceFormatCore.C |   4 -
 .../surfaceFormats/nas/NASsurfaceFormatCore.H |   8 +-
 .../nas/NASsurfaceFormatRunTime.C             |   1 +
 .../surfaceFormats/obj/OBJsurfaceFormat.C     |   2 -
 .../surfaceFormats/obj/OBJsurfaceFormat.H     |   4 +-
 .../obj/OBJsurfaceFormatRunTime.C             |   1 +
 .../surfaceFormats/off/OFFsurfaceFormat.C     |   8 +-
 .../surfaceFormats/off/OFFsurfaceFormat.H     |  12 +-
 .../off/OFFsurfaceFormatRunTime.C             |   1 +
 .../surfaceFormats/ofs/OFSsurfaceFormat.C     |   3 +-
 .../surfaceFormats/ofs/OFSsurfaceFormat.H     |   6 +-
 .../surfaceFormats/ofs/OFSsurfaceFormatCore.C |   4 -
 .../surfaceFormats/ofs/OFSsurfaceFormatCore.H |  16 +-
 .../ofs/OFSsurfaceFormatRunTime.C             |   1 +
 .../surfaceFormats/smesh/SMESHsurfaceFormat.C |   5 +-
 .../surfaceFormats/smesh/SMESHsurfaceFormat.H |   4 +-
 .../smesh/SMESHsurfaceFormatRunTime.C         |   1 +
 .../starcd/STARCDsurfaceFormat.C              |   3 +-
 .../starcd/STARCDsurfaceFormat.H              |  12 +-
 .../starcd/STARCDsurfaceFormatCore.C          |   3 -
 .../starcd/STARCDsurfaceFormatCore.H          |   4 +-
 .../starcd/STARCDsurfaceFormatRunTime.C       |   1 +
 src/surfMesh/surfaceFormats/stl/STLpoint.H    |   1 -
 .../surfaceFormats/stl/STLsurfaceFormat.C     |   3 +-
 .../surfaceFormats/stl/STLsurfaceFormat.H     |  13 +-
 .../surfaceFormats/stl/STLsurfaceFormatCore.C |   3 +-
 .../surfaceFormats/stl/STLsurfaceFormatCore.H |   9 +-
 .../stl/STLsurfaceFormatRunTime.C             |   1 +
 src/surfMesh/surfaceFormats/stl/STLtriangle.H |   3 +
 .../surfaceFormats/stl/STLtriangleI.H         |   9 +-
 .../surfaceFormats/surfaceFormatsCore.C       |  33 +---
 .../surfaceFormats/surfaceFormatsCore.H       |  19 +-
 .../surfaceFormats/tri/TRIsurfaceFormat.C     |   3 +-
 .../surfaceFormats/tri/TRIsurfaceFormat.H     |  12 +-
 .../surfaceFormats/tri/TRIsurfaceFormatCore.C |   5 +-
 .../surfaceFormats/tri/TRIsurfaceFormatCore.H |   7 +-
 .../tri/TRIsurfaceFormatRunTime.C             |   1 +
 .../surfaceFormats/vtk/VTKsurfaceFormat.C     |   3 +-
 .../surfaceFormats/vtk/VTKsurfaceFormat.H     |  28 +--
 .../surfaceFormats/vtk/VTKsurfaceFormatCore.C |   4 -
 .../surfaceFormats/vtk/VTKsurfaceFormatCore.H |  22 +--
 .../vtk/VTKsurfaceFormatRunTime.C             |   1 +
 .../surfaceFormats/wrl/WRLsurfaceFormat.C     |   3 -
 .../surfaceFormats/wrl/WRLsurfaceFormat.H     |   2 -
 .../surfaceFormats/wrl/WRLsurfaceFormatCore.C |   8 +-
 .../wrl/WRLsurfaceFormatRunTime.C             |   1 +
 .../surfaceFormats/x3d/X3DsurfaceFormat.C     |   2 -
 .../surfaceFormats/x3d/X3DsurfaceFormat.H     |   2 -
 .../surfaceFormats/x3d/X3DsurfaceFormatCore.C |   4 -
 .../surfaceRegistry/surfaceRegistry.C         |   2 -
 .../surfaceRegistry/surfaceRegistry.H         |   2 +-
 84 files changed, 322 insertions(+), 414 deletions(-)

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();
-
 };