From a5df0008b61af8122f7638547684e6c6c6e4f059 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 13 Jan 2009 15:36:50 +0000
Subject: [PATCH 001/175] renamed mass transfer model to devolatilisation model

---
 src/lagrangian/intermediate/Make/files        |  2 +-
 .../Templates/ReactingCloud/ReactingCloud.C   |  6 +--
 .../Templates/ReactingCloud/ReactingCloud.H   | 16 ++++----
 .../Templates/ReactingCloud/ReactingCloudI.H  |  6 +--
 .../Templates/ReactingParcel/ReactingParcel.C | 28 ++++++-------
 .../Templates/ReactingParcel/ReactingParcel.H |  4 +-
 ...sicReactingParcelDevolatilisationModels.C} | 12 +++---
 .../ConstantRateDevolatilisation.C            |  4 +-
 .../ConstantRateDevolatilisation.H            |  6 +--
 .../DevolatilisationModel.C}                  | 14 +++----
 .../DevolatilisationModel.H}                  | 41 +++++++++----------
 .../NewDevolatilisationModel.C}               | 25 +++++------
 .../NoDevolatilisation/NoDevolatilisation.C}  | 12 +++---
 .../NoDevolatilisation/NoDevolatilisation.H}  | 26 ++++++------
 .../SingleKineticRateDevolatilisation.C       |  4 +-
 .../SingleKineticRateDevolatilisation.H       |  6 +--
 16 files changed, 106 insertions(+), 106 deletions(-)
 rename src/lagrangian/intermediate/parcels/derived/basicReactingParcel/{makeBasicReactingParcelMassTransferModels.C => makeBasicReactingParcelDevolatilisationModels.C} (88%)
 rename src/lagrangian/intermediate/submodels/Reacting/{MassTransferModel => DevolatilisationModel}/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C (95%)
 rename src/lagrangian/intermediate/submodels/Reacting/{MassTransferModel => DevolatilisationModel}/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H (95%)
 rename src/lagrangian/intermediate/submodels/Reacting/{MassTransferModel/MassTransferModel/MassTransferModel.C => DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C} (82%)
 rename src/lagrangian/intermediate/submodels/Reacting/{MassTransferModel/MassTransferModel/MassTransferModel.H => DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H} (82%)
 rename src/lagrangian/intermediate/submodels/Reacting/{MassTransferModel/MassTransferModel/NewMassTransferModel.C => DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C} (73%)
 rename src/lagrangian/intermediate/submodels/Reacting/{MassTransferModel/NoMassTransfer/NoMassTransfer.C => DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C} (86%)
 rename src/lagrangian/intermediate/submodels/Reacting/{MassTransferModel/NoMassTransfer/NoMassTransfer.H => DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H} (82%)
 rename src/lagrangian/intermediate/submodels/Reacting/{MassTransferModel => DevolatilisationModel}/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C (95%)
 rename src/lagrangian/intermediate/submodels/Reacting/{MassTransferModel => DevolatilisationModel}/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H (95%)

diff --git a/src/lagrangian/intermediate/Make/files b/src/lagrangian/intermediate/Make/files
index ab3933d123..129319f042 100644
--- a/src/lagrangian/intermediate/Make/files
+++ b/src/lagrangian/intermediate/Make/files
@@ -36,7 +36,7 @@ parcels/derived/basicReactingParcel/makeBasicReactingParcelDragModels.C
 parcels/derived/basicReactingParcel/makeBasicReactingParcelDispersionModels.C
 parcels/derived/basicReactingParcel/makeBasicReactingParcelInjectionModels.C
 parcels/derived/basicReactingParcel/makeBasicReactingParcelHeatTransferModels.C
-parcels/derived/basicReactingParcel/makeBasicReactingParcelMassTransferModels.C
+parcels/derived/basicReactingParcel/makeBasicReactingParcelDevolatilisationModels.C
 parcels/derived/basicReactingParcel/makeBasicReactingParcelSurfaceReactionModels.C
 parcels/derived/basicReactingParcel/makeBasicReactingParcelWallInteractionModels.C
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
index b574435cb8..1132bd8f29 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -26,7 +26,7 @@ License
 
 #include "ReactingCloud.H"
 #include "CompositionModel.H"
-#include "MassTransferModel.H"
+#include "DevolatilisationModel.H"
 #include "SurfaceReactionModel.H"
 
 // * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * * //
@@ -91,9 +91,9 @@ Foam::ReactingCloud<ParcelType>::ReactingCloud
             *this
         )
     ),
-    massTransferModel_
+    devolatilisationModel_
     (
-        MassTransferModel<ReactingCloud<ParcelType> >::New
+        DevolatilisationModel<ReactingCloud<ParcelType> >::New
         (
             this->particleProperties(),
             *this
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
index 0e3f97320a..810b08235a 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
@@ -58,7 +58,7 @@ template<class CloudType>
 class CompositionModel;
 
 template<class CloudType>
-class MassTransferModel;
+class DevolatilisationModel;
 
 template<class CloudType>
 class SurfaceReactionModel;
@@ -91,9 +91,9 @@ class ReactingCloud
             autoPtr<CompositionModel<ReactingCloud<ParcelType> > >
                 compositionModel_;
 
-            //- Mass transfer model
-            autoPtr<MassTransferModel<ReactingCloud<ParcelType> > >
-                massTransferModel_;
+            //- Devolatilisation model
+            autoPtr<DevolatilisationModel<ReactingCloud<ParcelType> > >
+                devolatilisationModel_;
 
             //- Surface reaction model
             autoPtr<SurfaceReactionModel<ReactingCloud<ParcelType> > >
@@ -101,7 +101,7 @@ class ReactingCloud
 
         // Sources
 
-            //- Mass transfer fields - one per carrier phase specie
+            //- Devolatilisation fields - one per carrier phase specie
             PtrList<DimensionedField<scalar, volMesh> > rhoTrans_;
 
 
@@ -159,9 +159,9 @@ public:
                 inline const CompositionModel<ReactingCloud<ParcelType> >&
                     composition() const;
 
-                //- Return reference to mass transfer model
-                inline const MassTransferModel<ReactingCloud<ParcelType> >&
-                    massTransfer() const;
+                //- Return reference to devolatilisation model
+                inline const DevolatilisationModel<ReactingCloud<ParcelType> >&
+                    devolatilisation() const;
 
                 //- Return reference to surface reaction model
                 inline const SurfaceReactionModel<ReactingCloud<ParcelType> >&
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
index 016d40d5c0..915196c744 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
@@ -59,10 +59,10 @@ Foam::ReactingCloud<ParcelType>::composition() const
 
 
 template<class ParcelType>
-inline const Foam::MassTransferModel<Foam::ReactingCloud<ParcelType> >&
-Foam::ReactingCloud<ParcelType>::massTransfer() const
+inline const Foam::DevolatilisationModel<Foam::ReactingCloud<ParcelType> >&
+Foam::ReactingCloud<ParcelType>::devolatilisation() const
 {
-    return massTransferModel_;
+    return devolatilisationModel_;
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index 394b3ce38e..4aec91355a 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -94,10 +94,10 @@ void Foam::ReactingParcel<ParcelType>::calcCoupled
     scalar T1 = calcHeatTransfer(td, dt, celli, htc, dhTrans);
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate mass transfer
-    // ~~~~~~~~~~~~~~~~~~~~~~~
-    calcMassTransfer(td, dt, T0, T1, dMassMT);
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Calculate Devolatilisation
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
+    calcDevolatilisation(td, dt, T0, T1, dMassMT);
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -253,10 +253,10 @@ void Foam::ReactingParcel<ParcelType>::calcUncoupled
     scalar T1 = calcHeatTransfer(td, dt, celli, htc, dhTrans);
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate mass transfer
-    // ~~~~~~~~~~~~~~~~~~~~~~~
-    calcMassTransfer(td, dt, T0, T1, dMassMT);
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Calculate Devolatilisation
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
+    calcDevolatilisation(td, dt, T0, T1, dMassMT);
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -311,7 +311,7 @@ void Foam::ReactingParcel<ParcelType>::calcUncoupled
 
 template<class ParcelType>
 template<class TrackData>
-void Foam::ReactingParcel<ParcelType>::calcMassTransfer
+void Foam::ReactingParcel<ParcelType>::calcDevolatilisation
 (
     TrackData& td,
     const scalar dt,
@@ -325,16 +325,16 @@ void Foam::ReactingParcel<ParcelType>::calcMassTransfer
         notImplemented
         (
             "void Foam::ReactingParcel<ParcelType>::"
-            "calcMassTransfer(...): no treatment currently "
+            "calcDevolatilisation(...): no treatment currently "
             "available for particles containing liquid species"
         )
     }
 
     // Check that model is active, and that the parcel temperature is
-    // within necessary limits for mass transfer to occur
+    // within necessary limits for devolatilisation to occur
     if
     (
-        !td.cloud().massTransfer().active()
+        !td.cloud().devolatilisation().active()
      || this->T_<td.constProps().Tvap()
      || this->T_<td.constProps().Tbp()
     )
@@ -344,7 +344,7 @@ void Foam::ReactingParcel<ParcelType>::calcMassTransfer
 
     // Determine mass to add to carrier phase
     const scalar mass = this->mass();
-    const scalar dMassTot = td.cloud().massTransfer().calculate
+    const scalar dMassTot = td.cloud().devolatilisation().calculate
     (
         dt,
         mass0_,
@@ -365,7 +365,7 @@ void Foam::ReactingParcel<ParcelType>::calcMassTransfer
     {
         label id = td.cloud().composition().gasGlobalIds()[i];
 
-        // Mass transfer
+        // Volatiles mass transfer
         scalar volatileMass = YGas_[i]*dMassTot;
         dMassMT[id] += volatileMass;
     }
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index 2a29e35ac5..666e1cf1ff 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -202,9 +202,9 @@ protected:
 
     // Protected member functions
 
-        //- Calculate mass transfer
+        //- Calculate Devolatilisation
         template<class TrackData>
-        void calcMassTransfer
+        void calcDevolatilisation
         (
             TrackData& td,
             const scalar dt,
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelMassTransferModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDevolatilisationModels.C
similarity index 88%
rename from src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelMassTransferModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDevolatilisationModels.C
index 28cc303998..013c4f5cdb 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelMassTransferModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDevolatilisationModels.C
@@ -26,28 +26,28 @@ License
 
 #include "basicReactingParcel.H"
 #include "ThermoCloud.H"
-#include "NoMassTransfer.H"
+#include "NoDevolatilisation.H"
 #include "ConstantRateDevolatilisation.H"
 #include "SingleKineticRateDevolatilisation.H"
 
 namespace Foam
 {
-    makeMassTransferModel(ReactingCloud<basicReactingParcel>);
+    makeDevolatilisationModel(ReactingCloud<basicReactingParcel>);
 
     // Add instances of mass transfer model to the table
-    makeMassTransferModelType
+    makeDevolatilisationModelType
     (
-        NoMassTransfer,
+        NoDevolatilisation,
         ReactingCloud,
         basicReactingParcel
     );
-    makeMassTransferModelType
+    makeDevolatilisationModelType
     (
         ConstantRateDevolatilisation,
         ReactingCloud,
         basicReactingParcel
     );
-    makeMassTransferModelType
+    makeDevolatilisationModelType
     (
         SingleKineticRateDevolatilisation,
         ReactingCloud,
diff --git a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C b/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
similarity index 95%
rename from src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
rename to src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
index 913fa89fc5..bf371114dd 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
@@ -35,7 +35,7 @@ Foam::ConstantRateDevolatilisation<CloudType>::ConstantRateDevolatilisation
     CloudType& owner
 )
 :
-    MassTransferModel<CloudType>(dict, owner, typeName),
+    DevolatilisationModel<CloudType>(dict, owner, typeName),
     A0_(dimensionedScalar(this->coeffDict().lookup("A0")).value()),
     volatileResidualCoeff_
     (
@@ -80,7 +80,7 @@ Foam::scalar Foam::ConstantRateDevolatilisation<CloudType>::calculate
         canCombust = true;
     }
 
-    // Volatile mass transfer from particle to carrier gas phase
+    // Volatile devolatilisation from particle to carrier gas phase
     const scalar dMass = min(dt*A0_*massVolatile0, massVolatile);
 
     return dMass;
diff --git a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
similarity index 95%
rename from src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
rename to src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
index 093a05b327..6d9d223071 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
@@ -34,7 +34,7 @@ Description
 #ifndef ConstantRateDevolatilisation_H
 #define ConstantRateDevolatilisation_H
 
-#include "MassTransferModel.H"
+#include "DevolatilisationModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -47,7 +47,7 @@ namespace Foam
 template<class CloudType>
 class ConstantRateDevolatilisation
 :
-    public MassTransferModel<CloudType>
+    public DevolatilisationModel<CloudType>
 {
 
     // Private data
@@ -86,7 +86,7 @@ public:
 
     // Member Functions
 
-        //- Flag to indicate whether model activates mass transfer model
+        //- Flag to indicate whether model activates devolatilisation model
         bool active() const;
 
         //- Update model
diff --git a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/MassTransferModel/MassTransferModel.C b/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C
similarity index 82%
rename from src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/MassTransferModel/MassTransferModel.C
rename to src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C
index fc05b32540..913ea7fa1d 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/MassTransferModel/MassTransferModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C
@@ -24,12 +24,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "MassTransferModel.H"
+#include "DevolatilisationModel.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::MassTransferModel<CloudType>::MassTransferModel
+Foam::DevolatilisationModel<CloudType>::DevolatilisationModel
 (
     const dictionary& dict,
     CloudType& owner,
@@ -44,27 +44,27 @@ Foam::MassTransferModel<CloudType>::MassTransferModel
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::MassTransferModel<CloudType>::~MassTransferModel()
+Foam::DevolatilisationModel<CloudType>::~DevolatilisationModel()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 template<class CloudType>
-const CloudType& Foam::MassTransferModel<CloudType>::owner() const
+const CloudType& Foam::DevolatilisationModel<CloudType>::owner() const
 {
     return owner_;
 }
 
 
 template<class CloudType>
-const Foam::dictionary& Foam::MassTransferModel<CloudType>::dict() const
+const Foam::dictionary& Foam::DevolatilisationModel<CloudType>::dict() const
 {
     return dict_;
 }
 
 
 template<class CloudType>
-const Foam::dictionary& Foam::MassTransferModel<CloudType>::coeffDict() const
+const Foam::dictionary& Foam::DevolatilisationModel<CloudType>::coeffDict() const
 {
     return coeffDict_;
 }
@@ -72,7 +72,7 @@ const Foam::dictionary& Foam::MassTransferModel<CloudType>::coeffDict() const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "NewMassTransferModel.C"
+#include "NewDevolatilisationModel.C"
 
 // ************************************************************************* //
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/MassTransferModel/MassTransferModel.H b/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
similarity index 82%
rename from src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/MassTransferModel/MassTransferModel.H
rename to src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
index 25d476e340..1e7576ccd8 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/MassTransferModel/MassTransferModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
@@ -23,20 +23,19 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::MassTransferModel
-
+    Foam::DevolatilisationModel
 
 Description
-    Templated mass transfer model class
+    Templated devolatilisation model class
 
 SourceFiles
-    MassTransferModel.C
-    NewMassTransferModel.C
+    DevolatilisationModel.C
+    NewDevolatilisationModel.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef MassTransferModel_H
-#define MassTransferModel_H
+#ifndef DevolatilisationModel_H
+#define DevolatilisationModel_H
 
 #include "IOdictionary.H"
 #include "autoPtr.H"
@@ -48,11 +47,11 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                      Class MassTransferModel Declaration
+                      Class DevolatilisationModel Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class CloudType>
-class MassTransferModel
+class DevolatilisationModel
 {
 
 protected:
@@ -72,13 +71,13 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("MassTransferModel");
+    TypeName("DevolatilisationModel");
 
     //- Declare runtime constructor selection table
     declareRunTimeSelectionTable
     (
         autoPtr,
-        MassTransferModel,
+        DevolatilisationModel,
         dictionary,
         (
             const dictionary& dict,
@@ -91,7 +90,7 @@ public:
     // Constructors
 
         //- Construct from dictionary
-        MassTransferModel
+        DevolatilisationModel
         (
             const dictionary& dict,
             CloudType& owner,
@@ -101,12 +100,12 @@ public:
 
     // Destructor
 
-        virtual ~MassTransferModel();
+        virtual ~DevolatilisationModel();
 
 
     // Selector
 
-        static autoPtr<MassTransferModel<CloudType> > New
+        static autoPtr<DevolatilisationModel<CloudType> > New
         (
             const dictionary& dict,
             CloudType& owner
@@ -127,7 +126,7 @@ public:
 
     // Member Functions
 
-        //- Flag to indicate whether model activates mass transfer model
+        //- Flag to indicate whether model activates devolatilisation model
         virtual bool active() const = 0;
 
         //- Update model
@@ -150,22 +149,22 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeMassTransferModel(CloudType)                                      \
+#define makeDevolatilisationModel(CloudType)                                  \
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(MassTransferModel<CloudType>, 0);     \
+    defineNamedTemplateTypeNameAndDebug(DevolatilisationModel<CloudType>, 0); \
                                                                               \
     defineTemplateRunTimeSelectionTable                                       \
     (                                                                         \
-        MassTransferModel<CloudType>,                                         \
+        DevolatilisationModel<CloudType>,                                     \
         dictionary                                                            \
     );
 
 
-#define makeMassTransferModelType(SS, CloudType, ParcelType)                  \
+#define makeDevolatilisationModelType(SS, CloudType, ParcelType)              \
                                                                               \
     defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
                                                                               \
-    MassTransferModel<CloudType<ParcelType> >::                               \
+    DevolatilisationModel<CloudType<ParcelType> >::                           \
         adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
             add##SS##CloudType##ParcelType##ConstructorToTable_;
 
@@ -173,7 +172,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "MassTransferModel.C"
+#   include "DevolatilisationModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/MassTransferModel/NewMassTransferModel.C b/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C
similarity index 73%
rename from src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/MassTransferModel/NewMassTransferModel.C
rename to src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C
index 416dd02ad9..f51c4568c0 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/MassTransferModel/NewMassTransferModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C
@@ -24,43 +24,44 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "MassTransferModel.H"
+#include "DevolatilisationModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::MassTransferModel<CloudType> >
-Foam::MassTransferModel<CloudType>::New
+Foam::autoPtr<Foam::DevolatilisationModel<CloudType> >
+Foam::DevolatilisationModel<CloudType>::New
 (
     const dictionary& dict,
     CloudType& owner
 )
 {
-    word MassTransferModelType
+    word DevolatilisationModelType
     (
-        dict.lookup("MassTransferModel")
+        dict.lookup("DevolatilisationModel")
     );
 
-    Info<< "Selecting MassTransferModel " << MassTransferModelType << endl;
+    Info<< "Selecting DevolatilisationModel " << DevolatilisationModelType
+        << endl;
 
     typename dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(MassTransferModelType);
+        dictionaryConstructorTablePtr_->find(DevolatilisationModelType);
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorIn
         (
-            "MassTransferModel<CloudType>::New"
+            "DevolatilisationModel<CloudType>::New"
             "(const dictionary&, CloudType&)"
         )
-            << "Unknown MassTransferModelType type "
-            << MassTransferModelType
+            << "Unknown DevolatilisationModelType type "
+            << DevolatilisationModelType
             << ", constructor not in hash table" << nl << nl
-            << "    Valid MassTransferModel types are :" << nl
+            << "    Valid DevolatilisationModel types are :" << nl
             << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
     }
 
-    return autoPtr<MassTransferModel<CloudType> >(cstrIter()(dict, owner));
+    return autoPtr<DevolatilisationModel<CloudType> >(cstrIter()(dict, owner));
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/NoMassTransfer/NoMassTransfer.C b/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
similarity index 86%
rename from src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/NoMassTransfer/NoMassTransfer.C
rename to src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
index f619c510e8..745fcc8d52 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/NoMassTransfer/NoMassTransfer.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
@@ -24,39 +24,39 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "NoMassTransfer.H"
+#include "NoDevolatilisation.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template <class CloudType>
-Foam::NoMassTransfer<CloudType>::NoMassTransfer
+Foam::NoDevolatilisation<CloudType>::NoDevolatilisation
 (
     const dictionary& dict,
     CloudType& cloud
 )
 :
-    MassTransferModel<CloudType>(dict, cloud, typeName)
+    DevolatilisationModel<CloudType>(dict, cloud, typeName)
 {}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template <class CloudType>
-Foam::NoMassTransfer<CloudType>::~NoMassTransfer()
+Foam::NoDevolatilisation<CloudType>::~NoDevolatilisation()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CloudType>
-bool Foam::NoMassTransfer<CloudType>::active() const
+bool Foam::NoDevolatilisation<CloudType>::active() const
 {
     return false;
 }
 
 
 template<class CloudType>
-Foam::scalar Foam::NoMassTransfer<CloudType>::calculate
+Foam::scalar Foam::NoDevolatilisation<CloudType>::calculate
 (
     const scalar,
     const scalar,
diff --git a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/NoMassTransfer/NoMassTransfer.H b/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
similarity index 82%
rename from src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/NoMassTransfer/NoMassTransfer.H
rename to src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
index 54f671c120..6c1ffb27e7 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/NoMassTransfer/NoMassTransfer.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
@@ -23,42 +23,42 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::NoMassTransfer
+    Foam::NoDevolatilisation
 
 Description
-    Dummy mass transfer model for 'no mass transfer'
+    Dummy devolatilisation model for 'no devolatilisation'
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef NoMassTransfer_H
-#define NoMassTransfer_H
+#ifndef NoDevolatilisation_H
+#define NoDevolatilisation_H
 
-#include "MassTransferModel.H"
+#include "DevolatilisationModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 /*---------------------------------------------------------------------------*\
-                            Class NoMassTransfer Declaration
+                     Class NoDevolatilisation Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class CloudType>
-class NoMassTransfer
+class NoDevolatilisation
 :
-    public MassTransferModel<CloudType>
+    public DevolatilisationModel<CloudType>
 {
 
 public:
 
     //- Runtime type information
-    TypeName("NoMassTransfer");
+    TypeName("NoDevolatilisation");
 
 
     // Constructors
 
         //- Construct from dictionary
-        NoMassTransfer
+        NoDevolatilisation
         (
             const dictionary& dict,
             CloudType& cloud
@@ -67,12 +67,12 @@ public:
 
     // Destructor
 
-        ~NoMassTransfer();
+        ~NoDevolatilisation();
 
 
     // Member Functions
 
-        //- Flag to indicate whether model activates mass transfer model
+        //- Flag to indicate whether model activates devolatilisation model
         bool active() const;
 
         //- Update model
@@ -96,7 +96,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "NoMassTransfer.C"
+#   include "NoDevolatilisation.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C b/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
similarity index 95%
rename from src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
rename to src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
index 7b92768b25..43eee0ad2a 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
@@ -35,7 +35,7 @@ Foam::SingleKineticRateDevolatilisation<CloudType>::SingleKineticRateDevolatilis
     CloudType& owner
 )
 :
-    MassTransferModel<CloudType>(dict, owner, typeName),
+    DevolatilisationModel<CloudType>(dict, owner, typeName),
     A1_(dimensionedScalar(this->coeffDict().lookup("A1")).value()),
     E_(dimensionedScalar(this->coeffDict().lookup("E")).value()),
     volatileResidualCoeff_
@@ -85,7 +85,7 @@ Foam::scalar Foam::SingleKineticRateDevolatilisation<CloudType>::calculate
     // Kinetic rate
     const scalar kappa = A1_*exp(-E_/(specie::RR*T));
 
-    // Volatile mass transfer from particle to carrier gas phase
+    // Volatile devolatilisation from particle to carrier gas phase
     const scalar dMass = min(dt*kappa*massVolatile, massVolatile);
 
     return dMass;
diff --git a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
similarity index 95%
rename from src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
rename to src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
index 6db27bffce..8364847ad8 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
@@ -33,7 +33,7 @@ Description
 #ifndef SingleKineticRateDevolatilisation_H
 #define SingleKineticRateDevolatilisation_H
 
-#include "MassTransferModel.H"
+#include "DevolatilisationModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,7 +46,7 @@ namespace Foam
 template<class CloudType>
 class SingleKineticRateDevolatilisation
 :
-    public MassTransferModel<CloudType>
+    public DevolatilisationModel<CloudType>
 {
 
     // Private data
@@ -88,7 +88,7 @@ public:
 
     // Member Functions
 
-        //- Flag to indicate whether model activates mass transfer model
+        //- Flag to indicate whether model activates devolatilisation model
         bool active() const;
 
         //- Update model

From b5140f74aadccc8fbf3edd7ab3e46adc53624341 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 20 Feb 2009 16:58:04 +0000
Subject: [PATCH 002/175] cosmetics

---
 .../Templates/KinematicParcel/KinematicParcel.C        | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index 3cbb291f57..ee4c699f05 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -160,8 +160,6 @@ Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
 
     vector Unew = td.cloud().UIntegrator().integrate(U_, dt, ap, bp).value();
 
-//    Info<< "U_, Unew = " << U_ << ", " << Unew << endl;
-
     // Calculate the momentum transfer to the continuous phase
     // - do not include gravity impulse
     dUTrans = -mass()*(Unew - U_ - dt*td.g());
@@ -186,7 +184,7 @@ Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
         }
         else
         {
-            FatalErrorIn("void Foam::KinematicParcel::calcVelocity")
+             FatalErrorIn("Foam::vector Foam::KinematicParcel::calcVelocity")
                 << "Could not determine 2-D case geometry" << nl
                 << abort(FatalError);
         }
@@ -251,11 +249,7 @@ bool Foam::KinematicParcel<ParcelType>::move
         {
             if (p.face() > -1)
             {
-                if
-                (
-                    isType<processorPolyPatch>
-                        (pbMesh[p.patch(p.face())])
-                )
+                if (isType<processorPolyPatch>(pbMesh[p.patch(p.face())]))
                 {
                     td.switchProcessor = true;
                 }

From e2bad4ddac0ea2d758d4677a81264885f86dae18 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 20 Feb 2009 17:45:44 +0000
Subject: [PATCH 003/175] restructuring

    - injection model sets new parcel position and cell owner
    - allows injection model to cache injection cells etc.
---
 .../Templates/KinematicCloud/KinematicCloud.C |  2 +-
 .../ConeInjection/ConeInjection.C             | 20 +++--
 .../ConeInjection/ConeInjection.H             | 10 ++-
 .../InjectionModel/InjectionModel.C           | 82 ++++++++++---------
 .../InjectionModel/InjectionModel.H           | 29 ++++---
 .../InjectionModel/InjectionModelI.H          |  4 +-
 .../ManualInjection/ManualInjection.C         | 20 +++--
 .../ManualInjection/ManualInjection.H         | 10 ++-
 .../InjectionModel/NoInjection/NoInjection.C  | 12 +--
 .../InjectionModel/NoInjection/NoInjection.H  | 10 ++-
 10 files changed, 108 insertions(+), 91 deletions(-)

diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index 8a8723a539..55ad4d3b57 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -244,7 +244,7 @@ void Foam::KinematicCloud<ParcelType>::info() const
 {
     Info<< "Cloud name: " << this->name() << nl
         << "    Parcels added during this run   = "
-        << returnReduce(this->injection().nParcelsAddedTotal(), sumOp<label>())
+        << returnReduce(this->injection().parcelsAddedTotal(), sumOp<label>())
             << nl
         << "    Mass introduced during this run = "
         << returnReduce(this->injection().massInjected(), sumOp<scalar>())
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
index a1cc13f345..a6d5a83041 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
@@ -30,7 +30,7 @@ License
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::label Foam::ConeInjection<CloudType>::nParcelsToInject
+Foam::label Foam::ConeInjection<CloudType>::parcelsToInject
 (
     const scalar time0,
     const scalar time1
@@ -172,36 +172,38 @@ Foam::scalar Foam::ConeInjection<CloudType>::timeEnd() const
 
 
 template<class CloudType>
-Foam::vector Foam::ConeInjection<CloudType>::position
+void Foam::ConeInjection<CloudType>::setPositionAndCell
 (
     const label,
     const scalar,
-    const polyMeshInfo& meshInfo
+    const polyMeshInfo& meshInfo,
+    vector& position,
+    label& cellOwner
 )
 {
-    vector pos = position_;
+    position = position_;
+    this->findCellAtPosition(cellOwner, position);
+
     if (meshInfo.caseIs2d())
     {
         if (meshInfo.caseIs2dWedge())
         {
-            pos.component(meshInfo.emptyComponent()) = 0.0;
+            position.component(meshInfo.emptyComponent()) = 0.0;
         }
         else if (meshInfo.caseIs2dSlab())
         {
-            pos.component(meshInfo.emptyComponent()) =
+            position.component(meshInfo.emptyComponent()) =
                 meshInfo.centrePoint().component(meshInfo.emptyComponent());
         }
         else
         {
             FatalErrorIn
             (
-                "Foam::vector Foam::ConeInjection<CloudType>::position"
+                "void Foam::ConeInjection<CloudType>::setPositionAndCell"
             )   << "Could not determine 2-D case geometry" << nl
                 << abort(FatalError);
         }
     }
-
-    return pos;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
index d4f01a4b68..8034278da5 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
@@ -113,7 +113,7 @@ protected:
     // Protected member functions
 
         //- Number of parcels to introduce over the time step
-        label nParcelsToInject
+        label parcelsToInject
         (
             const scalar time0,
             const scalar time1
@@ -159,12 +159,14 @@ public:
 
         // Injection geometry
 
-            //- Return the injection position
-            vector position
+            //- Set the injection position and owner cell
+            void setPositionAndCell
             (
                 const label iParcel,
                 const scalar time,
-                const polyMeshInfo& meshInfo
+                const polyMeshInfo& meshInfo,
+                vector& position,
+                label& cellOwner
             );
 
             //- Return the velocity of the parcel to introduce at a time
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 3ef7e2a873..65d0ac295f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -34,13 +34,13 @@ void Foam::InjectionModel<CloudType>::prepareForNextTimeStep
 (
     const scalar time0,
     const scalar time1,
-    label& nParcels,
-    scalar& volume
+    label& newParcels,
+    scalar& newVolume
 )
 {
     // Initialise values
-    nParcels = 0;
-    volume = 0.0;
+    newParcels = 0;
+    newVolume = 0.0;
 
     // Return if not started injection event
     if (time1 < SOI_)
@@ -54,13 +54,13 @@ void Foam::InjectionModel<CloudType>::prepareForNextTimeStep
     scalar t1 = time1 - SOI_;
 
     // Number of parcels to inject
-    nParcels = nParcelsToInject(t0, t1);
+    newParcels = parcelsToInject(t0, t1);
 
     // Volume of parcels to inject
-    volume = volumeToInject(t0, t1);
+    newVolume = volumeToInject(t0, t1);
 
     // Hold previous time if no parcels, but non-zero volume fraction
-    if ((nParcels == 0) && (volume > 0.0))
+    if ((newParcels == 0) && (newVolume > 0.0))
     {
         // hold value of timeStep0_
     }
@@ -73,7 +73,7 @@ void Foam::InjectionModel<CloudType>::prepareForNextTimeStep
 
 
 template<class CloudType>
-void Foam::InjectionModel<CloudType>::findInjectorCellAndPosition
+void Foam::InjectionModel<CloudType>::findCellAtPosition
 (
     label& cellI,
     vector& position
@@ -88,7 +88,7 @@ void Foam::InjectionModel<CloudType>::findInjectorCellAndPosition
     if (cellI >= 0)
     {
         const vector& C = owner_.mesh().C()[cellI];
-        position += 1.0e-6*(C - position);
+        position += SMALL*(C - position);
 
         foundCell = owner_.mesh().pointInCell(position, cellI);
     }
@@ -103,7 +103,7 @@ void Foam::InjectionModel<CloudType>::findInjectorCellAndPosition
         if (cellI >= 0)
         {
             const vector& C = owner_.mesh().C()[cellI];
-            position += 1.0e-6*(C - position);
+            position += SMALL*(C - position);
 
             foundCell = owner_.mesh().pointInCell(position, cellI);
         }
@@ -114,7 +114,7 @@ void Foam::InjectionModel<CloudType>::findInjectorCellAndPosition
     {
         FatalErrorIn
         (
-            "InjectionModel<CloudType>::setInjectorCellAndPosition"
+            "InjectionModel<CloudType>::findCellAtPosition"
             "(label&, vector&)"
         )<< "Cannot find parcel injection cell. "
          << "Parcel position = " << p0 << nl
@@ -126,7 +126,7 @@ void Foam::InjectionModel<CloudType>::findInjectorCellAndPosition
 template<class CloudType>
 Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
 (
-    const label nParcels,
+    const label parcels,
     const scalar diameter,
     const scalar volumeFraction,
     const scalar rho,
@@ -138,7 +138,7 @@ Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
     {
         case pbMass:
         {
-            nP = volumeFraction*massTotal_/nParcels
+            nP = volumeFraction*massTotal_/parcels
                /(rho*mathematicalConstant::pi/6.0*pow3(diameter));
             break;
         }
@@ -152,9 +152,15 @@ Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
             nP = 0.0;
             FatalErrorIn
             (
-                "void Foam::InjectionModel<CloudType>::setNumberOfParticles"
-                "(const label, const scalar, const scalar, const scalar, "
-                "const scalar)"
+                "Foam::scalar "
+                "Foam::InjectionModel<CloudType>::setNumberOfParticles"
+                "(\n"
+                "    const label,\n"
+                "    const scalar,\n"
+                "    const scalar,\n"
+                "    const scalar,\n"
+                "    const scalar\n"
+                ")"
             )<< "Unknown parcelBasis type" << nl
              << exit(FatalError);
         }
@@ -167,18 +173,18 @@ Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
 template<class CloudType>
 void Foam::InjectionModel<CloudType>::postInjectCheck()
 {
-    if (nParcelsAdded_ > 0)
+    if (parcelsAdded_ > 0)
     {
         Pout<< "\n--> Cloud: " << owner_.name() << nl
-            << "    Added " << nParcelsAdded_
+            << "    Added " << parcelsAdded_
             <<  " new parcels" << nl << endl;
     }
 
     // Increment total number of parcels added
-    nParcelsAddedTotal_ += nParcelsAdded_;
+    parcelsAddedTotal_ += parcelsAdded_;
 
     // Reset parcel counters
-    nParcelsAdded_ = 0;
+    parcelsAdded_ = 0;
 
     // Update time for start of next injection
     time0_ = owner_.db().time().value();
@@ -205,8 +211,8 @@ Foam::InjectionModel<CloudType>::InjectionModel
     massTotal_(dimensionedScalar(coeffDict_.lookup("massTotal")).value()),
     massInjected_(0.0),
     nInjections_(0),
-    nParcelsAdded_(0),
-    nParcelsAddedTotal_(0),
+    parcelsAdded_(0),
+    parcelsAddedTotal_(0),
     parcelBasisType_(coeffDict_.lookup("parcelBasisType")),
     parcelBasis_(pbNumber),
     time0_(owner.db().time().value()),
@@ -249,13 +255,13 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
     const scalar continuousDt = owner_.db().time().deltaT().value();
 
     // Prepare for next time step
-    nParcelsAdded_ = 0;
-    label nParcels = 0;
-    scalar volume = 0.0;
-    prepareForNextTimeStep(time0_, time, nParcels, volume);
+    parcelsAdded_ = 0;
+    label newParcels = 0;
+    scalar newVolume = 0.0;
+    prepareForNextTimeStep(time0_, time, newParcels, newVolume);
 
     // Return if no parcels are required
-    if (nParcels == 0)
+    if (newParcels == 0)
     {
         postInjectCheck();
         return;
@@ -265,7 +271,7 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
     const scalar rho = td.constProps().rho0();
 
     // Volume fraction to introduce during this timestep
-    const scalar volFraction = volumeFraction(volume);
+    const scalar volFraction = volumeFraction(newVolume);
 
     // Duration of injection period during this timestep
     const scalar deltaT = min
@@ -278,13 +284,15 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
     const scalar padTime = max(0.0, SOI_ - time0_);
 
     // Introduce new parcels linearly with time
-    for (label iParcel=0; iParcel<nParcels; iParcel++)
+    for (label iParcel=0; iParcel<newParcels; iParcel++)
     {
         // Calculate the pseudo time of injection for parcel 'iParcel'
-        scalar timeInj = time0_ + padTime + deltaT*iParcel/nParcels;
+        scalar timeInj = time0_ + padTime + deltaT*iParcel/newParcels;
 
-        // Determine injected parcel properties
-        vector pos = position(iParcel, timeInj, owner_.meshInfo());
+        // Determine the injection position and owner cell
+        label cellI = -1;
+        vector pos = vector::zero;
+        setPositionAndCell(iParcel, timeInj, owner_.meshInfo(), pos, cellI);
 
         // Diameter of parcels
         scalar d = d0(iParcel, timeInj);
@@ -292,27 +300,23 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
         // Number of particles per parcel
         scalar nP = setNumberOfParticles
         (
-            nParcels,
+            newParcels,
             d,
             volFraction,
             rho,
-            volume
+            newVolume
         );
 
         // Velocity of parcels
         vector U = velocity(iParcel, timeInj, owner_.meshInfo());
 
-        // Determine the injection cell
-        label cellI = -1;
-        findInjectorCellAndPosition(cellI, pos);
-
         if (cellI >= 0)
         {
             scalar dt = time - timeInj;
             td.cloud().addNewParcel(pos, cellI, d, U, nP, dt);
 
             massInjected_ += nP*rho*mathematicalConstant::pi*pow3(d)/6.0;
-            nParcelsAdded_++;
+            parcelsAdded_++;
         }
     }
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index 791631fb99..aad8f1a6c6 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -108,10 +108,10 @@ protected:
             label nInjections_;
 
             //- Running counter of parcels added during each injection
-            label nParcelsAdded_;
+            label parcelsAdded_;
 
             //- Running counter of total number of parcels added
-            label nParcelsAddedTotal_;
+            label parcelsAddedTotal_;
 
 
         // Injection properties per Lagrangian time step
@@ -134,7 +134,7 @@ protected:
     // Protected member functions
 
         //- Number of parcels to introduce over the time step
-        virtual label nParcelsToInject
+        virtual label parcelsToInject
         (
             const scalar time0,
             const scalar time1
@@ -153,13 +153,14 @@ protected:
         (
             const scalar time0,
             const scalar time1,
-            label& nParcels,
-            scalar& volume
+            label& newParcels,
+            scalar& newVolume
         );
 
-        //- Find the cell that contains the injector position
-        //  Will modify position slightly towards the owner cell centroid
-        virtual void findInjectorCellAndPosition
+        //- Find the cell that contains the supplied position
+        //  Will modify position slightly towards the owner cell centroid to
+        //  ensure that it lies in a cell and not edge/face
+        virtual void findCellAtPosition
         (
             label& cellI,
             vector& position
@@ -168,7 +169,7 @@ protected:
         //- Set number of particles to inject given parcel properties
         scalar setNumberOfParticles
         (
-            const label nParcels,
+            const label parcels,
             const scalar diameter,
             const scalar volumeFraction,
             const scalar rho,
@@ -265,7 +266,7 @@ public:
                 inline label nInjections() const;
 
                 //- Return the total number parcels added
-                inline label nParcelsAddedTotal() const;
+                inline label parcelsAddedTotal() const;
 
 
         // Per-injection event functions
@@ -280,12 +281,14 @@ public:
 
         // Injection geometry
 
-            //- Return the injection position
-            virtual vector position
+            //- Set the injection position and owner cell
+            virtual void setPositionAndCell
             (
                 const label iParcel,
                 const scalar time,
-                const polyMeshInfo& meshInfo
+                const polyMeshInfo& meshInfo,
+                vector& position,
+                label& cellOwner
             ) = 0;
 
             //- Return the velocity of the parcel to introduce at a time
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelI.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelI.H
index f02d05b902..80a142816c 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelI.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelI.H
@@ -90,9 +90,9 @@ Foam::label Foam::InjectionModel<CloudType>::nInjections() const
 
 
 template<class CloudType>
-Foam::label Foam::InjectionModel<CloudType>::nParcelsAddedTotal() const
+Foam::label Foam::InjectionModel<CloudType>::parcelsAddedTotal() const
 {
-    return nParcelsAddedTotal_;
+    return parcelsAddedTotal_;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
index c201b5fc4f..6a8361d7df 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
@@ -29,7 +29,7 @@ License
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::label Foam::ManualInjection<CloudType>::nParcelsToInject
+Foam::label Foam::ManualInjection<CloudType>::parcelsToInject
 (
     const scalar time0,
     const scalar time1
@@ -135,36 +135,38 @@ Foam::scalar Foam::ManualInjection<CloudType>::timeEnd() const
 
 
 template<class CloudType>
-Foam::vector Foam::ManualInjection<CloudType>::position
+void Foam::ManualInjection<CloudType>::setPositionAndCell
 (
     const label iParcel,
     const scalar time,
-    const polyMeshInfo& meshInfo
+    const polyMeshInfo& meshInfo,
+    vector& position,
+    label& cellOwner
 )
 {
-    vector pos = positions_[iParcel];
+    position = positions_[iParcel];
+    this->findCellAtPosition(cellOwner, position);
+
     if (meshInfo.caseIs2d())
     {
         if (meshInfo.caseIs2dWedge())
         {
-            pos.component(meshInfo.emptyComponent()) = 0.0;
+            position.component(meshInfo.emptyComponent()) = 0.0;
         }
         else if (meshInfo.caseIs2dSlab())
         {
-            pos.component(meshInfo.emptyComponent()) =
+            position.component(meshInfo.emptyComponent()) =
                 meshInfo.centrePoint().component(meshInfo.emptyComponent());
         }
         else
         {
             FatalErrorIn
             (
-                "Foam::vector Foam::ManualInjection<CloudType>::position"
+                "void Foam::ManualInjection<CloudType>::setPositionAndCell"
             )   << "Could not determine 2-D case geometry" << nl
                 << abort(FatalError);
         }
     }
-
-    return pos;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
index 6393924177..05f117b8ad 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
@@ -94,7 +94,7 @@ protected:
     // Protected member functions
 
         //- Number of parcels to introduce over the time step
-        label nParcelsToInject
+        label parcelsToInject
         (
             const scalar time0,
             const scalar time1
@@ -140,12 +140,14 @@ public:
 
         // Injection geometry
 
-            //- Return the injection position
-            vector position
+            //- Set the injection position and owner cell
+            void setPositionAndCell
             (
                 const label iParcel,
                 const scalar time,
-                const polyMeshInfo& meshInfo
+                const polyMeshInfo& meshInfo,
+                vector& position,
+                label& cellOwner
             );
 
             //- Return the velocity of the parcel to introduce at a time
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
index d5530ba71d..43c03392f6 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
@@ -30,7 +30,7 @@ License
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::label Foam::NoInjection<CloudType>::nParcelsToInject
+Foam::label Foam::NoInjection<CloudType>::parcelsToInject
 (
     const scalar,
     const scalar
@@ -88,15 +88,15 @@ Foam::scalar Foam::NoInjection<CloudType>::timeEnd() const
 
 
 template<class CloudType>
-Foam::vector Foam::NoInjection<CloudType>::position
+void Foam::NoInjection<CloudType>::setPositionAndCell
 (
     const label,
     const scalar,
-    const polyMeshInfo&
+    const polyMeshInfo&,
+    vector&,
+    label&
 )
-{
-    return vector::zero;
-}
+{}
 
 
 template<class CloudType>
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
index 99f37cea4a..538af51804 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
@@ -58,7 +58,7 @@ protected:
     // Protected member functions
 
         //- Number of parcels to introduce over the time step
-        label nParcelsToInject
+        label parcelsToInject
         (
             const scalar,
             const scalar
@@ -104,12 +104,14 @@ public:
 
         // Injection geometry
 
-            //- Return the injection position
-            vector position
+            //- Set the injection position and owner cell
+            void setPositionAndCell
             (
                 const label iParcel,
                 const scalar time,
-                const polyMeshInfo& meshInfo
+                const polyMeshInfo& meshInfo,
+                vector& position,
+                label& cellOwner
             );
 
             //- Return the velocity of the parcel to introduce at a time

From 761ccd2bb3faab3ea4830b3ee7eceaf562bcd2f2 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 20 Feb 2009 19:12:27 +0000
Subject: [PATCH 004/175] updates

---
 .../InjectionModel/InjectionModel.C           | 50 +++++++++++--------
 .../InjectionModel/InjectionModel.H           |  6 +--
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 65d0ac295f..e6729e18bb 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -127,10 +127,10 @@ template<class CloudType>
 Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
 (
     const label parcels,
-    const scalar diameter,
-    const scalar volumeFraction,
-    const scalar rho,
     const scalar volume
+    const scalar volumeFraction,
+    const scalar diameter,
+    const scalar rho,
 )
 {
     scalar nP = 0.0;
@@ -294,30 +294,38 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
         vector pos = vector::zero;
         setPositionAndCell(iParcel, timeInj, owner_.meshInfo(), pos, cellI);
 
-        // Diameter of parcels
-        scalar d = d0(iParcel, timeInj);
-
-        // Number of particles per parcel
-        scalar nP = setNumberOfParticles
-        (
-            newParcels,
-            d,
-            volFraction,
-            rho,
-            newVolume
-        );
-
-        // Velocity of parcels
-        vector U = velocity(iParcel, timeInj, owner_.meshInfo());
-
         if (cellI >= 0)
         {
-            scalar dt = time - timeInj;
-            td.cloud().addNewParcel(pos, cellI, d, U, nP, dt);
+            // Diameter of parcels
+            scalar d = d0(iParcel, timeInj);
 
+            // Number of particles per parcel
+            scalar nP = setNumberOfParticles
+            (
+                newParcels,
+                newVolume,
+                volFraction,
+                d,
+                rho
+            );
+
+            // Velocity of parcels
+            vector U = velocity(iParcel, timeInj, owner_.meshInfo());
+
+            // Lagrangian timestep
+            scalar dt = time - timeInj;
+
+            // Add the new parcel
+            td.cloud().addNewParcel(pos, cellI, d, U, nP, dt);
             massInjected_ += nP*rho*mathematicalConstant::pi*pow3(d)/6.0;
             parcelsAdded_++;
         }
+        else
+        {
+            WarningIn("Foam::InjectionModel<CloudType>::inject(TrackData& td)")
+                << "Failed to inject new parcel:" <<
+                << "    id = " << iParcel << ", position = " pos << nl << endl;
+        }
     }
 
     postInjectCheck();
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index aad8f1a6c6..0c6b9f69a7 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -170,10 +170,10 @@ protected:
         scalar setNumberOfParticles
         (
             const label parcels,
-            const scalar diameter,
+            const scalar volume,
             const scalar volumeFraction,
-            const scalar rho,
-            const scalar volume
+            const scalar diameter,
+            const scalar rho
         );
 
         //- Post injection checks

From 7f71aadf49827227f627f091a1736d0f993cb2aa Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 24 Feb 2009 09:45:00 +0000
Subject: [PATCH 005/175] cosmetics

---
 .../baseClasses/kinematicCloud/kinematicCloud.H     | 10 ++--------
 .../baseClasses/reactingCloud/reactingCloud.H       | 10 ++--------
 .../clouds/baseClasses/thermoCloud/thermoCloud.H    |  5 ++---
 .../InjectionModel/InjectionModel/InjectionModel.C  | 13 ++++++++++---
 4 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
index 68f3a9dfdf..a8f337d0e9 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
@@ -69,14 +69,8 @@ public:
         kinematicCloud();
 
 
-    // Destructors
-
-        virtual ~kinematicCloud();
-
-
-    // Member Functions
-
-        // Access
+    //- Destructor
+    virtual ~kinematicCloud();
 };
 
 
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H
index be585991ed..e92063172e 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H
@@ -69,14 +69,8 @@ public:
         reactingCloud();
 
 
-    // Destructors
-
-        virtual ~reactingCloud();
-
-
-    // Member Functions
-
-        // Access
+    //- Destructor
+    virtual ~reactingCloud();
 };
 
 
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H
index bcab4df9fa..116a6c8591 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H
@@ -69,9 +69,8 @@ public:
         thermoCloud();
 
 
-    // Destructors
-
-        virtual ~thermoCloud();
+    //- Destructor
+    virtual ~thermoCloud();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index e6729e18bb..1f5d5616cd 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -114,8 +114,11 @@ void Foam::InjectionModel<CloudType>::findCellAtPosition
     {
         FatalErrorIn
         (
-            "InjectionModel<CloudType>::findCellAtPosition"
-            "(label&, vector&)"
+            "Foam::InjectionModel<CloudType>::findCellAtPosition"
+            "(\n"
+            "    label&,\n"
+            "    vector&\n"
+            ")"
         )<< "Cannot find parcel injection cell. "
          << "Parcel position = " << p0 << nl
          << abort(FatalError);
@@ -231,7 +234,11 @@ Foam::InjectionModel<CloudType>::InjectionModel
         FatalErrorIn
         (
             "Foam::InjectionModel<CloudType>::InjectionModel"
-            "(const dictionary&, CloudType&, const word&)"
+            "(\n"
+            "    const dictionary&,\n"
+            "    CloudType&,\n"
+            "    const word&\n"
+            ")"
         )<< "parcelBasisType must be either 'number' or 'mass'" << nl
          << exit(FatalError);
     }

From 46681700d8a4f649e3165bbac966aed858452a79 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 24 Feb 2009 15:35:37 +0000
Subject: [PATCH 006/175] re-structure of reacting class

    - reacting now single phase, multi-component
      - new phase change sub-model
    - new reactingMultiphase = multi-phase, multi-component
---
 src/lagrangian/intermediate/Make/files        |  20 +-
 .../basicReactingMultiphaseCloud.C            |  77 ++++
 .../basicReactingMultiphaseCloud.H            | 104 +++++
 .../ReactingMultiphaseParcel.C                | 433 ++++++++++++++++++
 .../ReactingMultiphaseParcel.H                | 330 +++++++++++++
 .../ReactingMultiphaseParcelI.H               | 191 ++++++++
 .../ReactingMultiphaseParcelIO.C              | 276 +++++++++++
 .../Templates/ReactingParcel/ReactingParcel.C | 117 +----
 .../Templates/ReactingParcel/ReactingParcel.H |  87 +---
 .../ReactingParcel/ReactingParcelI.H          | 111 +----
 .../ReactingParcel/ReactingParcelIO.C         | 146 +-----
 .../basicReactingMultiphaseParcel.C           |  97 ++++
 .../basicReactingMultiphaseParcel.H           | 116 +++++
 .../defineBasicReactingMultiphaseParcel.C     | 101 ++++
 ...eactingMultiphaseParcelCompositionModels.C |  45 ++
 ...ngMultiphaseParcelDevolatilisationModels.C |  59 +++
 ...ReactingMultiphaseParcelDispersionModels.C |  65 +++
 ...eBasicReactingMultiphaseParcelDragModels.C |  42 ++
 ...actingMultiphaseParcelHeatTransferModels.C |  52 +++
 ...cReactingMultiphaseParcelInjectionModels.C |  59 +++
 ...ingMultiphaseParcelSurfaceReactionModels.C |  45 ++
 ...ingMultiphaseParcelWallInteractionModels.C |  53 +++
 ...asicReactingParcelDevolatilisationModels.C |   2 +-
 23 files changed, 2220 insertions(+), 408 deletions(-)
 create mode 100644 src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.C
 create mode 100644 src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H
 create mode 100644 src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
 create mode 100644 src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
 create mode 100644 src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
 create mode 100644 src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
 create mode 100644 src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C
 create mode 100644 src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H
 create mode 100644 src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C
 create mode 100644 src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelCompositionModels.C
 create mode 100644 src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDevolatilisationModels.C
 create mode 100644 src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDispersionModels.C
 create mode 100644 src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDragModels.C
 create mode 100644 src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelHeatTransferModels.C
 create mode 100644 src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelInjectionModels.C
 create mode 100644 src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSurfaceReactionModels.C
 create mode 100644 src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelWallInteractionModels.C

diff --git a/src/lagrangian/intermediate/Make/files b/src/lagrangian/intermediate/Make/files
index 129319f042..13cd69a2a3 100644
--- a/src/lagrangian/intermediate/Make/files
+++ b/src/lagrangian/intermediate/Make/files
@@ -1,7 +1,7 @@
 /* Parcels */
 parcels/derived/basicKinematicParcel/basicKinematicParcel.C
 parcels/derived/basicThermoParcel/basicThermoParcel.C
-parcels/derived/basicReactingParcel/basicReactingParcel.C
+parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C
 
 /* Cloud base classes */
 clouds/baseClasses/kinematicCloud/kinematicCloud.C
@@ -30,15 +30,15 @@ parcels/derived/basicThermoParcel/makeBasicThermoParcelHeatTransferModels.C
 parcels/derived/basicThermoParcel/makeBasicThermoParcelWallInteractionModels.C
 
 /* reacting parcel sub-models */
-parcels/derived/basicReactingParcel/defineBasicReactingParcel.C
-parcels/derived/basicReactingParcel/makeBasicReactingParcelCompositionModels.C
-parcels/derived/basicReactingParcel/makeBasicReactingParcelDragModels.C
-parcels/derived/basicReactingParcel/makeBasicReactingParcelDispersionModels.C
-parcels/derived/basicReactingParcel/makeBasicReactingParcelInjectionModels.C
-parcels/derived/basicReactingParcel/makeBasicReactingParcelHeatTransferModels.C
-parcels/derived/basicReactingParcel/makeBasicReactingParcelDevolatilisationModels.C
-parcels/derived/basicReactingParcel/makeBasicReactingParcelSurfaceReactionModels.C
-parcels/derived/basicReactingParcel/makeBasicReactingParcelWallInteractionModels.C
+parcels/derived/basicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C
+parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelCompositionModels.C
+parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDragModels.C
+parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDispersionModels.C
+parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelInjectionModels.C
+parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelHeatTransferModels.C
+parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDevolatilisationModels.C
+parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSurfaceReactionModels.C
+parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelWallInteractionModels.C
 
 /* bolt-on models */
 submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
diff --git a/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.C
new file mode 100644
index 0000000000..a532276dee
--- /dev/null
+++ b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.C
@@ -0,0 +1,77 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "basicReactingMultiphaseCloud.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(basicReactingMultiphaseCloud, 0);
+};
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::basicReactingMultiphaseCloud::basicReactingMultiphaseCloud
+(
+    const word& cloudType,
+    const volScalarField& rho,
+    const volVectorField& U,
+    const dimensionedVector& g,
+    hCombustionThermo& thermo,
+    PtrList<specieReactingProperties>& gases
+)
+:
+    ReactingCloud<basicReactingMultiphaseParcel>
+    (
+        cloudType,
+        rho,
+        U,
+        g,
+        thermo,
+        gases
+    )
+{
+    basicReactingMultiphaseParcel::readFields(*this);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::basicReactingMultiphaseCloud::~basicReactingMultiphaseCloud()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::basicReactingMultiphaseCloud::writeFields() const
+{
+    basicReactingMultiphaseParcel::writeFields(*this);
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H
new file mode 100644
index 0000000000..244c98d095
--- /dev/null
+++ b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.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
+
+Class
+    Foam::basicReactingMultiphaseCloud
+
+Description
+    Reacting cloud templated on the reacting multiphase parcel
+
+SourceFiles
+    basicReactingMultiphaseCloud.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef basicReactingMultiphaseCloud_H
+#define basicReactingMultiphaseCloud_H
+
+#include "ReactingCloud.H"
+#include "basicReactingMultiphaseParcel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                Class basicReactingMultiphaseCloud Declaration
+\*---------------------------------------------------------------------------*/
+
+class basicReactingMultiphaseCloud
+:
+    public ReactingCloud<basicReactingMultiphaseParcel>
+{
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        basicReactingMultiphaseCloud(const basicReactingMultiphaseCloud&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const basicReactingMultiphaseCloud&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("basicReactingMultiphaseCloud");
+
+
+    // Constructors
+
+        //- Construct given carrier gas fields
+        basicReactingMultiphaseCloud
+        (
+            const word& cloudType,
+            const volScalarField& rho,
+            const volVectorField& U,
+            const dimensionedVector& g,
+            hCombustionThermo& thermo,
+            PtrList<specieReactingProperties>& gases
+        );
+
+
+    //- Destructor
+    ~basicReactingMultiphaseCloud();
+
+
+    // Member Functions
+
+        //- Write fields
+        void writeFields() const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
new file mode 100644
index 0000000000..328367601f
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -0,0 +1,433 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "ReactingMultiphaseParcel.H"
+
+// * * * * * * * * * * *  Protected Member Functions * * * * * * * * * * * * //
+
+template<class ParcelType>
+template<class TrackData>
+void Foam::ReactingMultiphaseParcel<ParcelType>::updateCellQuantities
+(
+    TrackData& td,
+    const scalar dt,
+    const label celli
+)
+{
+    ReactingParcel<ParcelType>::updateCellQuantities(td, dt, celli);
+}
+
+
+template<class ParcelType>
+template<class TrackData>
+void Foam::ReactingMultiphaseParcel<ParcelType>::calcCoupled
+(
+    TrackData& td,
+    const scalar dt,
+    const label celli
+)
+{
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Define local properties at beginning of timestep
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    const vector U0 = this->U_;
+    const scalar mass0 = this->mass();
+    const scalar cp0 = this->cp_;
+    const scalar np0 = this->nParticle_;
+    const scalar T0 = this->T_;
+    scalarList& YMix = this->YMixture_;
+
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Initialise transfer terms
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Momentum transfer from the particle to the carrier phase
+    vector dUTrans = vector::zero;
+
+    // Enthalpy transfer from the particle to the carrier phase
+    scalar dhTrans = 0.0;
+
+    // Mass transfer from particle to carrier phase
+    // - components exist in particle already
+    scalarList dMassMT(td.cloud().gases().size(), 0.0);
+
+    // Mass transfer due to surface reactions from particle to carrier phase
+    // - components do not necessarily exist in particle already
+    scalarList dMassSR(td.cloud().gases().size(), 0.0);
+
+
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Calculate velocity - update U
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    scalar Cud = 0.0;
+    const vector U1 = calcVelocity(td, dt, Cud, dUTrans);
+
+
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Calculate heat transfer - update T
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    scalar htc = 0.0;
+    scalar T1 = calcHeatTransfer(td, dt, celli, htc, dhTrans);
+
+
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Calculate Devolatilisation
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
+    calcDevolatilisation(td, dt, T0, T1, dMassMT);
+
+
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Calculate surface reactions
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Initialise enthalpy retention to zero
+    scalar dhRet = 0.0;
+
+    calcSurfaceReactions(td, dt, celli, T0, T1, dMassMT, dMassSR, dhRet);
+
+    // New total mass
+    const scalar mass1 = mass0 - sum(dMassMT) - sum(dMassSR);
+
+    // Correct particle temperature to account for latent heat of
+    // devolatilisation
+    T1 -=
+        td.constProps().Ldevol()
+       *sum(dMassMT)
+       /(0.5*(mass0 + mass1)*cp0);
+
+    // Add retained enthalpy from surface reaction to particle and remove
+    // from gas
+    T1 += dhRet/(0.5*(mass0 + mass1)*cp0);
+    dhTrans -= dhRet;
+
+    // Correct dhTrans to account for enthalpy of evolved volatiles
+    dhTrans +=
+        sum(dMassMT)
+       *td.cloud().composition().HGas(YGas_, 0.5*(T0 + T1));
+
+    // Correct dhTrans to account for enthalpy of consumed solids
+    dhTrans +=
+        sum(dMassSR)
+       *td.cloud().composition().HSolid(YSolid_, 0.5*(T0 + T1));
+
+
+    // ~~~~~~~~~~~~~~~~~~~~~~~
+    // Accumulate source terms
+    // ~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Transfer mass lost from particle to carrier mass source
+    forAll(dMassMT, i)
+    {
+        td.cloud().rhoTrans(i)[celli] += np0*(dMassMT[i] + dMassSR[i]);
+    }
+
+    // Update momentum transfer
+    td.cloud().UTrans()[celli] += np0*dUTrans;
+
+    // Accumulate coefficient to be applied in carrier phase momentum coupling
+    td.cloud().UCoeff()[celli] += np0*mass0*Cud;
+
+    // Update enthalpy transfer
+    // - enthalpy of lost solids already accounted for
+    td.cloud().hTrans()[celli] += np0*dhTrans;
+
+    // Accumulate coefficient to be applied in carrier phase enthalpy coupling
+    td.cloud().hCoeff()[celli] += np0*htc*this->areaS();
+
+
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Remove the particle when mass falls below minimum threshold
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    if (mass1 < td.constProps().minParticleMass())
+    {
+        td.keepParticle = false;
+
+        // Absorb particle(s) into carrier phase
+        forAll(dMassMT, i)
+        {
+            td.cloud().rhoTrans(i)[celli] += np0*dMassMT[i];
+        }
+        td.cloud().hTrans()[celli] +=
+            np0*mass1
+           *(
+                YMix[0]*td.cloud().composition().HGas(YGas_, T1)
+              + YMix[2]*td.cloud().composition().HSolid(YSolid_, T1)
+            );
+        td.cloud().UTrans()[celli] += np0*mass1*U1;
+    }
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Set new particle properties
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    else
+    {
+        this->U_ = U1;
+        this->T_ = T1;
+        this->cp_ =
+            YMix[0]*td.cloud().composition().cpGas(YGas_, T1)
+          + YMix[1]*td.cloud().composition().cpLiquid(YLiquid_, this->pc_, T1)
+          + YMix[2]*td.cloud().composition().cpSolid(YSolid_);
+
+        // Update particle density or diameter
+        if (td.constProps().constantVolume())
+        {
+            this->rho_ = mass1/this->volume();
+        }
+        else
+        {
+            this->d_ = cbrt(mass1/this->rho_*6.0/mathematicalConstant::pi);
+        }
+    }
+}
+
+
+template<class ParcelType>
+template<class TrackData>
+void Foam::ReactingMultiphaseParcel<ParcelType>::calcUncoupled
+(
+    TrackData& td,
+    const scalar dt,
+    const label celli
+)
+{
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Define local properties at beginning of timestep
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    const scalar T0 = this->T_;
+    const scalar mass0 = this->mass();
+    const scalar cp0 = this->cp_;
+    scalarList& YMix = this->YMixture_;
+
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Initialise transfer terms
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Momentum transfer from the particle to the carrier phase
+    vector dUTrans = vector::zero;
+
+    // Enthalpy transfer from the particle to the carrier phase
+    scalar dhTrans = 0.0;
+
+    // Mass transfer from particle to carrier phase
+    // - components exist in particle already
+    scalarList dMassMT(td.cloud().gases().size(), 0.0);
+
+    // Mass transfer due to surface reactions from particle to carrier phase
+    // - components do not necessarily exist in particle already
+    scalarList dMassSR(td.cloud().gases().size(), 0.0);
+
+
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Calculate velocity - update U
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    scalar Cud = 0.0;
+    const vector U1 = calcVelocity(td, dt, Cud, dUTrans);
+
+
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Calculate heat transfer - update T
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    scalar htc = 0.0;
+    scalar T1 = calcHeatTransfer(td, dt, celli, htc, dhTrans);
+
+
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Calculate Devolatilisation
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
+    calcDevolatilisation(td, dt, T0, T1, dMassMT);
+
+
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Calculate surface reactions
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Initialise enthalpy retention to zero
+    scalar dhRet = 0.0;
+
+    calcSurfaceReactions(td, dt, celli, T0, T1, dMassMT, dMassSR, dhRet);
+
+    // New total mass
+    const scalar mass1 = mass0 - sum(dMassMT) - sum(dMassSR);
+
+    // New specific heat capacity
+    const scalar cp1 =
+        YMix[0]*td.cloud().composition().cpGas(YGas_, T1)
+      + YMix[1]*td.cloud().composition().cpLiquid(YLiquid_, this->pc_, T1)
+      + YMix[2]*td.cloud().composition().cpSolid(YSolid_);
+
+    // Add retained enthalpy to particle
+    T1 += dhRet/(mass0*0.5*(cp0 + cp1));
+
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Remove the particle when mass falls below minimum threshold
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    if (mass1 < td.constProps().minParticleMass())
+    {
+        td.keepParticle = false;
+    }
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Set new particle properties
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    else
+    {
+        this->U_ = U1;
+        this->T_ = T1;
+        this->cp_ = cp1;
+
+        // Update particle density or diameter
+        if (td.constProps().constantVolume())
+        {
+            this->rho_ = mass1/this->volume();
+        }
+        else
+        {
+            this->d_ = cbrt(mass1/this->rho_*6.0/mathematicalConstant::pi);
+        }
+    }
+}
+
+
+template<class ParcelType>
+template<class TrackData>
+void Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
+(
+    TrackData& td,
+    const scalar dt,
+    const scalar T0,
+    const scalar T1,
+    scalarList& dMassMT
+)
+{
+    if (td.cloud().composition().YMixture0()[1]>SMALL)
+    {
+        notImplemented
+        (
+            "void Foam::ReactingMultiphaseParcel<ParcelType>::"
+            "calcDevolatilisation \n"
+            "("
+            "    TrackData&,\n"
+            "    const scalar,\n"
+            "    const scalar,\n"
+            "    const scalar,\n"
+            "    scalarList&\n"
+            ")\n"
+            "no treatment currently available for particles containing "
+            "liquid species"
+        )
+    }
+
+    // Check that model is active, and that the parcel temperature is
+    // within necessary limits for devolatilisation to occur
+    if
+    (
+        !td.cloud().devolatilisation().active()
+     || this->T_<td.constProps().Tvap()
+     || this->T_<td.constProps().Tbp()
+    )
+    {
+        return;
+    }
+
+    // Determine mass to add to carrier phase
+    const scalar mass = this->mass();
+    scalarList& YMix = this->YMixture_;
+    const scalar dMassTot = td.cloud().devolatilisation().calculate
+    (
+        dt,
+        this->mass0_,
+        mass,
+        td.cloud().composition().YMixture0(),
+        YMix,
+        T0,
+        canCombust_
+    );
+
+    // Update (total) mass fractions
+    YMix[0] = (YMix[0]*mass - dMassTot)/(mass - dMassTot);
+    YMix[1] = YMix[1]*mass/(mass - dMassTot);
+    YMix[2] = 1.0 - YMix[0] - YMix[1];
+
+    // Add to cummulative mass transfer
+    forAll (YGas_, i)
+    {
+        label id = td.cloud().composition().gasGlobalIds()[i];
+
+        // Volatiles mass transfer
+        scalar volatileMass = YGas_[i]*dMassTot;
+        dMassMT[id] += volatileMass;
+    }
+}
+
+
+template<class ParcelType>
+template<class TrackData>
+void Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
+(
+    TrackData& td,
+    const scalar dt,
+    const label celli,
+    const scalar T0,
+    const scalar T1,
+    const scalarList& dMassMT,
+    scalarList& dMassSR,
+    scalar& dhRet
+)
+{
+    // Check that model is active
+    if (!td.cloud().surfaceReaction().active() || !canCombust_)
+    {
+        return;
+    }
+
+    // Update mass transfer(s)
+    // - Also updates Y()'s
+    td.cloud().surfaceReaction().calculate
+    (
+        dt,
+        celli,
+        this->d_,
+        T0,
+        T1,
+        this->Tc_,
+        this->pc_,
+        this->rhoc_,
+        this->mass(),
+        dMassMT,
+        YGas_,
+        YLiquid_,
+        YSolid_,
+        this->YMixture_,
+        dMassSR,
+        dhRet
+    );
+}
+
+
+// * * * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * //
+
+#include "ReactingMultiphaseParcelIO.C"
+
+// ************************************************************************* //
+
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
new file mode 100644
index 0000000000..634175290a
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -0,0 +1,330 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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::ReactingMultiphaseParcel
+
+Description
+    Multiphase variant of the reacting parcel class with one/two-way coupling
+    with the continuous phase.
+
+SourceFiles
+    ReactingMultiphaseParcelI.H
+    ReactingMultiphaseParcel.C
+    ReactingMultiphaseParcelIO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef ReactingMultiphaseParcel_H
+#define ReactingMultiphaseParcel_H
+
+#include "ReactingParcel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+template<class ParcelType>
+class ReactingMultiphaseParcel;
+
+template<class ParcelType>
+Ostream& operator<<
+(
+    Ostream&,
+    const ReactingMultiphaseParcel<ParcelType>&
+);
+
+/*---------------------------------------------------------------------------*\
+                 Class ReactingMultiphaseParcel Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class ParcelType>
+class ReactingMultiphaseParcel
+:
+    public ReactingParcel<ParcelType>
+{
+
+public:
+
+    //- Class to hold reacting particle constant properties
+    class constantProperties
+    :
+        public ReactingParcel<ParcelType>::constantProperties
+    {
+        // Private data
+
+            //- Vapourisation temperature [K]
+            const scalar Tvap_;
+
+            //- Boiling point [K]
+            const scalar Tbp_;
+
+            //- Latent heat of devolatilisation [J/kg]
+            const scalar Ldevol_;
+
+
+    public:
+
+        //- Constructor
+        constantProperties(const dictionary& dict);
+
+        // Access
+
+            //- Return const access to the vapourisation temperature
+            inline scalar Tvap() const;
+
+            //- Return const access to the boiling point
+            inline scalar Tbp() const;
+
+            //- Return const access to the latent heat of devolatilisation
+            inline scalar Ldevol() const;
+    };
+
+
+    //- Class used to pass reacting tracking data to the trackToFace function
+    class trackData
+    :
+        public ReactingParcel<ParcelType>::trackData
+    {
+        // Private data
+
+            //- Particle constant properties
+            const constantProperties& constProps_;
+
+
+    public:
+
+        // Constructors
+
+            //- Construct from components
+            inline trackData
+            (
+                ReactingCloud<ParcelType>& cloud,
+                const constantProperties& constProps,
+                const interpolation<scalar>& rhoInterp,
+                const interpolation<vector>& UInterp,
+                const interpolation<scalar>& muInterp,
+                const interpolation<scalar>& TInterp,
+                const interpolation<scalar>& CpInterp,
+                const interpolation<scalar>& pInterp,
+                const vector& g
+            );
+
+
+        // Member functions
+
+            //- Return const access to the constant properties
+            inline const constantProperties& constProps() const;
+    };
+
+
+protected:
+
+    // Protected data
+
+        // Parcel properties
+
+            //- Mass fractions of gases []
+            scalarField YGas_;
+
+            //- Mass fractions of liquids []
+            scalarField YLiquid_;
+
+            //- Mass fractions of solids []
+            scalarField YSolid_;
+
+            //- Flag to say that the particle is allowed to combust
+            //  Only true after volatile content falls below threshold value
+            bool canCombust_;
+
+
+    // Protected member functions
+
+        //- Calculate Devolatilisation
+        template<class TrackData>
+        void calcDevolatilisation
+        (
+            TrackData& td,
+            const scalar dt,
+            const scalar T0,
+            const scalar T1,
+            scalarList& dMassMT
+        );
+
+        //- Calculate surface reactions
+        template<class TrackData>
+        void calcSurfaceReactions
+        (
+            TrackData& td,
+            const scalar dt,
+            const label celli,
+            const scalar T0,
+            const scalar T1,
+            const scalarList& dMassMT,
+            scalarList& dMassSR,
+            scalar& dhRet
+        );
+
+
+public:
+
+    //- Runtime type information
+    TypeName("ReactingMultiphaseParcel");
+
+    friend class Cloud<ParcelType>;
+
+
+    // Constructors
+
+        //- Construct from components
+        inline ReactingMultiphaseParcel
+        (
+            ReactingCloud<ParcelType>& owner,
+            const label typeId,
+            const vector& position,
+            const label celli,
+            const scalar d0,
+            const vector& U0,
+            const scalar nParticle0,
+            const scalarField& YGas0,
+            const scalarField& YLiquid0,
+            const scalarField& YSolid0,
+            const scalarField& YMixture0,
+            const constantProperties& constProps
+        );
+
+        //- Construct from Istream
+        ReactingMultiphaseParcel
+        (
+            const Cloud<ParcelType>& c,
+            Istream& is,
+            bool readFields = true
+        );
+
+        //- Construct and return a clone
+        autoPtr<ParcelType> clone() const
+        {
+            return autoPtr<ParcelType>
+            (
+                new ReactingMultiphaseParcel<ParcelType>(*this)
+            );
+        }
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return const access to mass fractions of gases
+            inline const scalarField& YGas() const;
+
+            //- Return const access to mass fractions of liquids
+            inline const scalarField& YLiquid() const;
+
+            //- Return const access to mass fractions of solids
+            inline const scalarField& YSolid() const;
+
+
+        // Edit
+
+            //- Return access to mass fractions of gases
+            inline scalarField& YGas();
+
+            //- Return access to mass fractions of liquids
+            inline scalarField& YLiquid();
+
+            //- Return access to mass fractions of solids
+            inline scalarField& YSolid();
+
+
+        // Main calculation loop
+
+            //- Update cell based quantities
+            template<class TrackData>
+            void updateCellQuantities
+            (
+                TrackData& td,
+                const scalar dt,
+                const label celli
+            );
+
+            //- Coupled calculation with the continuous phase
+            template<class TrackData>
+            void calcCoupled
+            (
+                TrackData& td,
+                const scalar dt,
+                const label celli
+            );
+
+            //- Uncoupled calculation with the continuous phase
+            template<class TrackData>
+            void calcUncoupled
+            (
+                TrackData& td,
+                const scalar dt,
+                const label
+            );
+
+
+        // I-O
+
+            //- Read
+            static void readFields(ReactingCloud<ParcelType>& c);
+
+        //- Write
+        static void writeFields(const ReactingCloud<ParcelType>& c);
+
+
+    // Ostream Operator
+
+        friend Ostream& operator<< <ParcelType>
+        (
+            Ostream&,
+            const ReactingMultiphaseParcel<ParcelType>&
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "ReactingMultiphaseParcelI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "ReactingMultiphaseParcel.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
+
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
new file mode 100644
index 0000000000..87a7cb2d8c
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
@@ -0,0 +1,191 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class ParcelType>
+inline Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::
+constantProperties
+(
+    const dictionary& dict
+)
+:
+    ReactingParcel<ParcelType>::constantProperties(dict),
+    Tvap_(dimensionedScalar(dict.lookup("Tvap")).value()),
+    Tbp_(dimensionedScalar(dict.lookup("Tbp")).value()),
+    Ldevol_(dimensionedScalar(dict.lookup("Ldevol")).value())
+{}
+
+
+template<class ParcelType>
+inline Foam::ReactingMultiphaseParcel<ParcelType>::trackData::trackData
+(
+    ReactingCloud<ParcelType>& cloud,
+    const constantProperties& constProps,
+    const interpolation<scalar>& rhoInterp,
+    const interpolation<vector>& UInterp,
+    const interpolation<scalar>& muInterp,
+    const interpolation<scalar>& TInterp,
+    const interpolation<scalar>& CpInterp,
+    const interpolation<scalar>& pInterp,
+    const vector& g
+)
+:
+    ReactingParcel<ParcelType>::trackData
+    (
+        cloud,
+        constProps,
+        rhoInterp,
+        UInterp,
+        muInterp,
+        TInterp,
+        CpInterp,
+        pInterp,
+        g
+    )
+{}
+
+
+template<class ParcelType>
+inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
+(
+    ReactingCloud<ParcelType>& owner,
+    const label typeId,
+    const vector& position,
+    const label celli,
+    const scalar d0,
+    const vector& U0,
+    const scalar nParticle0,
+    const scalarField& YGas0,
+    const scalarField& YLiquid0,
+    const scalarField& YSolid0,
+    const scalarField& YMixture0,
+    const constantProperties& constProps
+)
+:
+    ReactingParcel<ParcelType>
+    (
+        owner,
+        typeId,
+        position,
+        celli,
+        d0,
+        U0,
+        nParticle0,
+        YMixture0,
+        constProps
+    ),
+    YGas_(YGas0),
+    YLiquid_(YLiquid0),
+    YSolid_(YSolid0)
+{}
+
+
+// * * * * * * * * * constantProperties Member Functions * * * * * * * * * * //
+
+template<class ParcelType>
+inline Foam::scalar
+Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::Tvap() const
+{
+    return Tvap_;
+}
+
+
+template<class ParcelType>
+inline Foam::scalar
+Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::Tbp() const
+{
+    return Tbp_;
+}
+
+
+template<class ParcelType>
+inline Foam::scalar
+Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::Ldevol() const
+{
+    return Ldevol_;
+}
+
+
+// * * * * * * * * * * * trackData Member Functions  * * * * * * * * * * * * //
+
+template<class ParcelType>
+inline const typename Foam::ReactingMultiphaseParcel<ParcelType>::
+constantProperties&
+Foam::ReactingMultiphaseParcel<ParcelType>::trackData::constProps() const
+{
+    return constProps_;
+}
+
+
+// * * * * * * * * * * ThermoParcel Member Functions * * * * * * * * * * * * //
+
+template<class ParcelType>
+inline const Foam::scalarField& Foam::ReactingMultiphaseParcel<ParcelType>::
+YGas() const
+{
+    return YGas_;
+}
+
+
+template<class ParcelType>
+inline Foam::scalarField& Foam::ReactingMultiphaseParcel<ParcelType>::YGas()
+{
+    return YGas_;
+}
+
+
+template<class ParcelType>
+inline const Foam::scalarField& Foam::ReactingMultiphaseParcel<ParcelType>::
+YLiquid() const
+{
+    return YLiquid_;
+}
+
+
+template<class ParcelType>
+inline Foam::scalarField& Foam::ReactingMultiphaseParcel<ParcelType>::YLiquid()
+{
+    return YLiquid_;
+}
+
+
+template<class ParcelType>
+inline const Foam::scalarField& Foam::ReactingMultiphaseParcel<ParcelType>::
+YSolid() const
+{
+    return YSolid_;
+}
+
+
+template<class ParcelType>
+inline Foam::scalarField& Foam::ReactingMultiphaseParcel<ParcelType>::YSolid()
+{
+    return YSolid_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
new file mode 100644
index 0000000000..bc1e46336e
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
@@ -0,0 +1,276 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "ReactingMultiphaseParcel.H"
+#include "IOstreams.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class ParcelType>
+Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
+(
+    const Cloud<ParcelType>& cloud,
+    Istream& is,
+    bool readFields
+)
+:
+    ReactingParcel<ParcelType>(cloud, is, readFields),
+    YGas_(0),
+    YLiquid_(0),
+    YSolid_(0)
+{
+    if (readFields)
+    {
+        const ReactingCloud<ParcelType>& cR =
+            dynamic_cast<const ReactingCloud<ParcelType>& >(cloud);
+
+        const label nGas = cR.composition().gasNames().size();
+        const label nLiquid = cR.composition().liquidNames().size();
+        const label nSolid = cR.composition().solidNames().size();
+
+        YGas_.setSize(nGas);
+        YLiquid_.setSize(nLiquid);
+        YSolid_.setSize(nSolid);
+
+        const scalarField& YMix = this->YMixture_;
+        if (is.format() == IOstream::ASCII)
+        {
+            is >> YGas_ >> YLiquid_ >> YSolid_;
+            YGas_ /= YMix[0] + VSMALL;
+            YLiquid_ /= YMix[1] + VSMALL;
+            YSolid_ /= YMix[2] + VSMALL;
+        }
+        else
+        {
+            is >> YGas_ >> YLiquid_ >> YSolid_;
+            YGas_ /= YMix[0] + VSMALL;
+            YLiquid_ /= YMix[1] + VSMALL;
+            YSolid_ /= YMix[2] + VSMALL;
+        }
+    }
+
+    // Check state of Istream
+    is.check
+    (
+        "ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel\n"
+        "(\n"
+        "    const Cloud<ParcelType>&,\n"
+        "    Istream&,\n"
+        "    bool\n"
+        ")"
+    );
+}
+
+
+template<class ParcelType>
+void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
+(
+    ReactingCloud<ParcelType>& c
+)
+{
+    if (!c.size())
+    {
+        return;
+    }
+
+    ReactingParcel<ParcelType>::readFields(c);
+
+    // Get names and sizes for each Y...
+    const wordList gasNames = c.composition().gasNames();
+    const wordList liquidNames = c.composition().liquidNames();
+    const wordList solidNames = c.composition().solidNames();
+    const label nGas = gasNames.size();
+    const label nLiquid = liquidNames.size();
+    const label nSolid = solidNames.size();
+
+    // Set storage for each Y... for each parcel
+    forAllIter(typename Cloud<ParcelType>, c, iter)
+    {
+        ReactingMultiphaseParcel<ParcelType>& p = iter();
+        p.YGas_.setSize(nGas, 0.0);
+        p.YLiquid_.setSize(nLiquid, 0.0);
+        p.YSolid_.setSize(nSolid, 0.0);
+    }
+
+    // Populate YGas for each parcel
+    forAll(gasNames, j)
+    {
+        IOField<scalar> YGas
+        (
+            c.fieldIOobject("Y" + gasNames[j], IOobject::MUST_READ)
+        );
+
+        label i = 0;
+        forAllIter(typename Cloud<ParcelType>, c, iter)
+        {
+            ReactingMultiphaseParcel<ParcelType>& p = iter();
+            p.YGas_[j] = YGas[i++]/p.YMixture()[0];
+        }
+    }
+    // Populate YLiquid for each parcel
+    forAll(liquidNames, j)
+    {
+        IOField<scalar> YLiquid
+        (
+            c.fieldIOobject("Y" + liquidNames[j], IOobject::MUST_READ)
+        );
+
+        label i = 0;
+        forAllIter(typename Cloud<ParcelType>, c, iter)
+        {
+            ReactingMultiphaseParcel<ParcelType>& p = iter();
+            p.YLiquid_[j] = YLiquid[i++]/p.YMixture()[1];
+        }
+    }
+    // Populate YSolid for each parcel
+    forAll(solidNames, j)
+    {
+        IOField<scalar> YSolid
+        (
+            c.fieldIOobject("Y" + solidNames[j], IOobject::MUST_READ)
+        );
+
+        label i = 0;
+        forAllIter(typename Cloud<ParcelType>, c, iter)
+        {
+            ReactingMultiphaseParcel<ParcelType>& p = iter();
+            p.YSolid_[j] = YSolid[i++]/p.YMixture()[2];
+        }
+    }
+}
+
+
+template<class ParcelType>
+void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
+(
+    const ReactingCloud<ParcelType>& c
+)
+{
+    ReactingParcel<ParcelType>::writeFields(c);
+
+    label np =  c.size();
+
+    // Write the composition fractions
+    if (np > 0)
+    {
+        const wordList& gasNames = c.composition().gasNames();
+        forAll(gasNames, j)
+        {
+            IOField<scalar> YGas
+            (
+                c.fieldIOobject("Y" + gasNames[j], IOobject::NO_READ),
+                np
+            );
+
+            label i = 0;
+            forAllConstIter(typename Cloud<ParcelType>, c, iter)
+            {
+                const ReactingMultiphaseParcel<ParcelType>& p0 = iter();
+                YGas[i++] = p0.YGas()[j]*p0.YMixture()[0];
+            }
+
+            YGas.write();
+        }
+        const wordList& liquidNames = c.composition().liquidNames();
+        forAll(liquidNames, j)
+        {
+            IOField<scalar> YLiquid
+            (
+                c.fieldIOobject("Y" + liquidNames[j], IOobject::NO_READ),
+                np
+            );
+
+            label i = 0;
+            forAllConstIter(typename Cloud<ParcelType>, c, iter)
+            {
+                const ReactingMultiphaseParcel<ParcelType>& p0 = iter();
+                YLiquid[i++] = p0.YLiquid()[j]*p0.YMixture()[1];
+            }
+
+            YLiquid.write();
+        }
+        const wordList& solidNames = c.composition().solidNames();
+        forAll(solidNames, j)
+        {
+            IOField<scalar> YSolid
+            (
+                c.fieldIOobject("Y" + solidNames[j], IOobject::NO_READ),
+                np
+            );
+
+            label i = 0;
+            forAllConstIter(typename Cloud<ParcelType>, c, iter)
+            {
+                const ReactingMultiphaseParcel<ParcelType>& p0 = iter();
+                YSolid[i++] = p0.YSolid()[j]*p0.YMixture()[2];
+            }
+
+            YSolid.write();
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+template<class ParcelType>
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const ReactingMultiphaseParcel<ParcelType>& p
+)
+{
+    scalarField YGasLoc = p.YGas()*p.YMixture()[0];
+    scalarField YLiquidLoc = p.YLiquid()*p.YMixture()[1];
+    scalarField YSolidLoc = p.YSolid()*p.YMixture()[2];
+    if (os.format() == IOstream::ASCII)
+    {
+        os  << static_cast<const ReactingParcel<ParcelType>& >(p)
+            << token::SPACE << YGasLoc
+            << token::SPACE << YLiquidLoc
+            << token::SPACE << YSolidLoc;
+    }
+    else
+    {
+        os  << static_cast<const ReactingParcel<ParcelType>& >(p);
+        os << YGasLoc << YLiquidLoc << YSolidLoc;
+    }
+
+    // Check state of Ostream
+    os.check
+    (
+        "Ostream& operator<<\n"
+        "(\n"
+        "    Ostream&,\n"
+        "    const ReactingMultiphaseParcel<ParcelType>&\n"
+        ")"
+    );
+
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index 4aec91355a..ee91bda829 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -94,8 +94,14 @@ void Foam::ReactingParcel<ParcelType>::calcCoupled
     scalar T1 = calcHeatTransfer(td, dt, celli, htc, dhTrans);
 
 
+    // ~~~~~~~~~~~~~~~~~~~~~~
+    // Calculate phase change
+    // ~~~~~~~~~~~~~~~~~~~~~~
+    calcPhaseChange(td, dt, T0, T1, dMassMT);
+
+
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate Devolatilisation
+    // Calculate devolatilisation
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~
     calcDevolatilisation(td, dt, T0, T1, dMassMT);
 
@@ -112,29 +118,11 @@ void Foam::ReactingParcel<ParcelType>::calcCoupled
     // New total mass
     const scalar mass1 = mass0 - sum(dMassMT) - sum(dMassSR);
 
-    // Correct particle temperature to account for latent heat of
-    // devolatilisation
-    T1 -=
-        td.constProps().Ldevol()
-       *sum(dMassMT)
-       /(0.5*(mass0 + mass1)*cp0);
-
     // Add retained enthalpy from surface reaction to particle and remove
     // from gas
     T1 += dhRet/(0.5*(mass0 + mass1)*cp0);
     dhTrans -= dhRet;
 
-    // Correct dhTrans to account for enthalpy of evolved volatiles
-    dhTrans +=
-        sum(dMassMT)
-       *td.cloud().composition().HGas(YGas_, 0.5*(T0 + T1));
-
-    // Correct dhTrans to account for enthalpy of consumed solids
-    dhTrans +=
-        sum(dMassSR)
-       *td.cloud().composition().HSolid(YSolid_, 0.5*(T0 + T1));
-
-
     // ~~~~~~~~~~~~~~~~~~~~~~~
     // Accumulate source terms
     // ~~~~~~~~~~~~~~~~~~~~~~~
@@ -171,12 +159,6 @@ void Foam::ReactingParcel<ParcelType>::calcCoupled
         {
             td.cloud().rhoTrans(i)[celli] += np0*dMassMT[i];
         }
-        td.cloud().hTrans()[celli] +=
-            np0*mass1
-           *(
-                YMixture_[0]*td.cloud().composition().HGas(YGas_, T1)
-              + YMixture_[2]*td.cloud().composition().HSolid(YSolid_, T1)
-            );
         td.cloud().UTrans()[celli] += np0*mass1*U1;
     }
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -186,10 +168,7 @@ void Foam::ReactingParcel<ParcelType>::calcCoupled
     {
         this->U_ = U1;
         this->T_ = T1;
-        this->cp_ =
-            YMixture_[0]*td.cloud().composition().cpGas(YGas_, T1)
-          + YMixture_[1]*td.cloud().composition().cpLiquid(YLiquid_, pc_, T1)
-          + YMixture_[2]*td.cloud().composition().cpSolid(YSolid_);
+        //        this->cp_ = ??? // TODO:
 
         // Update particle density or diameter
         if (td.constProps().constantVolume())
@@ -253,8 +232,14 @@ void Foam::ReactingParcel<ParcelType>::calcUncoupled
     scalar T1 = calcHeatTransfer(td, dt, celli, htc, dhTrans);
 
 
+    // ~~~~~~~~~~~~~~~~~~~~~~
+    // Calculate phase change
+    // ~~~~~~~~~~~~~~~~~~~~~~
+    calcPhaseChange(td, dt, T0, T1, dMassMT);
+
+
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate Devolatilisation
+    // Calculate devolatilisation
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~
     calcDevolatilisation(td, dt, T0, T1, dMassMT);
 
@@ -272,10 +257,7 @@ void Foam::ReactingParcel<ParcelType>::calcUncoupled
     const scalar mass1 = mass0 - sum(dMassMT) - sum(dMassSR);
 
     // New specific heat capacity
-    const scalar cp1 =
-        YMixture_[0]*td.cloud().composition().cpGas(YGas_, T1)
-      + YMixture_[1]*td.cloud().composition().cpLiquid(YLiquid_, pc_, T1)
-      + YMixture_[2]*td.cloud().composition().cpSolid(YSolid_);
+    const scalar cp1 = cp0; // TODO: new cp1
 
     // Add retained enthalpy to particle
     T1 += dhRet/(mass0*0.5*(cp0 + cp1));
@@ -311,7 +293,7 @@ void Foam::ReactingParcel<ParcelType>::calcUncoupled
 
 template<class ParcelType>
 template<class TrackData>
-void Foam::ReactingParcel<ParcelType>::calcDevolatilisation
+void Foam::ReactingParcel<ParcelType>::calcPhaseChange
 (
     TrackData& td,
     const scalar dt,
@@ -320,28 +302,12 @@ void Foam::ReactingParcel<ParcelType>::calcDevolatilisation
     scalarList& dMassMT
 )
 {
-    if (td.cloud().composition().YMixture0()[1]>SMALL)
-    {
-        notImplemented
-        (
-            "void Foam::ReactingParcel<ParcelType>::"
-            "calcDevolatilisation(...): no treatment currently "
-            "available for particles containing liquid species"
-        )
-    }
-
-    // Check that model is active, and that the parcel temperature is
-    // within necessary limits for devolatilisation to occur
-    if
-    (
-        !td.cloud().devolatilisation().active()
-     || this->T_<td.constProps().Tvap()
-     || this->T_<td.constProps().Tbp()
-    )
+    //    if (!td.cloud().phaseChange().active())
     {
         return;
     }
 
+    /*
     // Determine mass to add to carrier phase
     const scalar mass = this->mass();
     const scalar dMassTot = td.cloud().devolatilisation().calculate
@@ -369,50 +335,7 @@ void Foam::ReactingParcel<ParcelType>::calcDevolatilisation
         scalar volatileMass = YGas_[i]*dMassTot;
         dMassMT[id] += volatileMass;
     }
-}
-
-
-template<class ParcelType>
-template<class TrackData>
-void Foam::ReactingParcel<ParcelType>::calcSurfaceReactions
-(
-    TrackData& td,
-    const scalar dt,
-    const label celli,
-    const scalar T0,
-    const scalar T1,
-    const scalarList& dMassMT,
-    scalarList& dMassSR,
-    scalar& dhRet
-)
-{
-    // Check that model is active
-    if (!td.cloud().surfaceReaction().active() || !canCombust_)
-    {
-        return;
-    }
-
-    // Update mass transfer(s)
-    // - Also updates Y()'s
-    td.cloud().surfaceReaction().calculate
-    (
-        dt,
-        celli,
-        this->d_,
-        T0,
-        T1,
-        this->Tc_,
-        pc_,
-        this->rhoc_,
-        this->mass(),
-        dMassMT,
-        YGas_,
-        YLiquid_,
-        YSolid_,
-        YMixture_,
-        dMassSR,
-        dhRet
-    );
+        */
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index 666e1cf1ff..9f0cd7b6c1 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -26,9 +26,8 @@ Class
     Foam::ReactingParcel
 
 Description
-    Reactinf parcel class with one/two-way coupling with the continuous
-    phase. Includes thermo parcel sub-models, plus:
-    - combustion
+    Reacting parcel class with one/two-way coupling with the continuous
+    phase.
 
 SourceFiles
     ReactingParcelI.H
@@ -80,18 +79,8 @@ public:
     :
         public ThermoParcel<ParcelType>::constantProperties
     {
-
         // Private data
 
-            //- Vapourisation temperature [K]
-            const scalar Tvap_;
-
-            //- Boiling point [K]
-            const scalar Tbp_;
-
-            //- Latent heat of devolatilisation [J/kg]
-            const scalar Ldevol_;
-
             //- Constant volume flag - e.g. during mass transfer
             Switch constantVolume_;
 
@@ -103,15 +92,6 @@ public:
 
         // Access
 
-            //- Return const access to the vapourisation temperature
-            inline scalar Tvap() const;
-
-            //- Return const access to the boiling point
-            inline scalar Tbp() const;
-
-            //- Return const access to the latent heat of devolatilisation
-            inline scalar Ldevol() const;
-
             //- Return const access to the constant volume flag
             inline Switch constantVolume() const;
     };
@@ -180,19 +160,6 @@ protected:
             //- Mass fractions of mixture []
             scalarField YMixture_;
 
-            //- Mass fractions of gases []
-            scalarField YGas_;
-
-            //- Mass fractions of liquids []
-            scalarField YLiquid_;
-
-            //- Mass fractions of solids []
-            scalarField YSolid_;
-
-            //- Flag to say that the particle is allowed to combust
-            //  Only true after volatile content falls below threshold value
-            bool canCombust_;
-
 
         // Cell-based quantities
 
@@ -202,9 +169,9 @@ protected:
 
     // Protected member functions
 
-        //- Calculate Devolatilisation
+        //- Calculate Phase change
         template<class TrackData>
-        void calcDevolatilisation
+        void calcPhaseChange
         (
             TrackData& td,
             const scalar dt,
@@ -213,20 +180,6 @@ protected:
             scalarList& dMassMT
         );
 
-        //- Calculate surface reactions
-        template<class TrackData>
-        void calcSurfaceReactions
-        (
-            TrackData& td,
-            const scalar dt,
-            const label celli,
-            const scalar T0,
-            const scalar T1,
-            const scalarList& dMassMT,
-            scalarList& dMassSR,
-            scalar& dhRet
-        );
-
 
 public:
 
@@ -248,9 +201,6 @@ public:
             const scalar d0,
             const vector& U0,
             const scalar nParticle0,
-            const scalarField& YGas0,
-            const scalarField& YLiquid0,
-            const scalarField& YSolid0,
             const scalarField& YMixture0,
             const constantProperties& constProps
         );
@@ -274,39 +224,24 @@ public:
 
         // Access
 
-            //- Return const access to mass fractions of gases
-            inline const scalarField& YGas() const;
-
-            //- Return const access to mass fractions of liquids
-            inline const scalarField& YLiquid() const;
-
-            //- Return const access to mass fractions of solids
-            inline const scalarField& YSolid() const;
+            //- Return const access to initial mass
+            inline scalar mass0() const;
 
             //- Return const access to mass fractions of mixture
             inline const scalarField& YMixture() const;
 
-            //- Return const access to initial mass
-            inline scalar mass0() const;
+            //- Return the owner cell pressure
+            inline scalar pc() const;
 
 
         // Edit
 
-            //- Return access to mass fractions of gases
-            inline scalarField& YGas();
-
-            //- Return access to mass fractions of liquids
-            inline scalarField& YLiquid();
-
-            //- Return access to mass fractions of solids
-            inline scalarField& YSolid();
+            //- Return access to initial mass
+            inline scalar& mass0();
 
             //- Return access to mass fractions of mixture
             inline scalarField& YMixture();
 
-            //- Return access to initial mass
-            inline scalar& mass0();
-
 
         // Main calculation loop
 
@@ -340,8 +275,10 @@ public:
 
         // I-O
 
+            //- Read
             static void readFields(ReactingCloud<ParcelType>& c);
 
+            //- Write
             static void writeFields(const ReactingCloud<ParcelType>& c);
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
index d4db4722d6..1a5950b332 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
@@ -33,9 +33,6 @@ inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties
 )
 :
     ThermoParcel<ParcelType>::constantProperties(dict),
-    Tvap_(dimensionedScalar(dict.lookup("Tvap")).value()),
-    Tbp_(dimensionedScalar(dict.lookup("Tbp")).value()),
-    Ldevol_(dimensionedScalar(dict.lookup("Ldevol")).value()),
     constantVolume_(dict.lookup("constantVolume"))
 {}
 
@@ -81,9 +78,6 @@ inline Foam::ReactingParcel<ParcelType>::ReactingParcel
     const scalar d0,
     const vector& U0,
     const scalar nParticle0,
-    const scalarField& YGas0,
-    const scalarField& YLiquid0,
-    const scalarField& YSolid0,
     const scalarField& YMixture0,
     const constantProperties& constProps
 )
@@ -101,9 +95,6 @@ inline Foam::ReactingParcel<ParcelType>::ReactingParcel
     ),
     mass0_(0.0),
     YMixture_(YMixture0),
-    YGas_(YGas0),
-    YLiquid_(YLiquid0),
-    YSolid_(YSolid0),
     pc_(0.0)
 {
     // Set initial parcel mass
@@ -113,30 +104,6 @@ inline Foam::ReactingParcel<ParcelType>::ReactingParcel
 
 // * * * * * * * * * constantProperties Member Functions * * * * * * * * * * //
 
-template<class ParcelType>
-inline Foam::scalar
-Foam::ReactingParcel<ParcelType>::constantProperties::Tvap() const
-{
-    return Tvap_;
-}
-
-
-template<class ParcelType>
-inline Foam::scalar
-Foam::ReactingParcel<ParcelType>::constantProperties::Tbp() const
-{
-    return Tbp_;
-}
-
-
-template<class ParcelType>
-inline Foam::scalar
-Foam::ReactingParcel<ParcelType>::constantProperties::Ldevol() const
-{
-    return Ldevol_;
-}
-
-
 template<class ParcelType>
 inline Foam::Switch
 Foam::ReactingParcel<ParcelType>::constantProperties::constantVolume() const
@@ -173,62 +140,6 @@ Foam::ReactingParcel<ParcelType>::trackData::pInterp() const
 
 // * * * * * * * * * * ThermoParcel Member Functions * * * * * * * * * * * * //
 
-template<class ParcelType>
-inline const Foam::scalarField& Foam::ReactingParcel<ParcelType>::YGas() const
-{
-    return YGas_;
-}
-
-
-template<class ParcelType>
-inline Foam::scalarField& Foam::ReactingParcel<ParcelType>::YGas()
-{
-    return YGas_;
-}
-
-
-template<class ParcelType>
-inline const Foam::scalarField& Foam::ReactingParcel<ParcelType>::YLiquid() const
-{
-    return YLiquid_;
-}
-
-
-template<class ParcelType>
-inline Foam::scalarField& Foam::ReactingParcel<ParcelType>::YLiquid()
-{
-    return YLiquid_;
-}
-
-
-template<class ParcelType>
-inline const Foam::scalarField& Foam::ReactingParcel<ParcelType>::YSolid() const
-{
-    return YSolid_;
-}
-
-
-template<class ParcelType>
-inline Foam::scalarField& Foam::ReactingParcel<ParcelType>::YSolid()
-{
-    return YSolid_;
-}
-
-
-template<class ParcelType>
-inline const Foam::scalarField& Foam::ReactingParcel<ParcelType>::YMixture() const
-{
-    return YMixture_;
-}
-
-
-template<class ParcelType>
-inline Foam::scalarField& Foam::ReactingParcel<ParcelType>::YMixture()
-{
-    return YMixture_;
-}
-
-
 template<class ParcelType>
 inline Foam::scalar Foam::ReactingParcel<ParcelType>::mass0() const
 {
@@ -236,6 +147,21 @@ inline Foam::scalar Foam::ReactingParcel<ParcelType>::mass0() const
 }
 
 
+template<class ParcelType>
+inline const Foam::scalarField& Foam::ReactingParcel<ParcelType>::
+YMixture() const
+{
+    return YMixture_;
+}
+
+
+template<class ParcelType>
+inline Foam::scalar Foam::ReactingParcel<ParcelType>::pc() const
+{
+    return pc_;
+}
+
+
 template<class ParcelType>
 inline Foam::scalar& Foam::ReactingParcel<ParcelType>::mass0()
 {
@@ -243,4 +169,11 @@ inline Foam::scalar& Foam::ReactingParcel<ParcelType>::mass0()
 }
 
 
+template<class ParcelType>
+inline Foam::scalarField& Foam::ReactingParcel<ParcelType>::YMixture()
+{
+    return YMixture_;
+}
+
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
index fb9a914273..0a81cdfd3f 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
@@ -40,9 +40,6 @@ Foam::ReactingParcel<ParcelType>::ReactingParcel
     ThermoParcel<ParcelType>(cloud, is, readFields),
     mass0_(0.0),
     YMixture_(0),
-    YGas_(0),
-    YLiquid_(0),
-    YSolid_(0),
     pc_(0.0)
 {
     if (readFields)
@@ -51,21 +48,11 @@ Foam::ReactingParcel<ParcelType>::ReactingParcel
             dynamic_cast<const ReactingCloud<ParcelType>& >(cloud);
 
         const label nMixture = cR.composition().compositionNames().size();
-        const label nGas = cR.composition().gasNames().size();
-        const label nLiquid = cR.composition().liquidNames().size();
-        const label nSolid = cR.composition().solidNames().size();
-
         YMixture_.setSize(nMixture);
-        YGas_.setSize(nGas);
-        YLiquid_.setSize(nLiquid);
-        YSolid_.setSize(nSolid);
 
         if (is.format() == IOstream::ASCII)
         {
-            is >> mass0_ >> YMixture_ >> YGas_ >> YLiquid_ >> YSolid_;
-            YGas_ /= YMixture_[0] + VSMALL;
-            YLiquid_ /= YMixture_[1] + VSMALL;
-            YSolid_ /= YMixture_[2] + VSMALL;
+            is >> mass0_ >> YMixture_;
         }
         else
         {
@@ -74,18 +61,19 @@ Foam::ReactingParcel<ParcelType>::ReactingParcel
                 reinterpret_cast<char*>(&mass0_),
               + sizeof(mass0_)
             );
-            is >> YMixture_ >> YGas_ >> YLiquid_ >> YSolid_;
-            YGas_ /= YMixture_[0] + VSMALL;
-            YLiquid_ /= YMixture_[1] + VSMALL;
-            YSolid_ /= YMixture_[2] + VSMALL;
+            is >> YMixture_;
         }
     }
 
     // Check state of Istream
     is.check
     (
-        "ReactingParcel<ParcelType>::ReactingParcel"
-        "(const Cloud<ParcelType>&, Istream&, bool)"
+        "ReactingParcel<ParcelType>::ReactingParcel\n"
+        "(\n"
+        "    const Cloud<ParcelType>&,\n"
+        "    Istream&,\n"
+        "    bool\n"
+        ")\n"
     );
 }
 
@@ -115,22 +103,13 @@ void Foam::ReactingParcel<ParcelType>::readFields
 
     // Get names and sizes for each Y...
     const wordList compositionNames = c.composition().compositionNames();
-    const wordList gasNames = c.composition().gasNames();
-    const wordList liquidNames = c.composition().liquidNames();
-    const wordList solidNames = c.composition().solidNames();
     const label nComposition = compositionNames.size();
-    const label nGas = gasNames.size();
-    const label nLiquid = liquidNames.size();
-    const label nSolid = solidNames.size();
 
     // Set storage for each Y... for each parcel
     forAllIter(typename Cloud<ParcelType>, c, iter)
     {
         ReactingParcel<ParcelType>& p = iter();
         p.YMixture_.setSize(nComposition, 0.0);
-        p.YGas_.setSize(nGas, 0.0);
-        p.YLiquid_.setSize(nLiquid, 0.0);
-        p.YSolid_.setSize(nSolid, 0.0);
     }
 
     // Populate YMixture for each parcel
@@ -148,51 +127,6 @@ void Foam::ReactingParcel<ParcelType>::readFields
             p.YMixture_[j] = YMixture[i++];
         }
     }
-    // Populate YGas for each parcel
-    forAll(gasNames, j)
-    {
-        IOField<scalar> YGas
-        (
-            c.fieldIOobject("Y" + gasNames[j], IOobject::MUST_READ)
-        );
-
-        label i = 0;
-        forAllIter(typename Cloud<ParcelType>, c, iter)
-        {
-            ReactingParcel<ParcelType>& p = iter();
-            p.YGas_[j] = YGas[i++]/p.YMixture_[0];
-        }
-    }
-    // Populate YLiquid for each parcel
-    forAll(liquidNames, j)
-    {
-        IOField<scalar> YLiquid
-        (
-            c.fieldIOobject("Y" + liquidNames[j], IOobject::MUST_READ)
-        );
-
-        label i = 0;
-        forAllIter(typename Cloud<ParcelType>, c, iter)
-        {
-            ReactingParcel<ParcelType>& p = iter();
-            p.YLiquid_[j] = YLiquid[i++]/p.YMixture_[1];
-        }
-    }
-    // Populate YSolid for each parcel
-    forAll(solidNames, j)
-    {
-        IOField<scalar> YSolid
-        (
-            c.fieldIOobject("Y" + solidNames[j], IOobject::MUST_READ)
-        );
-
-        label i = 0;
-        forAllIter(typename Cloud<ParcelType>, c, iter)
-        {
-            ReactingParcel<ParcelType>& p = iter();
-            p.YSolid_[j] = YSolid[i++]/p.YMixture_[2];
-        }
-    }
 }
 
 
@@ -238,60 +172,6 @@ void Foam::ReactingParcel<ParcelType>::writeFields
 
             YMixture.write();
         }
-        const wordList& gasNames = c.composition().gasNames();
-        forAll(gasNames, j)
-        {
-            IOField<scalar> YGas
-            (
-                c.fieldIOobject("Y" + gasNames[j], IOobject::NO_READ),
-                np
-            );
-
-            label i = 0;
-            forAllConstIter(typename Cloud<ParcelType>, c, iter)
-            {
-                const ReactingParcel<ParcelType>& p0 = iter();
-                YGas[i++] = p0.YGas()[j]*p0.YMixture()[0];
-            }
-
-            YGas.write();
-        }
-        const wordList& liquidNames = c.composition().liquidNames();
-        forAll(liquidNames, j)
-        {
-            IOField<scalar> YLiquid
-            (
-                c.fieldIOobject("Y" + liquidNames[j], IOobject::NO_READ),
-                np
-            );
-
-            label i = 0;
-            forAllConstIter(typename Cloud<ParcelType>, c, iter)
-            {
-                const ReactingParcel<ParcelType>& p0 = iter();
-                YLiquid[i++] = p0.YLiquid()[j]*p0.YMixture()[1];
-            }
-
-            YLiquid.write();
-        }
-        const wordList& solidNames = c.composition().solidNames();
-        forAll(solidNames, j)
-        {
-            IOField<scalar> YSolid
-            (
-                c.fieldIOobject("Y" + solidNames[j], IOobject::NO_READ),
-                np
-            );
-
-            label i = 0;
-            forAllConstIter(typename Cloud<ParcelType>, c, iter)
-            {
-                const ReactingParcel<ParcelType>& p0 = iter();
-                YSolid[i++] = p0.YSolid()[j]*p0.YMixture()[2];
-            }
-
-            YSolid.write();
-        }
     }
 }
 
@@ -305,17 +185,11 @@ Foam::Ostream& Foam::operator<<
     const ReactingParcel<ParcelType>& p
 )
 {
-    scalarField YGasLoc = p.YGas()*p.YMixture()[0];
-    scalarField YLiquidLoc = p.YLiquid()*p.YMixture()[1];
-    scalarField YSolidLoc = p.YSolid()*p.YMixture()[2];
     if (os.format() == IOstream::ASCII)
     {
         os  << static_cast<const ThermoParcel<ParcelType>& >(p)
             << token::SPACE << p.mass0()
-            << token::SPACE << p.YMixture()
-            << token::SPACE << YGasLoc
-            << token::SPACE << YLiquidLoc
-            << token::SPACE << YSolidLoc;
+            << token::SPACE << p.YMixture();
     }
     else
     {
@@ -325,7 +199,7 @@ Foam::Ostream& Foam::operator<<
             reinterpret_cast<const char*>(&p.mass0_),
             sizeof(p.mass0())
         );
-        os << p.YMixture() << YGasLoc << YLiquidLoc << YSolidLoc;
+        os << p.YMixture();
     }
 
     // Check state of Ostream
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C
new file mode 100644
index 0000000000..8d9c68b8f6
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C
@@ -0,0 +1,97 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "basicReactingMultiphaseParcel.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(basicReactingMultiphaseParcel, 0);
+    defineParticleTypeNameAndDebug(basicReactingMultiphaseParcel, 0);
+    defineParcelTypeNameAndDebug(basicReactingMultiphaseParcel, 0);
+};
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::basicReactingMultiphaseParcel::basicReactingMultiphaseParcel
+(
+    ReactingCloud<basicReactingMultiphaseParcel>& owner,
+    const label typeId,
+    const vector& position,
+    const label celli,
+    const scalar d0,
+    const vector& U0,
+    const scalar nParticle0,
+    const scalarField& YGas0,
+    const scalarField& YLiquid0,
+    const scalarField& YSolid0,
+    const scalarField& YMixture0,
+    const constantProperties& constProps
+)
+:
+    ReactingMultiphaseParcel<basicReactingMultiphaseParcel>
+    (
+        owner,
+        typeId,
+        position,
+        celli,
+        d0,
+        U0,
+        nParticle0,
+        YGas0,
+        YLiquid0,
+        YSolid0,
+        YMixture0,
+        constProps
+    )
+{}
+
+
+Foam::basicReactingMultiphaseParcel::basicReactingMultiphaseParcel
+(
+    const Cloud<basicReactingMultiphaseParcel>& cloud,
+    Istream& is,
+    bool readFields
+)
+:
+    ReactingMultiphaseParcel<basicReactingMultiphaseParcel>
+    (
+        cloud,
+        is,
+        readFields
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * *  Destructors  * * * * * * * * * * * * * * //
+
+Foam::basicReactingMultiphaseParcel::~basicReactingMultiphaseParcel()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H
new file mode 100644
index 0000000000..7009ca98e0
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H
@@ -0,0 +1,116 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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::basicReactingMultiphaseParcel
+
+Description
+
+
+SourceFiles
+    basicReactingMultiphaseParcel.C
+    basicReactingMultiphaseParcelIO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef basicReactingMultiphaseParcel_H
+#define basicReactingMultiphaseParcel_H
+
+#include "ReactingMultiphaseParcel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+               Class basicReactingMultiphaseParcel Declaration
+\*---------------------------------------------------------------------------*/
+
+class basicReactingMultiphaseParcel
+:
+    public ReactingMultiphaseParcel<basicReactingMultiphaseParcel>
+{
+
+public:
+
+    //- Run-time type information
+    TypeName("basicReactingMultiphaseParcel");
+
+    // Constructors
+
+        //- Construct from components
+        basicReactingMultiphaseParcel
+        (
+             ReactingCloud<basicReactingMultiphaseParcel>& owner,
+             const label typeId,
+             const vector& position,
+             const label celli,
+             const scalar d0,
+             const vector& U0,
+             const scalar nParticle0,
+             const scalarField& YGas0,
+             const scalarField& YLiquid0,
+             const scalarField& YSolid0,
+             const scalarField& YMixture0,
+             const constantProperties& constProps
+        );
+
+        //- Construct from Istream
+        basicReactingMultiphaseParcel
+        (
+            const Cloud<basicReactingMultiphaseParcel>& c,
+            Istream& is,
+            bool readFields = true
+        );
+
+        //- Construct and return a clone
+        autoPtr<basicReactingMultiphaseParcel> clone() const
+        {
+            return autoPtr<basicReactingMultiphaseParcel>
+                (new basicReactingMultiphaseParcel(*this));
+        }
+
+
+    // Destructor
+    virtual ~basicReactingMultiphaseParcel();
+};
+
+
+template<>
+inline bool contiguous<basicReactingMultiphaseParcel>()
+{
+    return false; // Now have scalar lists/fields (mass fractions)
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C
new file mode 100644
index 0000000000..4097dfa878
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C
@@ -0,0 +1,101 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "basicReactingMultiphaseParcel.H"
+#include "ReactingCloud.H"
+
+namespace Foam
+{
+    defineTemplateTypeNameAndDebug(Cloud<basicReactingMultiphaseParcel>, 0);
+
+    defineParcelTypeNameAndDebug
+    (
+        KinematicParcel<basicReactingMultiphaseParcel>,
+        0
+    );
+//    defineTemplateTypeNameAndDebug
+//    (
+//        KinematicParcel<basicReactingMultiphaseParcel>,
+//        0
+//    );
+    defineParcelTypeNameAndDebug
+    (
+        ThermoParcel<basicReactingMultiphaseParcel>,
+        0
+    );
+    defineTemplateTypeNameAndDebug
+    (
+        ThermoParcel<basicReactingMultiphaseParcel>,
+        0
+    );
+    defineParcelTypeNameAndDebug
+    (
+        ReactingParcel<basicReactingMultiphaseParcel>,
+        0
+    );
+    defineTemplateTypeNameAndDebug
+    (
+        ReactingParcel<basicReactingMultiphaseParcel>,
+        0
+    );
+
+    defineParcelTypeNameAndDebug
+    (
+        KinematicCloud<basicReactingMultiphaseParcel>,
+        0
+    );
+//    defineTemplateTypeNameAndDebug
+//    (
+//      KinematicCloud<basicReactingMultiphaseParcel>,
+//      0
+//    );
+
+    defineParcelTypeNameAndDebug
+    (
+        ThermoCloud<basicReactingMultiphaseParcel>,
+        0
+    );
+//    defineTemplateTypeNameAndDebug
+//    (
+//        ThermoCloud<basicReactingMultiphaseParcel>,
+//        0
+//    );
+
+    defineParcelTypeNameAndDebug
+    (
+        ReactingCloud<basicReactingMultiphaseParcel>,
+        0
+    );
+//    defineTemplateTypeNameAndDebug
+//    (
+//        ReactingCloud<basicReactingMultiphaseParcel>,
+//        0
+//    );
+
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelCompositionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelCompositionModels.C
new file mode 100644
index 0000000000..9ad0773a17
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelCompositionModels.C
@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "basicReactingMultiphaseParcel.H"
+#include "ReactingCloud.H"
+#include "SingleMixtureFraction.H"
+
+namespace Foam
+{
+    makeCompositionModel(ReactingCloud<basicReactingMultiphaseParcel>);
+
+    // Add instances of composition model to the table
+    makeCompositionModelType
+    (
+        SingleMixtureFraction,
+        ReactingCloud,
+        basicReactingMultiphaseParcel
+    );
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDevolatilisationModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDevolatilisationModels.C
new file mode 100644
index 0000000000..dc742aa7b1
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDevolatilisationModels.C
@@ -0,0 +1,59 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "basicReactingMultiphaseParcel.H"
+#include "ReactingCloud.H"
+#include "NoDevolatilisation.H"
+#include "ConstantRateDevolatilisation.H"
+#include "SingleKineticRateDevolatilisation.H"
+
+namespace Foam
+{
+    makeDevolatilisationModel(ReactingCloud<basicReactingMultiphaseParcel>);
+
+    // Add instances of mass transfer model to the table
+    makeDevolatilisationModelType
+    (
+        NoDevolatilisation,
+        ReactingCloud,
+        basicReactingMultiphaseParcel
+    );
+    makeDevolatilisationModelType
+    (
+        ConstantRateDevolatilisation,
+        ReactingCloud,
+        basicReactingMultiphaseParcel
+    );
+    makeDevolatilisationModelType
+    (
+        SingleKineticRateDevolatilisation,
+        ReactingCloud,
+        basicReactingMultiphaseParcel
+    );
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDispersionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDispersionModels.C
new file mode 100644
index 0000000000..1782cd5387
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDispersionModels.C
@@ -0,0 +1,65 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "basicReactingMultiphaseParcel.H"
+#include "KinematicCloud.H"
+#include "NoDispersion.H"
+#include "GradientDispersionRAS.H"
+#include "StochasticDispersionRAS.H"
+
+namespace Foam
+{
+    makeDispersionModel(KinematicCloud<basicReactingMultiphaseParcel>);
+
+    defineNamedTemplateTypeNameAndDebug
+    (
+        DispersionRASModel<KinematicCloud<basicReactingMultiphaseParcel> >,
+        0
+    );
+
+    // Add instances of dispersion model to the table
+    makeDispersionModelType
+    (
+        NoDispersion,
+        KinematicCloud,
+        basicReactingMultiphaseParcel
+    );
+    makeDispersionModelType
+    (
+        GradientDispersionRAS,
+        KinematicCloud,
+        basicReactingMultiphaseParcel
+    );
+    makeDispersionModelType
+    (
+        StochasticDispersionRAS,
+        KinematicCloud,
+        basicReactingMultiphaseParcel
+    );
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDragModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDragModels.C
new file mode 100644
index 0000000000..1cca5977ad
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDragModels.C
@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "basicReactingMultiphaseParcel.H"
+#include "KinematicCloud.H"
+#include "NoDrag.H"
+#include "SphereDrag.H"
+
+namespace Foam
+{
+    makeDragModel(KinematicCloud<basicReactingMultiphaseParcel>);
+
+    // Add instances of drag model to the table
+    makeDragModelType(NoDrag, KinematicCloud, basicReactingMultiphaseParcel);
+    makeDragModelType(SphereDrag, KinematicCloud, basicReactingMultiphaseParcel);
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelHeatTransferModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelHeatTransferModels.C
new file mode 100644
index 0000000000..5cd6b4e0d0
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelHeatTransferModels.C
@@ -0,0 +1,52 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "basicReactingMultiphaseParcel.H"
+#include "ThermoCloud.H"
+#include "NoHeatTransfer.H"
+#include "RanzMarshall.H"
+
+namespace Foam
+{
+    makeHeatTransferModel(ThermoCloud<basicReactingMultiphaseParcel>);
+
+    // Add instances of heat transfer model to the table
+    makeHeatTransferModelType
+    (
+        NoHeatTransfer,
+        ThermoCloud,
+        basicReactingMultiphaseParcel
+    );
+    makeHeatTransferModelType
+    (
+        RanzMarshall,
+        ThermoCloud,
+        basicReactingMultiphaseParcel
+    );
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelInjectionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelInjectionModels.C
new file mode 100644
index 0000000000..d563de8c93
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelInjectionModels.C
@@ -0,0 +1,59 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "basicReactingMultiphaseParcel.H"
+#include "ReactingCloud.H"
+#include "NoInjection.H"
+#include "ManualInjection.H"
+#include "ConeInjection.H"
+
+namespace Foam
+{
+    makeInjectionModel(KinematicCloud<basicReactingMultiphaseParcel>);
+
+    // Add instances of injection model to the table
+    makeInjectionModelType
+    (
+        NoInjection,
+        KinematicCloud,
+        basicReactingMultiphaseParcel
+    );
+    makeInjectionModelType
+    (
+        ManualInjection,
+        KinematicCloud,
+        basicReactingMultiphaseParcel
+    );
+    makeInjectionModelType
+    (
+        ConeInjection,
+        KinematicCloud,
+        basicReactingMultiphaseParcel
+    );
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSurfaceReactionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSurfaceReactionModels.C
new file mode 100644
index 0000000000..4f0ffec9e8
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSurfaceReactionModels.C
@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "basicReactingMultiphaseParcel.H"
+#include "ReactingCloud.H"
+#include "NoSurfaceReaction.H"
+
+namespace Foam
+{
+    makeSurfaceReactionModel(ReactingCloud<basicReactingMultiphaseParcel>);
+
+    // Add instances of surface reaction model to the table
+    makeSurfaceReactionModelType
+    (
+        NoSurfaceReaction,
+        ReactingCloud,
+        basicReactingMultiphaseParcel
+    );
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelWallInteractionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelWallInteractionModels.C
new file mode 100644
index 0000000000..62443b3f0b
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelWallInteractionModels.C
@@ -0,0 +1,53 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "basicReactingMultiphaseParcel.H"
+#include "KinematicCloud.H"
+#include "Rebound.H"
+#include "StandardWallInteraction.H"
+
+namespace Foam
+{
+    makeWallInteractionModel(KinematicCloud<basicReactingMultiphaseParcel>);
+//    makeWallInteractionModel(ReactingCloud<basicReactingMultiphaseParcel>);
+
+    // Add instances of wall interaction model to the table
+    makeWallInteractionModelType
+    (
+        Rebound,
+        KinematicCloud,
+        basicReactingMultiphaseParcel
+    );
+    makeWallInteractionModelType
+    (
+        StandardWallInteraction,
+        KinematicCloud,
+        basicReactingMultiphaseParcel
+    );
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDevolatilisationModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDevolatilisationModels.C
index 013c4f5cdb..c13d136a81 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDevolatilisationModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDevolatilisationModels.C
@@ -25,7 +25,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "basicReactingParcel.H"
-#include "ThermoCloud.H"
+#include "ReactingCloud.H"
 #include "NoDevolatilisation.H"
 #include "ConstantRateDevolatilisation.H"
 #include "SingleKineticRateDevolatilisation.H"

From 06feeb3784994f3aacd81231017b2de54b4b39ba Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 24 Feb 2009 18:31:29 +0000
Subject: [PATCH 007/175] updates

---
 src/lagrangian/intermediate/Make/files        |  71 +++---
 .../Templates/KinematicCloud/KinematicCloud.C |   5 +-
 .../Templates/KinematicCloud/KinematicCloud.H |   3 -
 .../Templates/ReactingCloud/ReactingCloud.C   |  31 +--
 .../Templates/ReactingCloud/ReactingCloud.H   |  49 ++--
 .../Templates/ReactingCloud/ReactingCloudI.H  |   7 +-
 .../ReactingMultiphaseCloud.C                 | 184 +++++++++++++++
 .../ReactingMultiphaseCloud.H                 | 210 ++++++++++++++++++
 .../ReactingMultiphaseCloudI.H                |  40 ++++
 .../ReactingMultiphaseCloudThermoTypes.H      |  65 ++++++
 .../Templates/ThermoCloud/ThermoCloud.C       |  24 +-
 .../Templates/ThermoCloud/ThermoCloud.H       |  10 +-
 .../kinematicCloud/kinematicCloud.H           |   1 -
 .../baseClasses/reactingCloud/reactingCloud.H |   1 -
 .../reactingMultiphaseCloud.C                 |  49 ++++
 .../reactingMultiphaseCloud.H                 |  84 +++++++
 .../baseClasses/thermoCloud/thermoCloud.H     |   1 -
 .../basicKinematicCloud/basicKinematicCloud.H |   4 +-
 .../basicReactingCloud/basicReactingCloud.H   |   4 +-
 .../basicReactingMultiphaseCloud.H            |   1 -
 .../basicThermoCloud/basicThermoCloud.H       |   4 +-
 .../KinematicParcel/KinematicParcel.H         |   5 +-
 .../ReactingMultiphaseParcel.C                |  12 +
 .../ReactingMultiphaseParcel.H                |   4 +-
 .../Templates/ReactingParcel/ReactingParcel.C |  12 -
 .../Templates/ReactingParcel/ReactingParcel.H |   1 -
 .../Templates/ThermoParcel/ThermoParcel.H     |   3 +-
 ...makeBasicKinematicParcelDispersionModels.C |   1 +
 .../makeBasicKinematicParcelDragModels.C      |   1 +
 .../makeBasicKinematicParcelInjectionModels.C |   1 +
 ...asicKinematicParcelWallInteractionModels.C |   1 +
 .../defineBasicReactingMultiphaseParcel.C     |  17 +-
 ...eactingMultiphaseParcelCompositionModels.C |   6 +-
 ...ngMultiphaseParcelDevolatilisationModels.C |  16 +-
 ...ReactingMultiphaseParcelDispersionModels.C |   1 +
 ...eBasicReactingMultiphaseParcelDragModels.C |   8 +-
 ...actingMultiphaseParcelHeatTransferModels.C |   1 +
 ...cReactingMultiphaseParcelInjectionModels.C |   1 +
 ...actingMultiphaseParcelPhaseChangeModels.C} |  32 +--
 ...ingMultiphaseParcelSurfaceReactionModels.C |   6 +-
 ...ingMultiphaseParcelWallInteractionModels.C |   2 +-
 .../basicReactingParcel/basicReactingParcel.C |   6 -
 .../basicReactingParcel/basicReactingParcel.H |  31 ++-
 ...makeBasicReactingParcelCompositionModels.C |   1 +
 .../makeBasicReactingParcelDispersionModels.C |   1 +
 .../makeBasicReactingParcelDragModels.C       |   1 +
 ...akeBasicReactingParcelHeatTransferModels.C |   1 +
 .../makeBasicReactingParcelInjectionModels.C  |   1 +
 ...akeBasicReactingParcelPhaseChangeModels.C} |  19 +-
 ...BasicReactingParcelSurfaceReactionModels.C |   1 +
 ...BasicReactingParcelWallInteractionModels.C |   2 +-
 .../InjectionModel/InjectionModel.C           |   9 +-
 .../InjectionModel/InjectionModel.H           |   6 +-
 .../NoPhaseChange/NoPhaseChange.C             |  71 ++++++
 .../NoPhaseChange/NoPhaseChange.H             | 101 +++++++++
 .../PhaseChangeModel/NewPhaseChangeModel.C    |  67 ++++++
 .../PhaseChangeModel/PhaseChangeModel.C       |  78 +++++++
 .../PhaseChangeModel/PhaseChangeModel.H       | 176 +++++++++++++++
 58 files changed, 1351 insertions(+), 200 deletions(-)
 create mode 100644 src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
 create mode 100644 src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
 create mode 100644 src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H
 create mode 100644 src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudThermoTypes.H
 create mode 100644 src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C
 create mode 100644 src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H
 rename src/lagrangian/intermediate/parcels/derived/{basicReactingParcel/makeBasicReactingParcelDevolatilisationModels.C => basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelPhaseChangeModels.C} (68%)
 rename src/lagrangian/intermediate/parcels/derived/{basicKinematicParcel/makeBasicKinematicParcelHeatTransferModels.C => basicReactingParcel/makeBasicReactingParcelPhaseChangeModels.C} (80%)
 create mode 100644 src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
 create mode 100644 src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
 create mode 100644 src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C
 create mode 100644 src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
 create mode 100644 src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H

diff --git a/src/lagrangian/intermediate/Make/files b/src/lagrangian/intermediate/Make/files
index 13cd69a2a3..4882f36e0a 100644
--- a/src/lagrangian/intermediate/Make/files
+++ b/src/lagrangian/intermediate/Make/files
@@ -1,44 +1,65 @@
+PARCELS=parcels
+DERIVEDPARCELS=$(PARCELS)/derived
+
 /* Parcels */
-parcels/derived/basicKinematicParcel/basicKinematicParcel.C
-parcels/derived/basicThermoParcel/basicThermoParcel.C
-parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C
+$(DERIVEDPARCELS)/basicKinematicParcel/basicKinematicParcel.C
+$(DERIVEDPARCELS)/basicThermoParcel/basicThermoParcel.C
+$(DERIVEDPARCELS)/basicReactingParcel/basicReactingParcel.C
+$(DERIVEDPARCELS)/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C
 
 /* Cloud base classes */
 clouds/baseClasses/kinematicCloud/kinematicCloud.C
 clouds/baseClasses/thermoCloud/thermoCloud.C
 clouds/baseClasses/reactingCloud/reactingCloud.C
+clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C
 
-/* Injection mechanisms */
+/* Cloud container/injection mechanisms */
 clouds/derived/basicKinematicCloud/basicKinematicCloud.C
 clouds/derived/basicThermoCloud/basicThermoCloud.C
 clouds/derived/basicReactingCloud/basicReactingCloud.C
+clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.C
 
 /* kinematic parcel sub-models */
-parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C
-parcels/derived/basicKinematicParcel/makeBasicKinematicParcelDispersionModels.C
-parcels/derived/basicKinematicParcel/makeBasicKinematicParcelDragModels.C
-parcels/derived/basicKinematicParcel/makeBasicKinematicParcelInjectionModels.C
-parcels/derived/basicKinematicParcel/makeBasicKinematicParcelHeatTransferModels.C
-parcels/derived/basicKinematicParcel/makeBasicKinematicParcelWallInteractionModels.C
+KINEMATICPARCEL=$(DERIVEDPARCELS)/basicKinematicParcel
+$(KINEMATICPARCEL)/defineBasicKinematicParcel.C
+$(KINEMATICPARCEL)/makeBasicKinematicParcelDispersionModels.C
+$(KINEMATICPARCEL)/makeBasicKinematicParcelDragModels.C
+$(KINEMATICPARCEL)/makeBasicKinematicParcelInjectionModels.C
+$(KINEMATICPARCEL)/makeBasicKinematicParcelWallInteractionModels.C
 
 /* thermo parcel sub-models */
-parcels/derived/basicThermoParcel/defineBasicThermoParcel.C
-parcels/derived/basicThermoParcel/makeBasicThermoParcelDispersionModels.C
-parcels/derived/basicThermoParcel/makeBasicThermoParcelDragModels.C
-parcels/derived/basicThermoParcel/makeBasicThermoParcelInjectionModels.C
-parcels/derived/basicThermoParcel/makeBasicThermoParcelHeatTransferModels.C
-parcels/derived/basicThermoParcel/makeBasicThermoParcelWallInteractionModels.C
+THERMOPARCEL=$(DERIVEDPARCELS)/basicThermoParcel
+$(THERMOPARCEL)/defineBasicThermoParcel.C
+$(THERMOPARCEL)/makeBasicThermoParcelDispersionModels.C
+$(THERMOPARCEL)/makeBasicThermoParcelDragModels.C
+$(THERMOPARCEL)/makeBasicThermoParcelHeatTransferModels.C
+$(THERMOPARCEL)/makeBasicThermoParcelInjectionModels.C
+$(THERMOPARCEL)/makeBasicThermoParcelWallInteractionModels.C
 
 /* reacting parcel sub-models */
-parcels/derived/basicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C
-parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelCompositionModels.C
-parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDragModels.C
-parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDispersionModels.C
-parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelInjectionModels.C
-parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelHeatTransferModels.C
-parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDevolatilisationModels.C
-parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSurfaceReactionModels.C
-parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelWallInteractionModels.C
+REACTINGPARCEL=$(DERIVEDPARCELS)/basicReactingParcel
+$(REACTINGPARCEL)/defineBasicReactingParcel.C
+$(REACTINGPARCEL)/makeBasicReactingParcelCompositionModels.C
+$(REACTINGPARCEL)/makeBasicReactingParcelDispersionModels.C
+$(REACTINGPARCEL)/makeBasicReactingParcelDragModels.C
+$(REACTINGPARCEL)/makeBasicReactingParcelHeatTransferModels.C
+$(REACTINGPARCEL)/makeBasicReactingParcelInjectionModels.C
+$(REACTINGPARCEL)/makeBasicReactingParcelPhaseChangeModels.C
+$(REACTINGPARCEL)/makeBasicReactingParcelSurfaceReactionModels.C
+$(REACTINGPARCEL)/makeBasicReactingParcelWallInteractionModels.C
+
+/* reacting multiphase parcel sub-models */
+REACTINGMPPARCEL=$(DERIVEDPARCELS)/basicReactingMultiphaseParcel
+$(REACTINGMPPARCEL)/defineBasicReactingMultiphaseParcel.C
+$(REACTINGMPPARCEL)/makeBasicReactingMultiphaseParcelCompositionModels.C
+$(REACTINGMPPARCEL)/makeBasicReactingMultiphaseParcelDevolatilisationModels.C
+$(REACTINGMPPARCEL)/makeBasicReactingMultiphaseParcelDispersionModels.C
+$(REACTINGMPPARCEL)/makeBasicReactingMultiphaseParcelDragModels.C
+$(REACTINGMPPARCEL)/makeBasicReactingMultiphaseParcelHeatTransferModels.C
+$(REACTINGMPPARCEL)/makeBasicReactingMultiphaseParcelInjectionModels.C
+$(REACTINGMPPARCEL)/makeBasicReactingMultiphaseParcelPhaseChangeModels.C
+$(REACTINGMPPARCEL)/makeBasicReactingMultiphaseParcelSurfaceReactionModels.C
+$(REACTINGMPPARCEL)/makeBasicReactingMultiphaseParcelWallInteractionModels.C
 
 /* bolt-on models */
 submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index 55ad4d3b57..3b92b98f0a 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -25,12 +25,13 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "KinematicCloud.H"
+#include "IntegrationScheme.H"
+#include "interpolation.H"
+
 #include "DispersionModel.H"
 #include "DragModel.H"
 #include "InjectionModel.H"
 #include "WallInteractionModel.H"
-#include "IntegrationScheme.H"
-#include "interpolation.H"
 
 
 // * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index d606b38c3d..d1c542a067 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -84,9 +84,6 @@ class KinematicCloud
     public Cloud<ParcelType>,
     public kinematicCloud
 {
-
-private:
-
     // Private data
 
         //- Cloud type - used to set the name of the parcel properties
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
index 1132bd8f29..a77a843eee 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -25,8 +25,9 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "ReactingCloud.H"
+
 #include "CompositionModel.H"
-#include "DevolatilisationModel.H"
+#include "PhaseChangeModel.H"
 #include "SurfaceReactionModel.H"
 
 // * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * * //
@@ -91,9 +92,9 @@ Foam::ReactingCloud<ParcelType>::ReactingCloud
             *this
         )
     ),
-    devolatilisationModel_
+    phaseChangeModel_
     (
-        DevolatilisationModel<ReactingCloud<ParcelType> >::New
+        PhaseChangeModel<ReactingCloud<ParcelType> >::New
         (
             this->particleProperties(),
             *this
@@ -161,37 +162,37 @@ void Foam::ReactingCloud<ParcelType>::evolve()
     const volScalarField cp = carrierThermo_.Cp();
     const volScalarField& p = carrierThermo_.p();
 
-    autoPtr<interpolation<scalar> > rhoInterpolator = interpolation<scalar>::New
+    autoPtr<interpolation<scalar> > rhoInterp = interpolation<scalar>::New
     (
         this->interpolationSchemes(),
         this->rho()
     );
 
-    autoPtr<interpolation<vector> > UInterpolator = interpolation<vector>::New
+    autoPtr<interpolation<vector> > UInterp = interpolation<vector>::New
     (
         this->interpolationSchemes(),
         this->U()
     );
 
-    autoPtr<interpolation<scalar> > muInterpolator = interpolation<scalar>::New
+    autoPtr<interpolation<scalar> > muInterp = interpolation<scalar>::New
     (
         this->interpolationSchemes(),
         this->mu()
     );
 
-    autoPtr<interpolation<scalar> > TInterpolator = interpolation<scalar>::New
+    autoPtr<interpolation<scalar> > TInterp = interpolation<scalar>::New
     (
         this->interpolationSchemes(),
         T
     );
 
-    autoPtr<interpolation<scalar> > cpInterpolator = interpolation<scalar>::New
+    autoPtr<interpolation<scalar> > cpInterp = interpolation<scalar>::New
     (
         this->interpolationSchemes(),
         cp
     );
 
-    autoPtr<interpolation<scalar> > pInterpolator = interpolation<scalar>::New
+    autoPtr<interpolation<scalar> > pInterp = interpolation<scalar>::New
     (
         this->interpolationSchemes(),
         p
@@ -201,12 +202,12 @@ void Foam::ReactingCloud<ParcelType>::evolve()
     (
         *this,
         constProps_,
-        rhoInterpolator(),
-        UInterpolator(),
-        muInterpolator(),
-        TInterpolator(),
-        cpInterpolator(),
-        pInterpolator(),
+        rhoInterp(),
+        UInterp(),
+        muInterp(),
+        TInterp(),
+        cpInterp(),
+        pInterp(),
         this->g().value()
     );
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
index 810b08235a..9d66f9f3b5 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
@@ -26,9 +26,11 @@ Class
     Foam::ReactingCloud
 
 Description
-    Templated base class for reactive cloud
-    - Adds to kinematic cloud
-      - Heat transfer
+    Templated base class for reacting cloud
+    - Adds to thermodynamic cloud
+      - Variable composition (single phase)
+      - Phase change
+      - Surface reactions
 
 SourceFiles
     ReactingCloudI.H
@@ -58,13 +60,13 @@ template<class CloudType>
 class CompositionModel;
 
 template<class CloudType>
-class DevolatilisationModel;
+class PhaseChangeModel;
 
 template<class CloudType>
 class SurfaceReactionModel;
 
 /*---------------------------------------------------------------------------*\
-                        Class ReactingCloud Declaration
+                      Class ReactingCloud Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class ParcelType>
@@ -73,7 +75,6 @@ class ReactingCloud
     public ThermoCloud<ParcelType>,
     public reactingCloud
 {
-
     // Private data
 
         //- Parcel constant properties
@@ -85,23 +86,28 @@ class ReactingCloud
         //- Gas phase properties
         PtrList<specieReactingProperties>& gases_;
 
+
         // References to the cloud sub-models
 
             //- Reacting composition model
             autoPtr<CompositionModel<ReactingCloud<ParcelType> > >
                 compositionModel_;
 
-            //- Devolatilisation model
-            autoPtr<DevolatilisationModel<ReactingCloud<ParcelType> > >
-                devolatilisationModel_;
+            //- Reacting phase change model
+            autoPtr<PhaseChangeModel<ReactingCloud<ParcelType> > >
+                phaseChangeModel_;
+
+            //- Reacting surface reaction model
+            autoPtr
+            <
+                SurfaceReactionModel<ReactingCloud<ParcelType> >
+            >
+            surfaceReactionModel_;
 
-            //- Surface reaction model
-            autoPtr<SurfaceReactionModel<ReactingCloud<ParcelType> > >
-                surfaceReactionModel_;
 
         // Sources
 
-            //- Devolatilisation fields - one per carrier phase specie
+            //- Mass transfer fields - one per carrier phase specie
             PtrList<DimensionedField<scalar, volMesh> > rhoTrans_;
 
 
@@ -116,10 +122,6 @@ class ReactingCloud
 
 public:
 
-    //- Runtime type information
-//    TypeName("ReactingCloud");
-
-
     // Constructors
 
         //- Construct given carrier gas fields
@@ -134,9 +136,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~ReactingCloud();
+    //- Destructor
+    virtual ~ReactingCloud();
 
 
     // Member Functions
@@ -159,11 +160,11 @@ public:
                 inline const CompositionModel<ReactingCloud<ParcelType> >&
                     composition() const;
 
-                //- Return reference to devolatilisation model
-                inline const DevolatilisationModel<ReactingCloud<ParcelType> >&
-                    devolatilisation() const;
+                //- Return reference to reacting phase change model
+                inline const PhaseChangeModel<ReactingCloud<ParcelType> >&
+                    phaseChange() const;
 
-                //- Return reference to surface reaction model
+                //- Return reference to reacting surface reaction model
                 inline const SurfaceReactionModel<ReactingCloud<ParcelType> >&
                     surfaceReaction() const;
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
index 915196c744..146db083cc 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
@@ -59,10 +59,10 @@ Foam::ReactingCloud<ParcelType>::composition() const
 
 
 template<class ParcelType>
-inline const Foam::DevolatilisationModel<Foam::ReactingCloud<ParcelType> >&
-Foam::ReactingCloud<ParcelType>::devolatilisation() const
+inline const Foam::PhaseChangeModel<Foam::ReactingCloud<ParcelType> >&
+Foam::ReactingCloud<ParcelType>::phaseChange() const
 {
-    return devolatilisationModel_;
+    return phaseChangeModel_;
 }
 
 
@@ -129,4 +129,5 @@ Foam::ReactingCloud<ParcelType>::Srho1() const
     return trhoTrans/(this->db().time().deltaT()*this->mesh().V());
 }
 
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
new file mode 100644
index 0000000000..7f32fd7d26
--- /dev/null
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
@@ -0,0 +1,184 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "ReactingMultiphaseCloud.H"
+
+#include "CompositionModel.H"
+#include "DevolatilisationModel.H"
+#include "SurfaceReactionModel.H"
+
+// * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * * //
+
+template<class ParcelType>
+void Foam::ReactingMultiphaseCloud<ParcelType>::addNewParcel
+(
+    const vector& position,
+    const label cellId,
+    const scalar d,
+    const vector& U,
+    const scalar nParticles,
+    const scalar lagrangianDt
+)
+{
+    ParcelType* pPtr = new ParcelType
+    (
+        *this,
+        this->parcelTypeId(),
+        position,
+        cellId,
+        d,
+        U,
+        nParticles,
+        this->composition().YGas0(),
+        this->composition().YLiquid0(),
+        this->composition().YSolid0(),
+        this->composition().YMixture0(),
+        constProps_
+    );
+
+    scalar continuousDt = this->db().time().deltaT().value();
+    pPtr->stepFraction() = (continuousDt - lagrangianDt)/continuousDt;
+
+    addParticle(pPtr);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class ParcelType>
+Foam::ReactingMultiphaseCloud<ParcelType>::ReactingMultiphaseCloud
+(
+    const word& cloudType,
+    const volScalarField& rho,
+    const volVectorField& U,
+    const dimensionedVector& g,
+    hCombustionThermo& thermo,
+    PtrList<specieReactingProperties>& gases
+)
+:
+    ReactingCloud<ParcelType>(cloudType, rho, U, g, thermo, gases),
+    reactingMultiphaseCloud(),
+    constProps_(this->particleProperties()),
+    devolatilisationModel_
+    (
+        DevolatilisationModel<ReactingMultiphaseCloud<ParcelType> >::New
+        (
+            this->particleProperties(),
+            *this
+        )
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class ParcelType>
+Foam::ReactingMultiphaseCloud<ParcelType>::~ReactingMultiphaseCloud()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class ParcelType>
+void Foam::ReactingMultiphaseCloud<ParcelType>::resetSourceTerms()
+{
+    ReactingCloud<ParcelType>::resetSourceTerms();
+}
+
+
+template<class ParcelType>
+void Foam::ReactingMultiphaseCloud<ParcelType>::evolve()
+{
+    const volScalarField& T = carrierThermo_.T();
+    const volScalarField cp = carrierThermo_.Cp();
+    const volScalarField& p = carrierThermo_.p();
+
+    autoPtr<interpolation<scalar> > rhoInterp = interpolation<scalar>::New
+    (
+        this->interpolationSchemes(),
+        this->rho()
+    );
+
+    autoPtr<interpolation<vector> > UInterp = interpolation<vector>::New
+    (
+        this->interpolationSchemes(),
+        this->U()
+    );
+
+    autoPtr<interpolation<scalar> > muInterp = interpolation<scalar>::New
+    (
+        this->interpolationSchemes(),
+        this->mu()
+    );
+
+    autoPtr<interpolation<scalar> > TInterp = interpolation<scalar>::New
+    (
+        this->interpolationSchemes(),
+        T
+    );
+
+    autoPtr<interpolation<scalar> > cpInterp = interpolation<scalar>::New
+    (
+        this->interpolationSchemes(),
+        cp
+    );
+
+    autoPtr<interpolation<scalar> > pInterp = interpolation<scalar>::New
+    (
+        this->interpolationSchemes(),
+        p
+    );
+
+    typename ParcelType::trackData td
+    (
+        *this,
+        constProps_,
+        rhoInterp(),
+        UInterp(),
+        muInterp(),
+        TInterp(),
+        cpInterp(),
+        pInterp(),
+        this->g().value()
+    );
+
+    this->injection().inject(td);
+
+    if (debug)
+    {
+        this->dumpParticlePositions();
+    }
+
+    if (this->coupled())
+    {
+        resetSourceTerms();
+    }
+
+    Cloud<ParcelType>::move(td);
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
new file mode 100644
index 0000000000..9409d12a49
--- /dev/null
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
@@ -0,0 +1,210 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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::ReactingMultiphaseCloud
+
+Description
+    Templated base class for multiphase reacting cloud
+    - Adds to reacting cloud
+      - Devolatilisatsion
+      - multiphase composition
+
+SourceFiles
+    ReactingMultiphaseCloudI.H
+    ReactingMultiphaseCloud.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef ReactingMultiphaseCloud_H
+#define ReactingMultiphaseCloud_H
+
+#include "ReactingCloud.H"
+#include "reactingMultiphaseCloud.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+
+template<class CloudType>
+class DevolatilisationModel;
+
+/*---------------------------------------------------------------------------*\
+                   Class ReactingMultiphaseCloud Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class ParcelType>
+class ReactingMultiphaseCloud
+:
+    public ReactingCloud<ParcelType>,
+    public reactingMultiphaseCloud
+{
+    // Private data
+
+        //- Parcel constant properties
+        typename ParcelType::constantProperties constProps_;
+
+        //- Thermodynamics package (combustion)
+        hCombustionThermo& carrierThermo_;
+
+        //- Gas phase properties
+        PtrList<specieReactingProperties>& gases_;
+
+
+        // References to the cloud sub-models
+
+            //- Devolatilisation model
+            autoPtr
+            <
+                DevolatilisationModel<ReactingMultiphaseCloud<ParcelType> >
+            >
+            devolatilisationModel_;
+
+
+
+        // Sources
+
+            //- Mass transfer fields - one per carrier phase specie
+            PtrList<DimensionedField<scalar, volMesh> > rhoTrans_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        ReactingMultiphaseCloud(const ReactingMultiphaseCloud&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const ReactingMultiphaseCloud&);
+
+
+public:
+
+    // Constructors
+
+        //- Construct given carrier gas fields
+        ReactingMultiphaseCloud
+        (
+            const word& cloudType,
+            const volScalarField& rho,
+            const volVectorField& U,
+            const dimensionedVector& g,
+            hCombustionThermo& thermo,
+            PtrList<specieReactingProperties>& gases
+        );
+
+
+    //- Destructor
+    virtual ~ReactingMultiphaseCloud();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return const access to carrier phase thermo package
+            inline const hCombustionThermo& carrierThermo() const;
+
+            //- Return access to carrier phase thermo package
+            inline hCombustionThermo& carrierThermo();
+
+            //- Gas phase properties
+            inline const PtrList<specieReactingProperties>& gases() const;
+
+
+            // Sub-models
+
+                //- Return reference to devolatilisation model
+                inline const DevolatilisationModel
+                <
+                    ReactingMultiphaseCloud<ParcelType>
+                >&
+                devolatilisation() const;
+
+
+            // Sources
+
+                //- Mass
+
+                    //- Return reference to mass source for field i
+                    inline DimensionedField<scalar, volMesh>&
+                        rhoTrans(const label i);
+
+                    //- Return reference to mass source fields
+                    inline PtrList<DimensionedField<scalar, volMesh> >&
+                        rhoTrans();
+
+                    //- Return tmp mass source for field i
+                    //  Fully explicit
+                    inline tmp<DimensionedField<scalar, volMesh> >
+                        Srho1(const label i) const;
+
+                    //- Return tmp total mass source for carrier phase
+                    //  Fully explicit
+                    inline tmp<DimensionedField<scalar, volMesh> >
+                        Srho1() const;
+
+
+        // Cloud evolution functions
+
+            //- Add new parcel
+            void addNewParcel
+            (
+                const vector& position,
+                const label cellId,
+                const scalar d,
+                const vector& U,
+                const scalar nParticles,
+                const scalar lagrangianDt
+            );
+
+            //- Reset the spray source terms
+            void resetSourceTerms();
+
+            //- Evolve the spray (inject, move)
+            void evolve();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "ReactingMultiphaseCloudI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "ReactingMultiphaseCloud.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H
new file mode 100644
index 0000000000..f27fae24ea
--- /dev/null
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H
@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class ParcelType>
+inline const Foam::DevolatilisationModel
+<
+    Foam::ReactingMultiphaseCloud<ParcelType>
+>&
+Foam::ReactingMultiphaseCloud<ParcelType>::devolatilisation() const
+{
+    return devolatilisationModel_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudThermoTypes.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudThermoTypes.H
new file mode 100644
index 0000000000..2341e65aa0
--- /dev/null
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudThermoTypes.H
@@ -0,0 +1,65 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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
+
+Typedefs
+    Foam::cloudThermoTypes
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef ReactingCloudThermoTypes_H
+#define ReactingCloudThermoTypes_H
+
+#include "sutherlandTransport.H"
+#include "multiComponentMixture.H"
+#include "specie.H"
+#include "constTransport.H"
+#include "specieThermo.H"
+#include "hConstThermo.H"
+#include "janafThermo.H"
+#include "perfectGas.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+//    typedef multiComponentMixture<constTransport<specieThermo<hConstThermo<perfectGas> > > > specieProperties;
+//    typedef hConstThermo<perfectGas> specieProperties;
+
+//    typedef sutherlandTransport<specieThermo<janafThermo<perfectGas> > >
+//        specieProperties;
+
+    typedef sutherlandTransport<specieThermo<janafThermo<perfectGas> > >
+        specieReactingProperties;
+
+    typedef constTransport<specieThermo<hConstThermo<perfectGas> > >
+        specieConstProperties;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
index 8a284024ff..05a0b5f2aa 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
@@ -25,11 +25,11 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "ThermoCloud.H"
-#include "HeatTransferModel.H"
-
 #include "interpolationCellPoint.H"
 #include "ThermoParcel.H"
 
+#include "HeatTransferModel.H"
+
 // * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * * //
 
 template<class ParcelType>
@@ -157,31 +157,31 @@ void Foam::ThermoCloud<ParcelType>::evolve()
     const volScalarField& T = carrierThermo_.T();
     const volScalarField cp = carrierThermo_.Cp();
 
-    autoPtr<interpolation<scalar> > rhoInterpolator = interpolation<scalar>::New
+    autoPtr<interpolation<scalar> > rhoInterp = interpolation<scalar>::New
     (
         this->interpolationSchemes(),
         this->rho()
     );
 
-    autoPtr<interpolation<vector> > UInterpolator = interpolation<vector>::New
+    autoPtr<interpolation<vector> > UInterp = interpolation<vector>::New
     (
         this->interpolationSchemes(),
         this->U()
     );
 
-    autoPtr<interpolation<scalar> > muInterpolator = interpolation<scalar>::New
+    autoPtr<interpolation<scalar> > muInterp = interpolation<scalar>::New
     (
         this->interpolationSchemes(),
         this->mu()
     );
 
-    autoPtr<interpolation<scalar> > TInterpolator = interpolation<scalar>::New
+    autoPtr<interpolation<scalar> > TInterp = interpolation<scalar>::New
     (
         this->interpolationSchemes(),
         T
     );
 
-    autoPtr<interpolation<scalar> > cpInterpolator = interpolation<scalar>::New
+    autoPtr<interpolation<scalar> > cpInterp = interpolation<scalar>::New
     (
         this->interpolationSchemes(),
         cp
@@ -191,11 +191,11 @@ void Foam::ThermoCloud<ParcelType>::evolve()
     (
         *this,
         constProps_,
-        rhoInterpolator(),
-        UInterpolator(),
-        muInterpolator(),
-        TInterpolator(),
-        cpInterpolator(),
+        rhoInterp(),
+        UInterp(),
+        muInterp(),
+        TInterp(),
+        cpInterp(),
         this->g().value()
     );
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
index 84603dd4ff..dd47da7e01 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
@@ -66,7 +66,6 @@ class ThermoCloud
     public KinematicCloud<ParcelType>,
     public thermoCloud
 {
-
     // Private data
 
         //- Thermo parcel constant properties
@@ -118,10 +117,6 @@ class ThermoCloud
 
 public:
 
-    //- Runtime type information
-//    TypeName("ThermoCloud");
-
-
     // Constructors
 
         //- Construct given carrier gas fields
@@ -135,9 +130,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~ThermoCloud();
+    //- Destructor
+    virtual ~ThermoCloud();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
index a8f337d0e9..8c1e273f57 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
@@ -48,7 +48,6 @@ namespace Foam
 
 class kinematicCloud
 {
-
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H
index e92063172e..a27bf4edf1 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H
@@ -48,7 +48,6 @@ namespace Foam
 
 class reactingCloud
 {
-
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C
new file mode 100644
index 0000000000..2fbe3815c9
--- /dev/null
+++ b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "reactingMultiphaseCloud.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(reactingMultiphaseCloud, 0);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::reactingMultiphaseCloud::reactingMultiphaseCloud()
+{}
+
+
+// * * * * * * * * * * * * * * * *  Destructors  * * * * * * * * * * * * * * //
+
+Foam::reactingMultiphaseCloud::~reactingMultiphaseCloud()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H
new file mode 100644
index 0000000000..ea2ef0da89
--- /dev/null
+++ b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H
@@ -0,0 +1,84 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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::reactingMultiphaseCloud
+
+Description
+    Virtual abstract base class for templated reactingMultiphaseCloud
+
+SourceFiles
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef reactingMultiphaseCloud_H
+#define reactingMultiphaseCloud_H
+
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                  Class reactingMultiphaseCloud Declaration
+\*---------------------------------------------------------------------------*/
+
+class reactingMultiphaseCloud
+{
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        reactingMultiphaseCloud(const reactingMultiphaseCloud&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const reactingMultiphaseCloud&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("reactingMultiphaseCloud");
+
+    // Constructors
+
+        //- Null constructor
+        reactingMultiphaseCloud();
+
+
+    //- Destructor
+    virtual ~reactingMultiphaseCloud();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H
index 116a6c8591..240c2d5ce3 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H
@@ -48,7 +48,6 @@ namespace Foam
 
 class thermoCloud
 {
-
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
diff --git a/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H b/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H
index d8a4ebc81c..8a32780f35 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H
@@ -52,7 +52,6 @@ class basicKinematicCloud
 :
     public KinematicCloud<basicKinematicParcel>
 {
-
     // Private member functions
 
         //- Disallow default bitwise copy construct
@@ -82,8 +81,7 @@ public:
 
 
     //- Destructor
-
-        ~basicKinematicCloud();
+    ~basicKinematicCloud();
 
 
     // Member functions
diff --git a/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H b/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H
index e95a867432..eb9d86e506 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H
@@ -51,7 +51,6 @@ class basicReactingCloud
 :
     public ReactingCloud<basicReactingParcel>
 {
-
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
@@ -82,8 +81,7 @@ public:
 
 
     //- Destructor
-
-        ~basicReactingCloud();
+    ~basicReactingCloud();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H
index 244c98d095..fb1b946e1d 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H
@@ -52,7 +52,6 @@ class basicReactingMultiphaseCloud
 :
     public ReactingCloud<basicReactingMultiphaseParcel>
 {
-
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
diff --git a/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H b/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H
index c3002c1354..e8ba4c9a8c 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H
@@ -51,7 +51,6 @@ class basicThermoCloud
 :
     public ThermoCloud<basicThermoParcel>
 {
-
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
@@ -84,8 +83,7 @@ public:
 
 
     //- Destructor
-
-        ~basicThermoCloud();
+    ~basicThermoCloud();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index 34c66a8933..39ba450cac 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -79,7 +79,6 @@ class KinematicParcel
 :
     public Particle<ParcelType>
 {
-
 public:
 
     //- Class to hold kinematic particle constant properties
@@ -183,7 +182,7 @@ public:
 
 protected:
 
-    // Protected member data
+    // Protected data
 
         // Parcel properties
 
@@ -447,8 +446,10 @@ public:
 
         // I-O
 
+            //- Read
             static void readFields(KinematicCloud<ParcelType>& c);
 
+            //- write
             static void writeFields(const KinematicCloud<ParcelType>& c);
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 328367601f..c25a24163a 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -93,6 +93,12 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcCoupled
     scalar T1 = calcHeatTransfer(td, dt, celli, htc, dhTrans);
 
 
+    // ~~~~~~~~~~~~~~~~~~~~~~
+    // Calculate phase change
+    // ~~~~~~~~~~~~~~~~~~~~~~
+    calcPhaseChange(td, dt, T0, T1, dMassMT);
+
+
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Calculate Devolatilisation
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -253,6 +259,12 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcUncoupled
     scalar T1 = calcHeatTransfer(td, dt, celli, htc, dhTrans);
 
 
+    // ~~~~~~~~~~~~~~~~~~~~~~
+    // Calculate phase change
+    // ~~~~~~~~~~~~~~~~~~~~~~
+    calcPhaseChange(td, dt, T0, T1, dMassMT);
+
+
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Calculate Devolatilisation
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
index 634175290a..6c93a116db 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -294,8 +294,8 @@ public:
             //- Read
             static void readFields(ReactingCloud<ParcelType>& c);
 
-        //- Write
-        static void writeFields(const ReactingCloud<ParcelType>& c);
+            //- Write
+            static void writeFields(const ReactingCloud<ParcelType>& c);
 
 
     // Ostream Operator
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index ee91bda829..a2ae89a504 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -100,12 +100,6 @@ void Foam::ReactingParcel<ParcelType>::calcCoupled
     calcPhaseChange(td, dt, T0, T1, dMassMT);
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate devolatilisation
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
-    calcDevolatilisation(td, dt, T0, T1, dMassMT);
-
-
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Calculate surface reactions
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -238,12 +232,6 @@ void Foam::ReactingParcel<ParcelType>::calcUncoupled
     calcPhaseChange(td, dt, T0, T1, dMassMT);
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate devolatilisation
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
-    calcDevolatilisation(td, dt, T0, T1, dMassMT);
-
-
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Calculate surface reactions
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index 9f0cd7b6c1..92da3160cc 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -71,7 +71,6 @@ class ReactingParcel
 :
     public ThermoParcel<ParcelType>
 {
-
 public:
 
     //- Class to hold reacting particle constant properties
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
index 9d54beba25..0f2b48416d 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
@@ -72,7 +72,6 @@ class ThermoParcel
 :
     public KinematicParcel<ParcelType>
 {
-
 public:
 
     //- Class to hold thermo particle constant properties
@@ -306,8 +305,10 @@ public:
 
         // I-O
 
+            //- Read
             static void readFields(ThermoCloud<ParcelType>& c);
 
+            //- Write
             static void writeFields(const ThermoCloud<ParcelType>& c);
 
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelDispersionModels.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelDispersionModels.C
index 07a256da8b..7a09f02321 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelDispersionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelDispersionModels.C
@@ -26,6 +26,7 @@ License
 
 #include "basicKinematicParcel.H"
 #include "KinematicCloud.H"
+
 #include "NoDispersion.H"
 #include "GradientDispersionRAS.H"
 #include "StochasticDispersionRAS.H"
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelDragModels.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelDragModels.C
index b21de1c448..e88f4e1d37 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelDragModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelDragModels.C
@@ -26,6 +26,7 @@ License
 
 #include "basicKinematicParcel.H"
 #include "KinematicCloud.H"
+
 #include "NoDrag.H"
 #include "SphereDrag.H"
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelInjectionModels.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelInjectionModels.C
index 4d3668bbe4..e5cc927c67 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelInjectionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelInjectionModels.C
@@ -26,6 +26,7 @@ License
 
 #include "basicKinematicParcel.H"
 #include "KinematicCloud.H"
+
 #include "NoInjection.H"
 #include "ManualInjection.H"
 #include "ConeInjection.H"
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelWallInteractionModels.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelWallInteractionModels.C
index 3ec099a4cf..95335509a6 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelWallInteractionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelWallInteractionModels.C
@@ -26,6 +26,7 @@ License
 
 #include "basicKinematicParcel.H"
 #include "KinematicCloud.H"
+
 #include "Rebound.H"
 #include "StandardWallInteraction.H"
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C
index 4097dfa878..487b0f852d 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C
@@ -25,7 +25,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "basicReactingMultiphaseParcel.H"
-#include "ReactingCloud.H"
+#include "ReactingMultiphaseCloud.H"
 
 namespace Foam
 {
@@ -69,8 +69,8 @@ namespace Foam
     );
 //    defineTemplateTypeNameAndDebug
 //    (
-//      KinematicCloud<basicReactingMultiphaseParcel>,
-//      0
+//        KinematicCloud<basicReactingMultiphaseParcel>,
+//        0
 //    );
 
     defineParcelTypeNameAndDebug
@@ -93,6 +93,17 @@ namespace Foam
 //    (
 //        ReactingCloud<basicReactingMultiphaseParcel>,
 //        0
+//    );
+
+    defineParcelTypeNameAndDebug
+    (
+        ReactingMultiphaseCloud<basicReactingMultiphaseParcel>,
+        0
+    );
+//    defineTemplateTypeNameAndDebug
+//    (
+//        ReactingMultiphaseCloud<basicReactingMultiphaseParcel>,
+//        0
 //    );
 
 };
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelCompositionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelCompositionModels.C
index 9ad0773a17..b598be9939 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelCompositionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelCompositionModels.C
@@ -26,11 +26,15 @@ License
 
 #include "basicReactingMultiphaseParcel.H"
 #include "ReactingCloud.H"
+
 #include "SingleMixtureFraction.H"
 
 namespace Foam
 {
-    makeCompositionModel(ReactingCloud<basicReactingMultiphaseParcel>);
+    makeCompositionModel
+    (
+        ReactingCloud<basicReactingMultiphaseParcel>
+    );
 
     // Add instances of composition model to the table
     makeCompositionModelType
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDevolatilisationModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDevolatilisationModels.C
index dc742aa7b1..71c9d6e7c0 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDevolatilisationModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDevolatilisationModels.C
@@ -25,32 +25,36 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "basicReactingMultiphaseParcel.H"
-#include "ReactingCloud.H"
+#include "ReactingMultiphaseCloud.H"
+
 #include "NoDevolatilisation.H"
 #include "ConstantRateDevolatilisation.H"
 #include "SingleKineticRateDevolatilisation.H"
 
 namespace Foam
 {
-    makeDevolatilisationModel(ReactingCloud<basicReactingMultiphaseParcel>);
+    makeDevolatilisationModel
+    (
+        ReactingMultiphaseCloud<basicReactingMultiphaseParcel>
+    );
 
-    // Add instances of mass transfer model to the table
+    // Add instances of devolatilisation model to the table
     makeDevolatilisationModelType
     (
         NoDevolatilisation,
-        ReactingCloud,
+        ReactingMultiphaseCloud,
         basicReactingMultiphaseParcel
     );
     makeDevolatilisationModelType
     (
         ConstantRateDevolatilisation,
-        ReactingCloud,
+        ReactingMultiphaseCloud,
         basicReactingMultiphaseParcel
     );
     makeDevolatilisationModelType
     (
         SingleKineticRateDevolatilisation,
-        ReactingCloud,
+        ReactingMultiphaseCloud,
         basicReactingMultiphaseParcel
     );
 };
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDispersionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDispersionModels.C
index 1782cd5387..5c96a859a7 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDispersionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDispersionModels.C
@@ -26,6 +26,7 @@ License
 
 #include "basicReactingMultiphaseParcel.H"
 #include "KinematicCloud.H"
+
 #include "NoDispersion.H"
 #include "GradientDispersionRAS.H"
 #include "StochasticDispersionRAS.H"
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDragModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDragModels.C
index 1cca5977ad..253d546b7b 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDragModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDragModels.C
@@ -26,6 +26,7 @@ License
 
 #include "basicReactingMultiphaseParcel.H"
 #include "KinematicCloud.H"
+
 #include "NoDrag.H"
 #include "SphereDrag.H"
 
@@ -35,7 +36,12 @@ namespace Foam
 
     // Add instances of drag model to the table
     makeDragModelType(NoDrag, KinematicCloud, basicReactingMultiphaseParcel);
-    makeDragModelType(SphereDrag, KinematicCloud, basicReactingMultiphaseParcel);
+    makeDragModelType
+    (
+        SphereDrag,
+        KinematicCloud,
+        basicReactingMultiphaseParcel
+    );
 };
 
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelHeatTransferModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelHeatTransferModels.C
index 5cd6b4e0d0..1b6f4e06e1 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelHeatTransferModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelHeatTransferModels.C
@@ -26,6 +26,7 @@ License
 
 #include "basicReactingMultiphaseParcel.H"
 #include "ThermoCloud.H"
+
 #include "NoHeatTransfer.H"
 #include "RanzMarshall.H"
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelInjectionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelInjectionModels.C
index d563de8c93..53bed2ed11 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelInjectionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelInjectionModels.C
@@ -26,6 +26,7 @@ License
 
 #include "basicReactingMultiphaseParcel.H"
 #include "ReactingCloud.H"
+
 #include "NoInjection.H"
 #include "ManualInjection.H"
 #include "ConeInjection.H"
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDevolatilisationModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelPhaseChangeModels.C
similarity index 68%
rename from src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDevolatilisationModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelPhaseChangeModels.C
index c13d136a81..76383aaf11 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDevolatilisationModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelPhaseChangeModels.C
@@ -24,34 +24,24 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "basicReactingParcel.H"
+#include "basicReactingMultiphaseParcel.H"
 #include "ReactingCloud.H"
-#include "NoDevolatilisation.H"
-#include "ConstantRateDevolatilisation.H"
-#include "SingleKineticRateDevolatilisation.H"
+
+#include "NoPhaseChange.H"
 
 namespace Foam
 {
-    makeDevolatilisationModel(ReactingCloud<basicReactingParcel>);
+    makePhaseChangeModel
+    (
+        ReactingCloud<basicReactingMultiphaseParcel>
+    );
 
-    // Add instances of mass transfer model to the table
-    makeDevolatilisationModelType
+    // Add instances of phase change model to the table
+    makePhaseChangeModelType
     (
-        NoDevolatilisation,
+        NoPhaseChange,
         ReactingCloud,
-        basicReactingParcel
-    );
-    makeDevolatilisationModelType
-    (
-        ConstantRateDevolatilisation,
-        ReactingCloud,
-        basicReactingParcel
-    );
-    makeDevolatilisationModelType
-    (
-        SingleKineticRateDevolatilisation,
-        ReactingCloud,
-        basicReactingParcel
+        basicReactingMultiphaseParcel
     );
 };
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSurfaceReactionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSurfaceReactionModels.C
index 4f0ffec9e8..26c983dfac 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSurfaceReactionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSurfaceReactionModels.C
@@ -26,11 +26,15 @@ License
 
 #include "basicReactingMultiphaseParcel.H"
 #include "ReactingCloud.H"
+
 #include "NoSurfaceReaction.H"
 
 namespace Foam
 {
-    makeSurfaceReactionModel(ReactingCloud<basicReactingMultiphaseParcel>);
+    makeSurfaceReactionModel
+    (
+        ReactingCloud<basicReactingMultiphaseParcel>
+    );
 
     // Add instances of surface reaction model to the table
     makeSurfaceReactionModelType
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelWallInteractionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelWallInteractionModels.C
index 62443b3f0b..19057c485e 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelWallInteractionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelWallInteractionModels.C
@@ -26,13 +26,13 @@ License
 
 #include "basicReactingMultiphaseParcel.H"
 #include "KinematicCloud.H"
+
 #include "Rebound.H"
 #include "StandardWallInteraction.H"
 
 namespace Foam
 {
     makeWallInteractionModel(KinematicCloud<basicReactingMultiphaseParcel>);
-//    makeWallInteractionModel(ReactingCloud<basicReactingMultiphaseParcel>);
 
     // Add instances of wall interaction model to the table
     makeWallInteractionModelType
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.C
index 31176eb5a4..bb3a5e5da6 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.C
@@ -47,9 +47,6 @@ Foam::basicReactingParcel::basicReactingParcel
     const scalar d0,
     const vector& U0,
     const scalar nParticle0,
-    const scalarField& YGas0,
-    const scalarField& YLiquid0,
-    const scalarField& YSolid0,
     const scalarField& YMixture0,
     const constantProperties& constProps
 )
@@ -63,9 +60,6 @@ Foam::basicReactingParcel::basicReactingParcel
         d0,
         U0,
         nParticle0,
-        YGas0,
-        YLiquid0,
-        YSolid0,
         YMixture0,
         constProps
     )
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H
index d4e9b93437..5deef5d729 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H
@@ -45,7 +45,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                        Class basicReactingParcel Declaration
+                    Class basicReactingParcel Declaration
 \*---------------------------------------------------------------------------*/
 
 class basicReactingParcel
@@ -63,18 +63,15 @@ public:
         //- Construct from components
         basicReactingParcel
         (
-             ReactingCloud<basicReactingParcel>& owner,
-             const label typeId,
-             const vector& position,
-             const label celli,
-             const scalar d0,
-             const vector& U0,
-             const scalar nParticle0,
-             const scalarField& YGas0,
-             const scalarField& YLiquid0,
-             const scalarField& YSolid0,
-             const scalarField& YMixture0,
-             const constantProperties& constProps
+            ReactingCloud<basicReactingParcel>& owner,
+            const label typeId,
+            const vector& position,
+            const label celli,
+            const scalar d0,
+            const vector& U0,
+            const scalar nParticle0,
+            const scalarField& YMixture0,
+            const constantProperties& constProps
         );
 
         //- Construct from Istream
@@ -88,14 +85,12 @@ public:
         //- Construct and return a clone
         autoPtr<basicReactingParcel> clone() const
         {
-            return autoPtr<basicReactingParcel>
-                (new basicReactingParcel(*this));
+            return autoPtr<basicReactingParcel>(new basicReactingParcel(*this));
         }
 
 
-    // Destructors
-
-        virtual ~basicReactingParcel();
+    //- Destructor
+    virtual ~basicReactingParcel();
 };
 
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelCompositionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelCompositionModels.C
index f5cdead727..b2f9ae5714 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelCompositionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelCompositionModels.C
@@ -26,6 +26,7 @@ License
 
 #include "basicReactingParcel.H"
 #include "ReactingCloud.H"
+
 #include "SingleMixtureFraction.H"
 
 namespace Foam
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDispersionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDispersionModels.C
index 79e2149a6a..80a351c7bb 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDispersionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDispersionModels.C
@@ -26,6 +26,7 @@ License
 
 #include "basicReactingParcel.H"
 #include "KinematicCloud.H"
+
 #include "NoDispersion.H"
 #include "GradientDispersionRAS.H"
 #include "StochasticDispersionRAS.H"
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDragModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDragModels.C
index 69943e76c3..178569796d 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDragModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDragModels.C
@@ -26,6 +26,7 @@ License
 
 #include "basicReactingParcel.H"
 #include "KinematicCloud.H"
+
 #include "NoDrag.H"
 #include "SphereDrag.H"
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelHeatTransferModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelHeatTransferModels.C
index 73bf380c82..e78caa71ec 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelHeatTransferModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelHeatTransferModels.C
@@ -26,6 +26,7 @@ License
 
 #include "basicReactingParcel.H"
 #include "ThermoCloud.H"
+
 #include "NoHeatTransfer.H"
 #include "RanzMarshall.H"
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelInjectionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelInjectionModels.C
index ed9f2bd6be..77b71a75ab 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelInjectionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelInjectionModels.C
@@ -26,6 +26,7 @@ License
 
 #include "basicReactingParcel.H"
 #include "ReactingCloud.H"
+
 #include "NoInjection.H"
 #include "ManualInjection.H"
 #include "ConeInjection.H"
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelHeatTransferModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelPhaseChangeModels.C
similarity index 80%
rename from src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelHeatTransferModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelPhaseChangeModels.C
index 1ae2a21d5f..537ff586fa 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelHeatTransferModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelPhaseChangeModels.C
@@ -24,20 +24,21 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "basicKinematicParcel.H"
-#include "KinematicCloud.H"
-#include "NoHeatTransfer.H"
+#include "basicReactingParcel.H"
+#include "ReactingCloud.H"
+
+#include "NoPhaseChange.H"
 
 namespace Foam
 {
-    makeHeatTransferModel(KinematicCloud<basicKinematicParcel>);
+    makePhaseChangeModel(ReactingCloud<basicReactingParcel>);
 
-    // Add instances of heat transfer model to the table
-    makeHeatTransferModelType
+    // Add instances of phase change model to the table
+    makePhaseChangeModelType
     (
-        NoHeatTransfer,
-        KinematicCloud,
-        basicKinematicParcel
+        NoPhaseChange,
+        ReactingCloud,
+        basicReactingParcel
     );
 };
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSurfaceReactionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSurfaceReactionModels.C
index e242d7e2fa..0cb133d8ba 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSurfaceReactionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSurfaceReactionModels.C
@@ -26,6 +26,7 @@ License
 
 #include "basicReactingParcel.H"
 #include "ReactingCloud.H"
+
 #include "NoSurfaceReaction.H"
 
 namespace Foam
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelWallInteractionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelWallInteractionModels.C
index 6cc346e8d9..364d6f031e 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelWallInteractionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelWallInteractionModels.C
@@ -26,13 +26,13 @@ License
 
 #include "basicReactingParcel.H"
 #include "KinematicCloud.H"
+
 #include "Rebound.H"
 #include "StandardWallInteraction.H"
 
 namespace Foam
 {
     makeWallInteractionModel(KinematicCloud<basicReactingParcel>);
-//    makeWallInteractionModel(ReactingCloud<basicReactingParcel>);
 
     // Add instances of wall interaction model to the table
     makeWallInteractionModelType
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 1f5d5616cd..0dd1b106c9 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -130,10 +130,10 @@ template<class CloudType>
 Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
 (
     const label parcels,
-    const scalar volume
+    const scalar volume,
     const scalar volumeFraction,
     const scalar diameter,
-    const scalar rho,
+    const scalar rho
 )
 {
     scalar nP = 0.0;
@@ -330,8 +330,9 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
         else
         {
             WarningIn("Foam::InjectionModel<CloudType>::inject(TrackData& td)")
-                << "Failed to inject new parcel:" <<
-                << "    id = " << iParcel << ", position = " pos << nl << endl;
+                << "Failed to inject new parcel:" << nl
+                << "    id = " << iParcel << ", position = " << pos
+                << nl << endl;
         }
     }
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index 0c6b9f69a7..9e4c2a4161 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -160,11 +160,7 @@ protected:
         //- Find the cell that contains the supplied position
         //  Will modify position slightly towards the owner cell centroid to
         //  ensure that it lies in a cell and not edge/face
-        virtual void findCellAtPosition
-        (
-            label& cellI,
-            vector& position
-        );
+        virtual void findCellAtPosition(label& cellI, vector& position);
 
         //- Set number of particles to inject given parcel properties
         scalar setNumberOfParticles
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
new file mode 100644
index 0000000000..33b328f212
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
@@ -0,0 +1,71 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "NoPhaseChange.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::NoPhaseChange<CloudType>::NoPhaseChange
+(
+    const dictionary& dict,
+    CloudType& cloud
+)
+:
+    PhaseChangeModel<CloudType>(dict, cloud, typeName)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::NoPhaseChange<CloudType>::~NoPhaseChange()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+bool Foam::NoPhaseChange<CloudType>::active() const
+{
+    return false;
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::NoPhaseChange<CloudType>::calculate
+(
+    const scalar,
+    const scalarField&,
+    const scalar
+) const
+{
+    // Nothing to do...
+    return 0.0;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
new file mode 100644
index 0000000000..8c77f1d8f4
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
@@ -0,0 +1,101 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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::NoPhaseChange
+
+Description
+    Dummy devolatilisation model for 'no phase change'
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef NoPhaseChange_H
+#define NoPhaseChange_H
+
+#include "PhaseChangeModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+                       Class NoPhaseChange Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class NoPhaseChange
+:
+    public PhaseChangeModel<CloudType>
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("NoPhaseChange");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        NoPhaseChange
+        (
+            const dictionary& dict,
+            CloudType& cloud
+        );
+
+
+    //- Destructor
+    ~NoPhaseChange();
+
+
+    // Member Functions
+
+        //- Flag to indicate whether model activates phase change model
+        bool active() const;
+
+        //- Update model
+        scalar calculate
+        (
+            const scalar,
+            const scalarField&,
+            const scalar
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "NoPhaseChange.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C
new file mode 100644
index 0000000000..091fd8b810
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C
@@ -0,0 +1,67 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "PhaseChangeModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::autoPtr<Foam::PhaseChangeModel<CloudType> >
+Foam::PhaseChangeModel<CloudType>::New
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+{
+    word PhaseChangeModelType(dict.lookup("PhaseChangeModel"));
+
+    Info<< "Selecting PhaseChangeModel " << PhaseChangeModelType << endl;
+
+    typename dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(PhaseChangeModelType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "PhaseChangeModel<CloudType>::New\n"
+            "(\n"
+            "    const dictionary&,\n"
+            "    CloudType&\n"
+            ")"
+        )
+            << "Unknown PhaseChangeModelType type "
+            << PhaseChangeModelType
+            << ", constructor not in hash table" << nl << nl
+            << "    Valid PhaseChangeModel types are :" << nl
+            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+    }
+
+    return autoPtr<PhaseChangeModel<CloudType> >(cstrIter()(dict, owner));
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
new file mode 100644
index 0000000000..c187165632
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
@@ -0,0 +1,78 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "PhaseChangeModel.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::PhaseChangeModel<CloudType>::PhaseChangeModel
+(
+    const dictionary& dict,
+    CloudType& owner,
+    const word& type
+)
+:   dict_(dict),
+    owner_(owner),
+    coeffDict_(dict.subDict(type + "Coeffs"))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::PhaseChangeModel<CloudType>::~PhaseChangeModel()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+template<class CloudType>
+const CloudType& Foam::PhaseChangeModel<CloudType>::owner() const
+{
+    return owner_;
+}
+
+
+template<class CloudType>
+const Foam::dictionary& Foam::PhaseChangeModel<CloudType>::dict() const
+{
+    return dict_;
+}
+
+
+template<class CloudType>
+const Foam::dictionary& Foam::PhaseChangeModel<CloudType>::coeffDict() const
+{
+    return coeffDict_;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "NewPhaseChangeModel.C"
+
+// ************************************************************************* //
+
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
new file mode 100644
index 0000000000..e939b96286
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
@@ -0,0 +1,176 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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::PhaseChangeModel
+
+Description
+    Templated phase change model class
+
+SourceFiles
+    PhaseChangeModel.C
+    NewPhaseChangeModel.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef PhaseChangeModel_H
+#define PhaseChangeModel_H
+
+#include "IOdictionary.H"
+#include "autoPtr.H"
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                      Class PhaseChangeModel Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class PhaseChangeModel
+{
+
+protected:
+
+    // Protected data
+
+        //- The cloud dictionary
+        const dictionary& dict_;
+
+        //- Reference to the owner cloud class
+        CloudType& owner_;
+
+        //- The coefficient dictionary
+        const dictionary coeffDict_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("PhaseChangeModel");
+
+    //- Declare runtime constructor selection table
+    declareRunTimeSelectionTable
+    (
+        autoPtr,
+        PhaseChangeModel,
+        dictionary,
+        (
+            const dictionary& dict,
+            CloudType& owner
+        ),
+        (dict, owner)
+    );
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        PhaseChangeModel
+        (
+            const dictionary& dict,
+            CloudType& owner,
+            const word& type
+        );
+
+
+    //- Destructor
+    virtual ~PhaseChangeModel();
+
+
+    //- Selector
+    static autoPtr<PhaseChangeModel<CloudType> > New
+    (
+        const dictionary& dict,
+        CloudType& owner
+    );
+
+
+    // Access
+
+        //- Return the owner cloud object
+        const CloudType& owner() const;
+
+        //- Return the cloud dictionary
+        const dictionary& dict() const;
+
+        //- Return the coefficient dictionary
+        const dictionary& coeffDict() const;
+
+
+    // Member Functions
+
+        //- Flag to indicate whether model activates phase change model
+        virtual bool active() const = 0;
+
+        //- Update model
+        virtual scalar calculate
+        (
+            const scalar dt,
+            const scalarField& YMixture,
+            const scalar T
+        ) const = 0;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makePhaseChangeModel(CloudType)                                       \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug(PhaseChangeModel<CloudType>, 0);      \
+                                                                              \
+    defineTemplateRunTimeSelectionTable                                       \
+    (                                                                         \
+        PhaseChangeModel<CloudType>,                                          \
+        dictionary                                                            \
+    );
+
+
+#define makePhaseChangeModelType(SS, CloudType, ParcelType)                   \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+                                                                              \
+    PhaseChangeModel<CloudType<ParcelType> >::                                \
+        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
+            add##SS##CloudType##ParcelType##ConstructorToTable_;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "PhaseChangeModel.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From cc971bb39368ba989cd96016d4d953b6b498b558 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 24 Feb 2009 18:58:19 +0000
Subject: [PATCH 008/175] tidy-up + virtual destructors on sub-models

---
 .../DispersionModel/DispersionModel.H         | 18 ++++++++---------
 .../DispersionRASModel/DispersionRASModel.H   |  6 ++----
 .../GradientDispersionRAS.H                   |  6 ++----
 .../NoDispersion/NoDispersion.H               |  6 ++----
 .../StochasticDispersionRAS.H                 |  6 ++----
 .../Kinematic/DragModel/DragModel/DragModel.H | 20 ++++++++-----------
 .../Kinematic/DragModel/NoDrag/NoDrag.H       |  6 ++----
 .../DragModel/SphereDrag/SphereDrag.H         |  6 ++----
 .../ConeInjection/ConeInjection.H             |  6 ++----
 .../InjectionModel/InjectionModel.H           |  2 --
 .../ManualInjection/ManualInjection.H         |  6 ++----
 .../InjectionModel/NoInjection/NoInjection.H  |  6 ++----
 .../WallInteractionModel/Rebound/Rebound.H    |  5 ++---
 .../StandardWallInteraction.H                 |  6 ++----
 .../WallInteractionModel.H                    | 19 ++++++++----------
 .../CompositionModel/CompositionModel.H       | 19 ++++++++----------
 .../SingleMixtureFraction.H                   |  6 ++----
 .../ConstantRateDevolatilisation.H            |  6 ++----
 .../DevolatilisationModel.H                   | 19 ++++++++----------
 .../NoDevolatilisation/NoDevolatilisation.H   |  5 ++---
 .../SingleKineticRateDevolatilisation.H       |  6 ++----
 .../NoPhaseChange/NoPhaseChange.H             |  3 +--
 .../PhaseChangeModel/PhaseChangeModel.H       |  1 -
 .../NoSurfaceReaction/NoSurfaceReaction.H     |  8 +++-----
 .../SurfaceReactionModel.H                    | 19 ++++++++----------
 .../HeatTransferModel/HeatTransferModel.H     | 20 ++++++++-----------
 .../NoHeatTransfer/NoHeatTransfer.H           |  6 ++----
 .../RanzMarshall/RanzMarshall.H               |  6 ++----
 28 files changed, 94 insertions(+), 154 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
index d2c4da4c30..5cd9eaab2f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
@@ -89,18 +89,16 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~DispersionModel();
+    //- Destructor
+    virtual ~DispersionModel();
 
 
-    // Selector
-
-        static autoPtr<DispersionModel<CloudType> > New
-        (
-            const dictionary& dict,
-            CloudType& owner
-        );
+    //- Selector
+    static autoPtr<DispersionModel<CloudType> > New
+    (
+        const dictionary& dict,
+        CloudType& owner
+    );
 
 
     // Access
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
index 1628f23c9b..ecda55be49 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
@@ -50,7 +50,6 @@ class DispersionRASModel
 :
     public DispersionModel<CloudType>
 {
-
     // Private data
 
         //- Reference to the compressible turbulence model
@@ -73,9 +72,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~DispersionRASModel();
+    //- Destructor
+    virtual ~DispersionRASModel();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H
index 150bbeb127..9cf99ecc20 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H
@@ -51,7 +51,6 @@ class GradientDispersionRAS
 :
     public DispersionRASModel<CloudType>
 {
-
 public:
 
     //- Runtime type information
@@ -68,9 +67,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~GradientDispersionRAS();
+    //- Destructor
+    virtual ~GradientDispersionRAS();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H
index 52632c3a83..48af46260e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H
@@ -49,7 +49,6 @@ class NoDispersion
 :
     public DispersionModel<CloudType>
 {
-
 public:
 
     //- Runtime type information
@@ -66,9 +65,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~NoDispersion();
+    //- Destructor
+    virtual ~NoDispersion();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H
index 596fa1d1eb..46059d4e83 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H
@@ -51,7 +51,6 @@ class StochasticDispersionRAS
 :
     public DispersionRASModel<CloudType>
 {
-
 public:
 
     //- Runtime type information
@@ -68,9 +67,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~StochasticDispersionRAS();
+    //- Destructor
+    virtual ~StochasticDispersionRAS();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H
index 31b4ac56f0..5623c7f30e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H
@@ -25,7 +25,6 @@ License
 Class
     Foam::DragModel
 
-
 Description
     Templated drag model class
 
@@ -54,7 +53,6 @@ namespace Foam
 template<class CloudType>
 class DragModel
 {
-
     // Private data
 
         //- The cloud dictionary
@@ -93,18 +91,16 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~DragModel();
+    //- Destructor
+    virtual ~DragModel();
 
 
-    // Selector
-
-        static autoPtr<DragModel<CloudType> > New
-        (
-            const dictionary& dict,
-            CloudType& cloud
-        );
+    //- Selector
+    static autoPtr<DragModel<CloudType> > New
+    (
+        const dictionary& dict,
+        CloudType& cloud
+    );
 
 
     // Access
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.H b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.H
index c6033677c7..c05a7b3e04 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.H
@@ -48,7 +48,6 @@ class NoDrag
 :
     public DragModel<CloudType>
 {
-
 public:
 
     //- Runtime type information
@@ -65,9 +64,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~NoDrag();
+    //- Destructor
+    virtual ~NoDrag();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.H b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.H
index 31e8ae1d72..8e3afaf8ae 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.H
@@ -48,7 +48,6 @@ class SphereDrag
 :
     public DragModel<CloudType>
 {
-
 public:
 
     //- Runtime type information
@@ -65,9 +64,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~SphereDrag();
+    //- Destructor
+    virtual ~SphereDrag();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
index 8034278da5..610f201a1d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
@@ -65,7 +65,6 @@ class ConeInjection
 :
     public InjectionModel<CloudType>
 {
-
     // Private data
 
         //- Coefficients dictionary
@@ -143,9 +142,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~ConeInjection();
+    //- Destructor
+    virtual ~ConeInjection();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index 9e4c2a4161..ad2448681e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -25,7 +25,6 @@ License
 Class
     Foam::InjectionModel
 
-
 Description
     Templated injection model class
 
@@ -54,7 +53,6 @@ namespace Foam
 template<class CloudType>
 class InjectionModel
 {
-
 public:
 
     // Enumerations
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
index 05f117b8ad..8403386357 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
@@ -64,7 +64,6 @@ class ManualInjection
 :
     public InjectionModel<CloudType>
 {
-
     // Private data
 
         //- Coefficients dictionary
@@ -124,9 +123,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~ManualInjection();
+    //- Destructor
+    virtual ~ManualInjection();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
index 538af51804..d7df9867e2 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
@@ -52,7 +52,6 @@ class NoInjection
 :
     public InjectionModel<CloudType>
 {
-
 protected:
 
     // Protected member functions
@@ -88,9 +87,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~NoInjection();
+    //- Destructor
+    virtual ~NoInjection();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/Rebound/Rebound.H b/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/Rebound/Rebound.H
index 6181840a97..da99ceec67 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/Rebound/Rebound.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/Rebound/Rebound.H
@@ -71,9 +71,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~Rebound();
+    //- Destructor
+    virtual ~Rebound();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/StandardWallInteraction/StandardWallInteraction.H b/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/StandardWallInteraction/StandardWallInteraction.H
index 30e99d2f3e..afdc572103 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/StandardWallInteraction/StandardWallInteraction.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/StandardWallInteraction/StandardWallInteraction.H
@@ -48,7 +48,6 @@ class StandardWallInteraction
 :
     public WallInteractionModel<CloudType>
 {
-
     // Private data
 
         //- Elasticity
@@ -74,9 +73,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~StandardWallInteraction();
+    //- Destructor
+    virtual ~StandardWallInteraction();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/WallInteractionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
index d99034245c..6f9648231f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
@@ -54,7 +54,6 @@ namespace Foam
 template<class CloudType>
 class WallInteractionModel
 {
-
     // Private data
 
         //- The cloud dictionary
@@ -97,18 +96,16 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~WallInteractionModel();
+    //- Destructor
+    virtual ~WallInteractionModel();
 
 
-    // Selector
-
-        static autoPtr<WallInteractionModel<CloudType> > New
-        (
-            const dictionary& dict,
-            CloudType& owner
-        );
+    //- Selector
+    static autoPtr<WallInteractionModel<CloudType> > New
+    (
+        const dictionary& dict,
+        CloudType& owner
+    );
 
 
     // Access
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
index eecd432a96..e5b5021fdf 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
@@ -61,7 +61,6 @@ namespace Foam
 template<class CloudType>
 class CompositionModel
 {
-
     // Private data
 
         //- The cloud dictionary
@@ -116,18 +115,16 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~CompositionModel();
+    //- Destructor
+    virtual ~CompositionModel();
 
 
-    // Selector
-
-        static autoPtr<CompositionModel<CloudType> > New
-        (
-            const dictionary& dict,
-            CloudType& owner
-        );
+    //- Selector
+    static autoPtr<CompositionModel<CloudType> > New
+    (
+        const dictionary& dict,
+        CloudType& owner
+    );
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H
index 6808b3503b..57d3535881 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H
@@ -54,7 +54,6 @@ class SingleMixtureFraction
 :
     public CompositionModel<CloudType>
 {
-
     // Private data
 
         //- Parcel properties
@@ -134,9 +133,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~SingleMixtureFraction();
+    //- Destructor
+    virtual ~SingleMixtureFraction();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
index 6d9d223071..80bc0ced2f 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
@@ -49,7 +49,6 @@ class ConstantRateDevolatilisation
 :
     public DevolatilisationModel<CloudType>
 {
-
     // Private data
 
         // Model constants
@@ -79,9 +78,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~ConstantRateDevolatilisation();
+    //- Destructor
+    virtual ~ConstantRateDevolatilisation();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H b/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
index 1e7576ccd8..1195d6a2a0 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
@@ -53,7 +53,6 @@ namespace Foam
 template<class CloudType>
 class DevolatilisationModel
 {
-
 protected:
 
     // Protected data
@@ -98,18 +97,16 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~DevolatilisationModel();
+    //- Destructor
+    virtual ~DevolatilisationModel();
 
 
-    // Selector
-
-        static autoPtr<DevolatilisationModel<CloudType> > New
-        (
-            const dictionary& dict,
-            CloudType& owner
-        );
+    //- Selector
+    static autoPtr<DevolatilisationModel<CloudType> > New
+    (
+        const dictionary& dict,
+        CloudType& owner
+    );
 
 
     // Access
diff --git a/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H b/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
index 6c1ffb27e7..5f8462aad7 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
@@ -65,9 +65,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~NoDevolatilisation();
+    //- Destructor
+    virtual ~NoDevolatilisation();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
index 8364847ad8..f68ea2245a 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
@@ -48,7 +48,6 @@ class SingleKineticRateDevolatilisation
 :
     public DevolatilisationModel<CloudType>
 {
-
     // Private data
 
         // Model constants
@@ -81,9 +80,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~SingleKineticRateDevolatilisation();
+    //- Destructor
+    virtual ~SingleKineticRateDevolatilisation();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
index 8c77f1d8f4..7f4359925f 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
@@ -48,7 +48,6 @@ class NoPhaseChange
 :
     public PhaseChangeModel<CloudType>
 {
-
 public:
 
     //- Runtime type information
@@ -66,7 +65,7 @@ public:
 
 
     //- Destructor
-    ~NoPhaseChange();
+    virtual ~NoPhaseChange();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
index e939b96286..22ed27e080 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
@@ -53,7 +53,6 @@ namespace Foam
 template<class CloudType>
 class PhaseChangeModel
 {
-
 protected:
 
     // Protected data
diff --git a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H b/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
index 18aaeb8179..31776c1bd1 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
@@ -40,7 +40,7 @@ Description
 namespace Foam
 {
 /*---------------------------------------------------------------------------*\
-                            Class NoSurfaceReaction Declaration
+                     Class NoSurfaceReaction Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class CloudType>
@@ -48,7 +48,6 @@ class NoSurfaceReaction
 :
     public SurfaceReactionModel<CloudType>
 {
-
 public:
 
     //- Runtime type information
@@ -65,9 +64,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~NoSurfaceReaction();
+    //- Destructor
+    virtual ~NoSurfaceReaction();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H b/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
index d89bf0cbf6..dbeef7c237 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
@@ -25,7 +25,6 @@ License
 Class
     Foam::SurfaceReactionModel
 
-
 Description
     Templated surface reaction model class
 
@@ -101,18 +100,16 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~SurfaceReactionModel();
+    //- Destructor
+    virtual ~SurfaceReactionModel();
 
 
-    // Selector
-
-        static autoPtr<SurfaceReactionModel<CloudType> > New
-        (
-            const dictionary& dict,
-            CloudType& cloud
-        );
+    //- Selector
+    static autoPtr<SurfaceReactionModel<CloudType> > New
+    (
+        const dictionary& dict,
+        CloudType& cloud
+    );
 
 
     // Access
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
index 1866093986..cfb5c32c5f 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
@@ -25,7 +25,6 @@ License
 Class
     Foam::HeatTransferModel
 
-
 Description
     Templated heat transfer model class
 
@@ -54,7 +53,6 @@ namespace Foam
 template<class CloudType>
 class HeatTransferModel
 {
-
     // Private data
 
         //- The cloud dictionary
@@ -97,18 +95,16 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~HeatTransferModel();
+    //- Destructor
+    virtual ~HeatTransferModel();
 
 
-    // Selector
-
-        static autoPtr<HeatTransferModel<CloudType> > New
-        (
-            const dictionary& dict,
-            CloudType& owner
-        );
+    //- Selector
+    static autoPtr<HeatTransferModel<CloudType> > New
+    (
+        const dictionary& dict,
+        CloudType& owner
+    );
 
 
     // Access
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H
index 641605465e..89112fef53 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H
@@ -48,7 +48,6 @@ class NoHeatTransfer
 :
     public HeatTransferModel<CloudType>
 {
-
 public:
 
     //- Runtime type information
@@ -65,9 +64,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~NoHeatTransfer();
+    //- Destructor
+    virtual ~NoHeatTransfer();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.H b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.H
index 09a3abb4f6..38d5e040ae 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.H
@@ -48,7 +48,6 @@ class RanzMarshall
 :
     public HeatTransferModel<CloudType>
 {
-
     // Private data
 
         // Prandtl number
@@ -71,9 +70,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~RanzMarshall();
+    //- Destructor
+    virtual ~RanzMarshall();
 
 
     // Member Functions

From e41cd49dc981a94886d741121fedd34ef74da178 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 25 Feb 2009 13:48:13 +0000
Subject: [PATCH 009/175] tidying up

---
 .../submodels/IO/DataEntry/Constant/Constant.H  |  4 ++--
 .../IO/DataEntry/DataEntry/DataEntry.H          | 17 ++++++++++-------
 .../submodels/IO/DataEntry/Table/Table.C        | 10 +++++-----
 .../submodels/IO/DataEntry/Table/Table.H        | 11 +++--------
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H
index add02c1199..b4af73e247 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H
@@ -62,6 +62,7 @@ class Constant
 {
     // Private data
 
+        //- Constant value
         Type value_;
 
 
@@ -91,8 +92,7 @@ public:
 
 
     //- Destructor
-
-        ~Constant();
+    virtual ~Constant();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H
index 2aeb5b0c7e..f9a5cd6396 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H
@@ -26,6 +26,10 @@ Class
     Foam::DataEntry
 
 Description
+    Top level data entry class for use in dictionaries. Provides a mechanism
+    to specify a variable as a certain type, e.g. constant or table, and
+    provide functions to return the (interpolated) value, and integral between
+    limits.
 
 SourceFiles
     DataEntry.C
@@ -101,16 +105,15 @@ public:
 
 
     //- Selector
-        static autoPtr<DataEntry<Type> > New
-        (
-            const word& entryName,
-            const dictionary& dict
-        );
+    static autoPtr<DataEntry<Type> > New
+    (
+        const word& entryName,
+        const dictionary& dict
+    );
 
 
     //- Destructor
-
-        virtual ~DataEntry();
+    virtual ~DataEntry();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C
index f7d5dff6ca..3897049722 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C
@@ -42,11 +42,11 @@ Foam::Table<Type>::Table
     {
         FatalErrorIn
         (
-             "Foam::Table<Type>::Table"
-             "("
-                 "const word& entryName,"
-                 "const dictionary& dict"
-             ")"
+             "Foam::Table<Type>::Table\n"
+             "(\n"
+             "    const word& entryName,\n"
+             "    const dictionary& dict\n"
+             ")\n"
         ) << "Table is invalid (empty)" << nl
           << exit(FatalError);
     }
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H
index c336840567..c30ba5e937 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H
@@ -84,23 +84,18 @@ class Table
 
 public:
 
-    // Runtime type information
+    //- Runtime type information
     TypeName("Table");
 
 
     // Constructors
 
         //- Construct from dictionary
-        Table
-        (
-            const word& entryName,
-            const dictionary& dict
-        );
+        Table(const word& entryName, const dictionary& dict);
 
 
     //- Destructor
-
-        ~Table();
+    virtual ~Table();
 
 
     // Member Functions

From 42321aa31453fcd5d62bf2704ef6073d80faf76f Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 27 Feb 2009 14:03:03 +0000
Subject: [PATCH 010/175] relocated devolatilisation models

---
 .../ConstantRateDevolatilisation/ConstantRateDevolatilisation.C   | 0
 .../ConstantRateDevolatilisation/ConstantRateDevolatilisation.H   | 0
 .../DevolatilisationModel/DevolatilisationModel.C                 | 0
 .../DevolatilisationModel/DevolatilisationModel.H                 | 0
 .../DevolatilisationModel/NewDevolatilisationModel.C              | 0
 .../DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C | 0
 .../DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H | 0
 .../SingleKineticRateDevolatilisation.C                           | 0
 .../SingleKineticRateDevolatilisation.H                           | 0
 9 files changed, 0 insertions(+), 0 deletions(-)
 rename src/lagrangian/intermediate/submodels/{Reacting => ReactingMultiphase}/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C (100%)
 rename src/lagrangian/intermediate/submodels/{Reacting => ReactingMultiphase}/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H (100%)
 rename src/lagrangian/intermediate/submodels/{Reacting => ReactingMultiphase}/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C (100%)
 rename src/lagrangian/intermediate/submodels/{Reacting => ReactingMultiphase}/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H (100%)
 rename src/lagrangian/intermediate/submodels/{Reacting => ReactingMultiphase}/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C (100%)
 rename src/lagrangian/intermediate/submodels/{Reacting => ReactingMultiphase}/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C (100%)
 rename src/lagrangian/intermediate/submodels/{Reacting => ReactingMultiphase}/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H (100%)
 rename src/lagrangian/intermediate/submodels/{Reacting => ReactingMultiphase}/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C (100%)
 rename src/lagrangian/intermediate/submodels/{Reacting => ReactingMultiphase}/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H (100%)

diff --git a/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
similarity index 100%
rename from src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
diff --git a/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
similarity index 100%
rename from src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
diff --git a/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C
similarity index 100%
rename from src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C
diff --git a/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
similarity index 100%
rename from src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
diff --git a/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C
similarity index 100%
rename from src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C
diff --git a/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
similarity index 100%
rename from src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
diff --git a/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
similarity index 100%
rename from src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
diff --git a/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
similarity index 100%
rename from src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
diff --git a/src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
similarity index 100%
rename from src/lagrangian/intermediate/submodels/Reacting/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H

From de5df6f0bbeadb9a98f96781f00c37556e14b3cc Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 27 Feb 2009 14:05:41 +0000
Subject: [PATCH 011/175] initial check-in with new composition structure

---
 src/lagrangian/intermediate/Make/files        |   6 +-
 .../Templates/ReactingCloud/ReactingCloud.C   |  15 +-
 .../ReactingMultiphaseCloud.C                 |  16 +-
 .../ReactingMultiphaseCloud.H                 |  46 --
 .../basicReactingMultiphaseCloud.C            |   2 +-
 .../basicReactingMultiphaseCloud.H            |   4 +-
 .../ReactingMultiphaseParcel.C                |  44 +-
 .../ReactingMultiphaseParcel.H                |  18 +-
 .../ReactingMultiphaseParcelI.H               |  16 +-
 .../ReactingMultiphaseParcelIO.C              |  67 +-
 .../Templates/ReactingParcel/ReactingParcel.C |  13 +-
 .../Templates/ReactingParcel/ReactingParcel.H |   3 +-
 .../ReactingParcel/ReactingParcelIO.C         |  19 +-
 .../basicReactingMultiphaseParcel.C           |   2 +-
 .../basicReactingMultiphaseParcel.H           |   2 +-
 .../defineBasicReactingMultiphaseParcel.C     |  33 +-
 ...makeBasicReactingParcelCompositionModels.C |   4 +-
 .../phaseProperties/phaseProperties.C         | 305 +++++++++
 .../phaseProperties/phaseProperties.C.bakNew  | 357 +++++++++++
 .../phaseProperties/phaseProperties.H         | 177 ++++++
 .../phaseProperties/phaseProperties.H.bakNew  | 177 ++++++
 .../phaseProperties/phasePropertiesIO.C       | 145 +++++
 .../phasePropertiesList.C}                    |  84 ++-
 .../phasePropertiesList/phasePropertiesList.H | 104 +++
 .../CompositionModel/CompositionModel.C       | 245 +++++++-
 .../CompositionModel/CompositionModel.H       | 130 ++--
 .../CompositionModel/NewCompositionModel.C    |  26 +-
 .../SingleMixtureFraction.C                   | 594 +++---------------
 .../SingleMixtureFraction.H                   | 151 ++---
 .../SinglePhaseMixture/SinglePhaseMixture.C   | 166 +++++
 .../SinglePhaseMixture/SinglePhaseMixture.H   | 156 +++++
 .../NoPhaseChange/NoPhaseChange.C             |   6 +
 .../NoPhaseChange/NoPhaseChange.H             |  14 +-
 .../PhaseChangeModel/PhaseChangeModel.H       |  18 +-
 .../liquidEvaporation/liquidEvaporation.C     | 201 ++++++
 .../liquidEvaporation/liquidEvaporation.H     | 138 ++++
 .../HeatTransferModel/HeatTransferModel.C     |   2 +-
 37 files changed, 2612 insertions(+), 894 deletions(-)
 create mode 100644 src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
 create mode 100644 src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C.bakNew
 create mode 100644 src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
 create mode 100644 src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H.bakNew
 create mode 100644 src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
 rename src/lagrangian/intermediate/{clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudThermoTypes.H => phaseProperties/phasePropertiesList/phasePropertiesList.C} (53%)
 create mode 100644 src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.H
 create mode 100644 src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.C
 create mode 100644 src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H
 create mode 100644 src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/liquidEvaporation/liquidEvaporation.C
 create mode 100644 src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/liquidEvaporation/liquidEvaporation.H

diff --git a/src/lagrangian/intermediate/Make/files b/src/lagrangian/intermediate/Make/files
index 4882f36e0a..44d371fdef 100644
--- a/src/lagrangian/intermediate/Make/files
+++ b/src/lagrangian/intermediate/Make/files
@@ -68,8 +68,12 @@ submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C
 /* integration schemes */
 IntegrationScheme/makeIntegrationSchemes.C
 
+/* phase properties */
+phaseProperties/phaseProperties/phaseProperties.C
+phaseProperties/phaseProperties/phasePropertiesIO.C
+phaseProperties/phasePropertiesList/phasePropertiesList.C
 
-/* Data entries */
+/* data entries */
 submodels/IO/DataEntry/makeDataEntries.C
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
index a77a843eee..640ce508d5 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -52,9 +52,6 @@ void Foam::ReactingCloud<ParcelType>::addNewParcel
         d,
         U,
         nParticles,
-        composition().YGas0(),
-        composition().YLiquid0(),
-        composition().YSolid0(),
         composition().YMixture0(),
         constProps_
     );
@@ -120,12 +117,12 @@ Foam::ReactingCloud<ParcelType>::ReactingCloud
             (
                 IOobject
                 (
-                     this->name() + "rhoTrans" + Foam::name(i),
-                     this->db().time().timeName(),
-                     this->db(),
-                     IOobject::NO_READ,
-                     IOobject::NO_WRITE,
-                     false
+                    this->name() + "rhoTrans" + Foam::name(i),
+                    this->db().time().timeName(),
+                    this->db(),
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE,
+                    false
                 ),
                 this->mesh(),
                 dimensionedScalar("zero", dimMass, 0.0)
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
index 7f32fd7d26..79a0581acd 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
@@ -43,6 +43,10 @@ void Foam::ReactingMultiphaseCloud<ParcelType>::addNewParcel
     const scalar lagrangianDt
 )
 {
+    label idGas = this->composition().idGas();
+    label idLiquid = this->composition().idLiquid();
+    label idSolid = this->composition().idSolid();
+
     ParcelType* pPtr = new ParcelType
     (
         *this,
@@ -52,9 +56,9 @@ void Foam::ReactingMultiphaseCloud<ParcelType>::addNewParcel
         d,
         U,
         nParticles,
-        this->composition().YGas0(),
-        this->composition().YLiquid0(),
-        this->composition().YSolid0(),
+        this->composition().Y0(idGas),
+        this->composition().Y0(idLiquid),
+        this->composition().Y0(idSolid),
         this->composition().YMixture0(),
         constProps_
     );
@@ -112,9 +116,9 @@ void Foam::ReactingMultiphaseCloud<ParcelType>::resetSourceTerms()
 template<class ParcelType>
 void Foam::ReactingMultiphaseCloud<ParcelType>::evolve()
 {
-    const volScalarField& T = carrierThermo_.T();
-    const volScalarField cp = carrierThermo_.Cp();
-    const volScalarField& p = carrierThermo_.p();
+    const volScalarField& T = this->carrierThermo().T();
+    const volScalarField cp = this->carrierThermo().Cp();
+    const volScalarField& p = this->carrierThermo().p();
 
     autoPtr<interpolation<scalar> > rhoInterp = interpolation<scalar>::New
     (
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
index 9409d12a49..0feece303f 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
@@ -68,12 +68,6 @@ class ReactingMultiphaseCloud
         //- Parcel constant properties
         typename ParcelType::constantProperties constProps_;
 
-        //- Thermodynamics package (combustion)
-        hCombustionThermo& carrierThermo_;
-
-        //- Gas phase properties
-        PtrList<specieReactingProperties>& gases_;
-
 
         // References to the cloud sub-models
 
@@ -85,13 +79,6 @@ class ReactingMultiphaseCloud
             devolatilisationModel_;
 
 
-
-        // Sources
-
-            //- Mass transfer fields - one per carrier phase specie
-            PtrList<DimensionedField<scalar, volMesh> > rhoTrans_;
-
-
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
@@ -125,16 +112,6 @@ public:
 
         // Access
 
-            //- Return const access to carrier phase thermo package
-            inline const hCombustionThermo& carrierThermo() const;
-
-            //- Return access to carrier phase thermo package
-            inline hCombustionThermo& carrierThermo();
-
-            //- Gas phase properties
-            inline const PtrList<specieReactingProperties>& gases() const;
-
-
             // Sub-models
 
                 //- Return reference to devolatilisation model
@@ -145,29 +122,6 @@ public:
                 devolatilisation() const;
 
 
-            // Sources
-
-                //- Mass
-
-                    //- Return reference to mass source for field i
-                    inline DimensionedField<scalar, volMesh>&
-                        rhoTrans(const label i);
-
-                    //- Return reference to mass source fields
-                    inline PtrList<DimensionedField<scalar, volMesh> >&
-                        rhoTrans();
-
-                    //- Return tmp mass source for field i
-                    //  Fully explicit
-                    inline tmp<DimensionedField<scalar, volMesh> >
-                        Srho1(const label i) const;
-
-                    //- Return tmp total mass source for carrier phase
-                    //  Fully explicit
-                    inline tmp<DimensionedField<scalar, volMesh> >
-                        Srho1() const;
-
-
         // Cloud evolution functions
 
             //- Add new parcel
diff --git a/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.C
index a532276dee..c83cf4a20d 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.C
+++ b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.C
@@ -46,7 +46,7 @@ Foam::basicReactingMultiphaseCloud::basicReactingMultiphaseCloud
     PtrList<specieReactingProperties>& gases
 )
 :
-    ReactingCloud<basicReactingMultiphaseParcel>
+    ReactingMultiphaseCloud<basicReactingMultiphaseParcel>
     (
         cloudType,
         rho,
diff --git a/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H
index fb1b946e1d..7ccdc7a7ae 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H
@@ -36,7 +36,7 @@ SourceFiles
 #ifndef basicReactingMultiphaseCloud_H
 #define basicReactingMultiphaseCloud_H
 
-#include "ReactingCloud.H"
+#include "ReactingMultiphaseCloud.H"
 #include "basicReactingMultiphaseParcel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -50,7 +50,7 @@ namespace Foam
 
 class basicReactingMultiphaseCloud
 :
-    public ReactingCloud<basicReactingMultiphaseParcel>
+    public ReactingMultiphaseCloud<basicReactingMultiphaseParcel>
 {
     // Private Member Functions
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index c25a24163a..35d969714f 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -58,7 +58,11 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcCoupled
     const scalar cp0 = this->cp_;
     const scalar np0 = this->nParticle_;
     const scalar T0 = this->T_;
-    scalarList& YMix = this->YMixture_;
+    scalarField& YMix = this->YMixture_;
+
+    label idGas = td.cloud().composition().idGas();
+    label idLiquid = td.cloud().composition().idLiquid();
+    label idSolid = td.cloud().composition().idSolid();
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~
     // Initialise transfer terms
@@ -96,7 +100,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcCoupled
     // ~~~~~~~~~~~~~~~~~~~~~~
     // Calculate phase change
     // ~~~~~~~~~~~~~~~~~~~~~~
-    calcPhaseChange(td, dt, T0, T1, dMassMT);
+    calcPhaseChange(td, dt, T0, dMassMT);
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -104,7 +108,6 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcCoupled
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~
     calcDevolatilisation(td, dt, T0, T1, dMassMT);
 
-
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Calculate surface reactions
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -132,12 +135,12 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcCoupled
     // Correct dhTrans to account for enthalpy of evolved volatiles
     dhTrans +=
         sum(dMassMT)
-       *td.cloud().composition().HGas(YGas_, 0.5*(T0 + T1));
+       *td.cloud().composition().H(idGas, YGas_, this->pc_, 0.5*(T0 + T1));
 
     // Correct dhTrans to account for enthalpy of consumed solids
     dhTrans +=
         sum(dMassSR)
-       *td.cloud().composition().HSolid(YSolid_, 0.5*(T0 + T1));
+       *td.cloud().composition().H(idSolid, YSolid_, this->pc_, 0.5*(T0 + T1));
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~
@@ -179,8 +182,10 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcCoupled
         td.cloud().hTrans()[celli] +=
             np0*mass1
            *(
-                YMix[0]*td.cloud().composition().HGas(YGas_, T1)
-              + YMix[2]*td.cloud().composition().HSolid(YSolid_, T1)
+                YMix[0]
+               *td.cloud().composition().H(idGas, YGas_, this->pc_, T1)
+              + YMix[2]
+               *td.cloud().composition().H(idSolid, YSolid_, this->pc_, T1)
             );
         td.cloud().UTrans()[celli] += np0*mass1*U1;
     }
@@ -192,9 +197,9 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcCoupled
         this->U_ = U1;
         this->T_ = T1;
         this->cp_ =
-            YMix[0]*td.cloud().composition().cpGas(YGas_, T1)
-          + YMix[1]*td.cloud().composition().cpLiquid(YLiquid_, this->pc_, T1)
-          + YMix[2]*td.cloud().composition().cpSolid(YSolid_);
+            YMix[0]*td.cloud().composition().cp(idGas, YGas_, this->pc_, T1)
+          + YMix[1]*td.cloud().composition().cp(idLiquid, YLiquid_, this->pc_, T1)
+          + YMix[2]*td.cloud().composition().cp(idSolid, YSolid_, this->pc_, T1);
 
         // Update particle density or diameter
         if (td.constProps().constantVolume())
@@ -224,7 +229,11 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcUncoupled
     const scalar T0 = this->T_;
     const scalar mass0 = this->mass();
     const scalar cp0 = this->cp_;
-    scalarList& YMix = this->YMixture_;
+    scalarField& YMix = this->YMixture_;
+
+    label idGas = td.cloud().composition().idGas();
+    label idLiquid = td.cloud().composition().idLiquid();
+    label idSolid = td.cloud().composition().idSolid();
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~
     // Initialise transfer terms
@@ -262,7 +271,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcUncoupled
     // ~~~~~~~~~~~~~~~~~~~~~~
     // Calculate phase change
     // ~~~~~~~~~~~~~~~~~~~~~~
-    calcPhaseChange(td, dt, T0, T1, dMassMT);
+    calcPhaseChange(td, dt, T0, dMassMT);
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -285,9 +294,9 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcUncoupled
 
     // New specific heat capacity
     const scalar cp1 =
-        YMix[0]*td.cloud().composition().cpGas(YGas_, T1)
-      + YMix[1]*td.cloud().composition().cpLiquid(YLiquid_, this->pc_, T1)
-      + YMix[2]*td.cloud().composition().cpSolid(YSolid_);
+        YMix[0]*td.cloud().composition().cp(idGas, YGas_, this->pc_, T1)
+      + YMix[1]*td.cloud().composition().cp(idLiquid, YLiquid_, this->pc_, T1)
+      + YMix[2]*td.cloud().composition().cp(idSolid, YSolid_, this->pc_, T1);
 
     // Add retained enthalpy to particle
     T1 += dhRet/(mass0*0.5*(cp0 + cp1));
@@ -364,7 +373,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
 
     // Determine mass to add to carrier phase
     const scalar mass = this->mass();
-    scalarList& YMix = this->YMixture_;
+    scalarField& YMix = this->YMixture_;
     const scalar dMassTot = td.cloud().devolatilisation().calculate
     (
         dt,
@@ -382,9 +391,10 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
     YMix[2] = 1.0 - YMix[0] - YMix[1];
 
     // Add to cummulative mass transfer
+    label idGas = td.cloud().composition().idGas();
     forAll (YGas_, i)
     {
-        label id = td.cloud().composition().gasGlobalIds()[i];
+        label id = td.cloud().composition().globalIds(idGas)[i];
 
         // Volatiles mass transfer
         scalar volatileMass = YGas_[i]*dMassTot;
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
index 6c93a116db..416dc63d8b 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -40,6 +40,7 @@ SourceFiles
 #define ReactingMultiphaseParcel_H
 
 #include "ReactingParcel.H"
+#include "ReactingMultiphaseCloud.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -110,6 +111,9 @@ public:
     {
         // Private data
 
+            //- Reference to the cloud containing this particle
+            ReactingMultiphaseCloud<ParcelType>& cloud_;
+
             //- Particle constant properties
             const constantProperties& constProps_;
 
@@ -121,7 +125,7 @@ public:
             //- Construct from components
             inline trackData
             (
-                ReactingCloud<ParcelType>& cloud,
+                ReactingMultiphaseCloud<ParcelType>& cloud,
                 const constantProperties& constProps,
                 const interpolation<scalar>& rhoInterp,
                 const interpolation<vector>& UInterp,
@@ -135,6 +139,9 @@ public:
 
         // Member functions
 
+            //- Return access to the owner cloud
+            inline ReactingMultiphaseCloud<ParcelType>& cloud();
+
             //- Return const access to the constant properties
             inline const constantProperties& constProps() const;
     };
@@ -201,7 +208,7 @@ public:
         //- Construct from components
         inline ReactingMultiphaseParcel
         (
-            ReactingCloud<ParcelType>& owner,
+            ReactingMultiphaseCloud<ParcelType>& owner,
             const label typeId,
             const vector& position,
             const label celli,
@@ -292,10 +299,13 @@ public:
         // I-O
 
             //- Read
-            static void readFields(ReactingCloud<ParcelType>& c);
+            static void readFields(ReactingMultiphaseCloud<ParcelType>& c);
 
             //- Write
-            static void writeFields(const ReactingCloud<ParcelType>& c);
+            static void writeFields
+            (
+                const ReactingMultiphaseCloud<ParcelType>& c
+            );
 
 
     // Ostream Operator
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
index 87a7cb2d8c..7becf84d6c 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
@@ -43,7 +43,7 @@ constantProperties
 template<class ParcelType>
 inline Foam::ReactingMultiphaseParcel<ParcelType>::trackData::trackData
 (
-    ReactingCloud<ParcelType>& cloud,
+    ReactingMultiphaseCloud<ParcelType>& cloud,
     const constantProperties& constProps,
     const interpolation<scalar>& rhoInterp,
     const interpolation<vector>& UInterp,
@@ -65,14 +65,16 @@ inline Foam::ReactingMultiphaseParcel<ParcelType>::trackData::trackData
         CpInterp,
         pInterp,
         g
-    )
+    ),
+    cloud_(cloud),
+    constProps_(constProps)
 {}
 
 
 template<class ParcelType>
 inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
 (
-    ReactingCloud<ParcelType>& owner,
+    ReactingMultiphaseCloud<ParcelType>& owner,
     const label typeId,
     const vector& position,
     const label celli,
@@ -132,6 +134,14 @@ Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::Ldevol() const
 
 // * * * * * * * * * * * trackData Member Functions  * * * * * * * * * * * * //
 
+template<class ParcelType>
+inline Foam::ReactingMultiphaseCloud<ParcelType>&
+Foam::ReactingMultiphaseParcel<ParcelType>::trackData::cloud()
+{
+    return cloud_;
+}
+
+
 template<class ParcelType>
 inline const typename Foam::ReactingMultiphaseParcel<ParcelType>::
 constantProperties&
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
index bc1e46336e..bb53f10a20 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
@@ -44,32 +44,34 @@ Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
 {
     if (readFields)
     {
-        const ReactingCloud<ParcelType>& cR =
-            dynamic_cast<const ReactingCloud<ParcelType>& >(cloud);
+        const ReactingMultiphaseCloud<ParcelType>& cR =
+            dynamic_cast<const ReactingMultiphaseCloud<ParcelType>& >(cloud);
 
-        const label nGas = cR.composition().gasNames().size();
-        const label nLiquid = cR.composition().liquidNames().size();
-        const label nSolid = cR.composition().solidNames().size();
+        const label idGas = cR.composition().idGas();
+        const label nGas = cR.composition().componentNames(idGas).size();
+        const label idLiquid = cR.composition().idLiquid();
+        const label nLiquid = cR.composition().componentNames(idLiquid).size();
+        const label idSolid = cR.composition().idGas();
+        const label nSolid = cR.composition().componentNames(idSolid).size();
 
         YGas_.setSize(nGas);
         YLiquid_.setSize(nLiquid);
         YSolid_.setSize(nSolid);
 
-        const scalarField& YMix = this->YMixture_;
         if (is.format() == IOstream::ASCII)
         {
             is >> YGas_ >> YLiquid_ >> YSolid_;
-            YGas_ /= YMix[0] + VSMALL;
-            YLiquid_ /= YMix[1] + VSMALL;
-            YSolid_ /= YMix[2] + VSMALL;
         }
         else
         {
             is >> YGas_ >> YLiquid_ >> YSolid_;
-            YGas_ /= YMix[0] + VSMALL;
-            YLiquid_ /= YMix[1] + VSMALL;
-            YSolid_ /= YMix[2] + VSMALL;
         }
+
+        // scale the mass fractions
+        const scalarField& YMix = this->YMixture_;
+        YGas_ /= YMix[0] + ROOTVSMALL;
+        YLiquid_ /= YMix[1] + ROOTVSMALL;
+        YSolid_ /= YMix[2] + ROOTVSMALL;
     }
 
     // Check state of Istream
@@ -88,7 +90,7 @@ Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
 template<class ParcelType>
 void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
 (
-    ReactingCloud<ParcelType>& c
+    ReactingMultiphaseCloud<ParcelType>& c
 )
 {
     if (!c.size())
@@ -99,20 +101,20 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
     ReactingParcel<ParcelType>::readFields(c);
 
     // Get names and sizes for each Y...
-    const wordList gasNames = c.composition().gasNames();
-    const wordList liquidNames = c.composition().liquidNames();
-    const wordList solidNames = c.composition().solidNames();
-    const label nGas = gasNames.size();
-    const label nLiquid = liquidNames.size();
-    const label nSolid = solidNames.size();
+    const label idGas = c.composition().idGas();
+    const wordList gasNames = c.composition().componentNames(idGas);
+    const label idLiquid = c.composition().idLiquid();
+    const wordList liquidNames = c.composition().componentNames(idLiquid);
+    const label idSolid = c.composition().idSolid();
+    const wordList solidNames = c.composition().componentNames(idSolid);
 
     // Set storage for each Y... for each parcel
     forAllIter(typename Cloud<ParcelType>, c, iter)
     {
         ReactingMultiphaseParcel<ParcelType>& p = iter();
-        p.YGas_.setSize(nGas, 0.0);
-        p.YLiquid_.setSize(nLiquid, 0.0);
-        p.YSolid_.setSize(nSolid, 0.0);
+        p.YGas_.setSize(gasNames.size(), 0.0);
+        p.YLiquid_.setSize(liquidNames.size(), 0.0);
+        p.YSolid_.setSize(solidNames.size(), 0.0);
     }
 
     // Populate YGas for each parcel
@@ -127,7 +129,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
         forAllIter(typename Cloud<ParcelType>, c, iter)
         {
             ReactingMultiphaseParcel<ParcelType>& p = iter();
-            p.YGas_[j] = YGas[i++]/p.YMixture()[0];
+            p.YGas_[j] = YGas[i++]/(p.YMixture()[0] + ROOTVSMALL);
         }
     }
     // Populate YLiquid for each parcel
@@ -142,7 +144,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
         forAllIter(typename Cloud<ParcelType>, c, iter)
         {
             ReactingMultiphaseParcel<ParcelType>& p = iter();
-            p.YLiquid_[j] = YLiquid[i++]/p.YMixture()[1];
+            p.YLiquid_[j] = YLiquid[i++]/(p.YMixture()[1] + ROOTVSMALL);
         }
     }
     // Populate YSolid for each parcel
@@ -157,7 +159,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
         forAllIter(typename Cloud<ParcelType>, c, iter)
         {
             ReactingMultiphaseParcel<ParcelType>& p = iter();
-            p.YSolid_[j] = YSolid[i++]/p.YMixture()[2];
+            p.YSolid_[j] = YSolid[i++]/(p.YMixture()[2] + ROOTVSMALL);
         }
     }
 }
@@ -166,7 +168,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
 template<class ParcelType>
 void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
 (
-    const ReactingCloud<ParcelType>& c
+    const ReactingMultiphaseCloud<ParcelType>& c
 )
 {
     ReactingParcel<ParcelType>::writeFields(c);
@@ -176,7 +178,8 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
     // Write the composition fractions
     if (np > 0)
     {
-        const wordList& gasNames = c.composition().gasNames();
+        const label idGas = c.composition().idGas();
+        const wordList gasNames = c.composition().componentNames(idGas);
         forAll(gasNames, j)
         {
             IOField<scalar> YGas
@@ -194,7 +197,8 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
 
             YGas.write();
         }
-        const wordList& liquidNames = c.composition().liquidNames();
+        const label idLiquid = c.composition().idLiquid();
+        const wordList liquidNames = c.composition().componentNames(idLiquid);
         forAll(liquidNames, j)
         {
             IOField<scalar> YLiquid
@@ -212,7 +216,8 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
 
             YLiquid.write();
         }
-        const wordList& solidNames = c.composition().solidNames();
+        const label idSolid = c.composition().idSolid();
+        const wordList solidNames = c.composition().componentNames(idSolid);
         forAll(solidNames, j)
         {
             IOField<scalar> YSolid
@@ -248,14 +253,14 @@ Foam::Ostream& Foam::operator<<
     scalarField YSolidLoc = p.YSolid()*p.YMixture()[2];
     if (os.format() == IOstream::ASCII)
     {
-        os  << static_cast<const ReactingParcel<ParcelType>& >(p)
+        os  << static_cast<const ReactingMultiphaseParcel<ParcelType>& >(p)
             << token::SPACE << YGasLoc
             << token::SPACE << YLiquidLoc
             << token::SPACE << YSolidLoc;
     }
     else
     {
-        os  << static_cast<const ReactingParcel<ParcelType>& >(p);
+        os  << static_cast<const ReactingMultiphaseParcel<ParcelType>& >(p);
         os << YGasLoc << YLiquidLoc << YSolidLoc;
     }
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index a2ae89a504..daaa9ac66a 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -97,7 +97,7 @@ void Foam::ReactingParcel<ParcelType>::calcCoupled
     // ~~~~~~~~~~~~~~~~~~~~~~
     // Calculate phase change
     // ~~~~~~~~~~~~~~~~~~~~~~
-    calcPhaseChange(td, dt, T0, T1, dMassMT);
+    calcPhaseChange(td, dt, T, dMassMT);
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -117,6 +117,7 @@ void Foam::ReactingParcel<ParcelType>::calcCoupled
     T1 += dhRet/(0.5*(mass0 + mass1)*cp0);
     dhTrans -= dhRet;
 
+
     // ~~~~~~~~~~~~~~~~~~~~~~~
     // Accumulate source terms
     // ~~~~~~~~~~~~~~~~~~~~~~~
@@ -134,7 +135,6 @@ void Foam::ReactingParcel<ParcelType>::calcCoupled
     td.cloud().UCoeff()[celli] += np0*mass0*Cud;
 
     // Update enthalpy transfer
-    // - enthalpy of lost solids already accounted for
     td.cloud().hTrans()[celli] += np0*dhTrans;
 
     // Accumulate coefficient to be applied in carrier phase enthalpy coupling
@@ -229,7 +229,7 @@ void Foam::ReactingParcel<ParcelType>::calcUncoupled
     // ~~~~~~~~~~~~~~~~~~~~~~
     // Calculate phase change
     // ~~~~~~~~~~~~~~~~~~~~~~
-    calcPhaseChange(td, dt, T0, T1, dMassMT);
+    calcPhaseChange(td, dt, T, dMassMT);
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -285,16 +285,17 @@ void Foam::ReactingParcel<ParcelType>::calcPhaseChange
 (
     TrackData& td,
     const scalar dt,
-    const scalar T0,
-    const scalar T1,
+    const scalar T,
     scalarList& dMassMT
 )
 {
-    //    if (!td.cloud().phaseChange().active())
+    if (!td.cloud().phaseChange().active())
     {
         return;
     }
 
+    // TODO: separate treatment for boiling
+
     /*
     // Determine mass to add to carrier phase
     const scalar mass = this->mass();
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index 92da3160cc..763f1e2a6c 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -174,8 +174,7 @@ protected:
         (
             TrackData& td,
             const scalar dt,
-            const scalar T0,
-            const scalar T1,
+            const scalar T,
             scalarList& dMassMT
         );
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
index 0a81cdfd3f..98076d4b27 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
@@ -47,7 +47,7 @@ Foam::ReactingParcel<ParcelType>::ReactingParcel
         const ReactingCloud<ParcelType>& cR =
             dynamic_cast<const ReactingCloud<ParcelType>& >(cloud);
 
-        const label nMixture = cR.composition().compositionNames().size();
+        const label nMixture = cR.composition().phaseTypes().size();
         YMixture_.setSize(nMixture);
 
         if (is.format() == IOstream::ASCII)
@@ -102,22 +102,22 @@ void Foam::ReactingParcel<ParcelType>::readFields
     }
 
     // Get names and sizes for each Y...
-    const wordList compositionNames = c.composition().compositionNames();
-    const label nComposition = compositionNames.size();
+    const wordList phaseTypes = c.composition().phaseTypes();
+    const label nPhases = phaseTypes.size();
 
     // Set storage for each Y... for each parcel
     forAllIter(typename Cloud<ParcelType>, c, iter)
     {
         ReactingParcel<ParcelType>& p = iter();
-        p.YMixture_.setSize(nComposition, 0.0);
+        p.YMixture_.setSize(nPhases, 0.0);
     }
 
     // Populate YMixture for each parcel
-    forAll(compositionNames, j)
+    forAll(phaseTypes, j)
     {
         IOField<scalar> YMixture
         (
-            c.fieldIOobject("Y" + compositionNames[j], IOobject::MUST_READ)
+            c.fieldIOobject("Y" + phaseTypes[j], IOobject::MUST_READ)
         );
 
         label i = 0;
@@ -154,12 +154,12 @@ void Foam::ReactingParcel<ParcelType>::writeFields
     // Write the composition fractions
     if (np > 0)
     {
-        const wordList compositionNames = c.composition().compositionNames();
-        forAll(compositionNames, j)
+        const wordList phaseTypes = c.composition().phaseTypes();
+        forAll(phaseTypes, j)
         {
             IOField<scalar> YMixture
             (
-                c.fieldIOobject("Y" + compositionNames[j], IOobject::NO_READ),
+                c.fieldIOobject("Y" + phaseTypes[j], IOobject::NO_READ),
                 np
             );
 
@@ -196,6 +196,7 @@ Foam::Ostream& Foam::operator<<
         os  << static_cast<const ThermoParcel<ParcelType>& >(p);
         os.write
         (
+
             reinterpret_cast<const char*>(&p.mass0_),
             sizeof(p.mass0())
         );
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C
index 8d9c68b8f6..99d4ec05b0 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C
@@ -40,7 +40,7 @@ namespace Foam
 
 Foam::basicReactingMultiphaseParcel::basicReactingMultiphaseParcel
 (
-    ReactingCloud<basicReactingMultiphaseParcel>& owner,
+    ReactingMultiphaseCloud<basicReactingMultiphaseParcel>& owner,
     const label typeId,
     const vector& position,
     const label celli,
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H
index 7009ca98e0..c39fae262e 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H
@@ -63,7 +63,7 @@ public:
         //- Construct from components
         basicReactingMultiphaseParcel
         (
-             ReactingCloud<basicReactingMultiphaseParcel>& owner,
+             ReactingMultiphaseCloud<basicReactingMultiphaseParcel>& owner,
              const label typeId,
              const vector& position,
              const label celli,
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C
index 487b0f852d..5278c5e0f5 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C
@@ -61,50 +61,37 @@ namespace Foam
         ReactingParcel<basicReactingMultiphaseParcel>,
         0
     );
+    defineParcelTypeNameAndDebug
+    (
+        ReactingMultiphaseParcel<basicReactingMultiphaseParcel>,
+        0
+    );
+    defineTemplateTypeNameAndDebug
+    (
+        ReactingMultiphaseParcel<basicReactingMultiphaseParcel>,
+        0
+    );
 
     defineParcelTypeNameAndDebug
     (
         KinematicCloud<basicReactingMultiphaseParcel>,
         0
     );
-//    defineTemplateTypeNameAndDebug
-//    (
-//        KinematicCloud<basicReactingMultiphaseParcel>,
-//        0
-//    );
-
     defineParcelTypeNameAndDebug
     (
         ThermoCloud<basicReactingMultiphaseParcel>,
         0
     );
-//    defineTemplateTypeNameAndDebug
-//    (
-//        ThermoCloud<basicReactingMultiphaseParcel>,
-//        0
-//    );
-
     defineParcelTypeNameAndDebug
     (
         ReactingCloud<basicReactingMultiphaseParcel>,
         0
     );
-//    defineTemplateTypeNameAndDebug
-//    (
-//        ReactingCloud<basicReactingMultiphaseParcel>,
-//        0
-//    );
-
     defineParcelTypeNameAndDebug
     (
         ReactingMultiphaseCloud<basicReactingMultiphaseParcel>,
         0
     );
-//    defineTemplateTypeNameAndDebug
-//    (
-//        ReactingMultiphaseCloud<basicReactingMultiphaseParcel>,
-//        0
-//    );
 
 };
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelCompositionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelCompositionModels.C
index b2f9ae5714..786fa74ddc 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelCompositionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelCompositionModels.C
@@ -27,7 +27,7 @@ License
 #include "basicReactingParcel.H"
 #include "ReactingCloud.H"
 
-#include "SingleMixtureFraction.H"
+#include "SinglePhaseMixture.H"
 
 namespace Foam
 {
@@ -36,7 +36,7 @@ namespace Foam
     // Add instances of composition model to the table
     makeCompositionModelType
     (
-        SingleMixtureFraction,
+        SinglePhaseMixture,
         ReactingCloud,
         basicReactingParcel
     );
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
new file mode 100644
index 0000000000..afec996210
--- /dev/null
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
@@ -0,0 +1,305 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "phaseProperties.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<>
+const char* Foam::NamedEnum<Foam::phaseProperties::phaseType, 4>::names[] =
+{
+    "gas",
+    "liquid",
+    "solid",
+    "unknown"
+};
+
+
+const Foam::NamedEnum<Foam::phaseProperties::phaseType, 4>
+    Foam::phaseProperties::phaseTypeNames_;
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::phaseProperties::setGlobalGasIds
+(
+    const PtrList<volScalarField>& YGas
+)
+{
+    forAll(names_, i)
+    {
+        forAll (YGas, j)
+        {
+            word specieName = YGas[j].name();
+
+            if (specieName == names_[i])
+            {
+                globalIds_[i] = j;
+                break;
+            }
+        }
+        if (globalIds_[i] == -1)
+        {
+            wordList globalGasNames(YGas.size());
+
+            forAll (YGas, k)
+            {
+                globalGasNames[k] = YGas[k].name();
+            }
+
+            FatalErrorIn
+            (
+                "void phaseProperties::setGlobalGasIds\n"
+                "(\n"
+                "    const PtrList<volScalarField>&\n"
+                ")"
+            )   << "Could not find gas species " << names_[i]
+                << " in species list" <<  nl
+                << "Available species are: " << nl << globalGasNames << nl
+                << exit(FatalError);
+        }
+    }
+}
+
+
+void Foam::phaseProperties::setGlobalIds(const wordList& globalNames)
+{
+    forAll(names_, i)
+    {
+        forAll(globalNames, j)
+        {
+            if (globalNames[j] == names_[i])
+            {
+                globalIds_[i] = j;
+                break;
+            }
+        }
+        if (globalIds_[i] == -1)
+        {
+            FatalErrorIn
+            (
+                "void Foam::phaseProperties::setGlobalIds(const wordList&)"
+            )   << "Could not find specie " << names_[i]
+                << " in species list" <<  nl
+                << "Available species are: " << nl << globalNames << nl
+                << exit(FatalError);
+        }
+    }
+}
+
+
+void Foam::phaseProperties::checkTotalMassFraction() const
+{
+    scalar total = 0.0;
+    forAll(Y_, cmptI)
+    {
+        total += Y_[cmptI];
+    }
+
+    if (Y_.size() != 0 && mag(total - 1.0) > SMALL)
+    {
+        FatalErrorIn
+        (
+            "void Foam::phaseProperties::checkTotalMassFraction() const"
+        )   << "Component fractions must total to unity for phase "
+            << phaseTypeNames_[phase_] << nl
+            << "Components: " << nl << names_ << nl << exit(FatalError);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::phaseProperties::phaseProperties()
+:
+    phase_(UNKNOWN),
+    names_(0),
+    Y_(0),
+    globalIds_(0)
+{}
+
+
+Foam::phaseProperties::phaseProperties(const phaseProperties& pp)
+:
+    phase_(pp.phase_),
+    names_(pp.names_),
+    Y_(pp.Y_),
+    globalIds_(pp.globalIds_)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::phaseProperties::~phaseProperties()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::phaseProperties::initialiseGlobalIds
+(
+    const PtrList<volScalarField>& YGas,
+    const wordList& liquidNames,
+    const wordList& solidNames
+)
+{
+    // determine the addressing to map between components listed in the phase
+    // with those given in the (main) thermo properties
+    switch (phase_)
+    {
+        case GAS:
+        {
+            setGlobalGasIds(YGas);
+            break;
+        }
+        case LIQUID:
+        {
+            setGlobalIds(liquidNames);
+            break;
+        }
+        case SOLID:
+        {
+            setGlobalIds(solidNames);
+            break;
+        }
+        default:
+        {
+            FatalErrorIn
+            (
+                "Foam::phaseProperties::setGlobalIds\n"
+                "(\n"
+                "    const PtrList<volScalarField>&,\n"
+                "    const wordList&,\n"
+                "    const wordList&\n"
+                ")"
+            )   << "Invalid phase: " << phaseTypeNames_[phase_] << nl
+                << "    phase must be gas, liquid or solid" << nl
+                << exit(FatalError);
+        }
+    }
+}
+
+
+Foam::phaseProperties::phaseType Foam::phaseProperties::phase() const
+{
+    return phase_;
+}
+
+
+Foam::word Foam::phaseProperties::phaseTypeName() const
+{
+    return phaseTypeNames_[phase_];
+}
+
+
+const Foam::List<Foam::word>& Foam::phaseProperties::names() const
+{
+    return names_;
+}
+
+
+const Foam::word& Foam::phaseProperties::name(const label cmptI) const
+{
+    if (cmptI >= names_.size())
+    {
+        FatalErrorIn
+        (
+            "const Foam::word& Foam::phaseProperties::name"
+            "("
+                "const label cmptI"
+            ") const"
+        )   << "Requested component " << cmptI << "out of range" << nl
+            << "Available phase components:" << nl << names_ << nl
+            << exit(FatalError);
+    }
+
+    return names_[cmptI];
+}
+
+
+const Foam::scalarField& Foam::phaseProperties::Y() const
+{
+    return Y_;
+}
+
+
+Foam::scalar& Foam::phaseProperties::Y(const label cmptI)
+{
+    if (cmptI >= Y_.size())
+    {
+        FatalErrorIn
+        (
+            "const Foam::scalar& Foam::phaseProperties::Y"
+            "("
+                "const label cmptI"
+            ") const"
+        )   << "Requested component " << cmptI << "out of range" << nl
+            << "Available phase components:" << nl << names_ << nl
+            << exit(FatalError);
+    }
+
+    return Y_[cmptI];
+}
+
+
+Foam::label Foam::phaseProperties::globalId(const word& cmptName) const
+{
+    label id = this->id(cmptName);
+
+    if (id < 0)
+    {
+        return id;
+    }
+    else
+    {
+        return globalIds_[id];
+    }
+
+}
+
+
+const Foam::labelList& Foam::phaseProperties::globalIds() const
+{
+    return globalIds_;
+}
+
+
+Foam::label Foam::phaseProperties::id(const word& cmptName) const
+{
+    forAll(names_, cmptI)
+    {
+        if (names_[cmptI] == cmptName)
+        {
+            return cmptI;
+        }
+    }
+
+    return -1;
+}
+
+
+// ************************************************************************* //
+
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C.bakNew b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C.bakNew
new file mode 100644
index 0000000000..fe690e0ab6
--- /dev/null
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C.bakNew
@@ -0,0 +1,357 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "phaseProperties.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<>
+const char* Foam::NamedEnum<Foam::phaseProperties::phaseType, 4>::names[] =
+{
+    "gas",
+    "liquid",
+    "solid",
+    "unknown"
+};
+
+
+const Foam::NamedEnum<Foam::phaseProperties::phaseType, 4>
+    Foam::phaseProperties::phaseTypeNames_;
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::phaseProperties::setGlobalGasIds
+(
+    const PtrList<volScalarField>& YGas
+)
+{
+    forAll(components_, i)
+    {
+        forAll (YGas, j)
+        {
+            word specieName = YGas[j].name();
+
+            if (specieName == components_[i].first())
+            {
+                globalIds_[i] = j;
+                break;
+            }
+        }
+        if (globalIds_[i] == -1)
+        {
+            wordList globalGasNames(YGas.size());
+
+            forAll (YGas, k)
+            {
+                globalGasNames[k] = YGas[k].name();
+            }
+
+            FatalErrorIn
+            (
+                "void phaseProperties::setGlobalGasIds"
+                "("
+                "    const hCombustionThermo&"
+                ")"
+            )   << "Could not find gas species " << components_[i].first()
+                << " in species list" <<  nl
+                << "Available species are: " << nl << globalGasNames << nl
+                << exit(FatalError);
+        }
+    }
+}
+
+
+void Foam::phaseProperties::setGlobalIds(const wordList& globalNames)
+{
+    forAll(components_, i)
+    {
+        forAll(globalNames, j)
+        {
+            if (globalNames[j] == components_[i].first())
+            {
+                globalIds_[i] = j;
+                break;
+            }
+        }
+        if (globalIds_[i] == -1)
+        {
+            FatalErrorIn
+            (
+                "void Foam::phaseProperties::setGlobalGasIds\n"
+                "(\n"
+                "    const PtrList<volScalarField>& YGas\n"
+                ")"
+            )   << "Could not find specie " << components_[i].first()
+                << " in species list" <<  nl
+                << "Available species are: " << nl << globalNames << nl
+                << exit(FatalError);
+        }
+    }
+}
+
+
+void Foam::phaseProperties::checkTotalMassFraction() const
+{
+    scalar total = 0.0;
+    forAll(fractions_, cmptI)
+    {
+        total += fractions_[cmptI];
+    }
+
+    if (mag(total - 1.0) > SMALL)
+    {
+        FatalErrorIn
+        (
+            "void Foam::phaseProperties::checkTotalMassFraction() const"
+        )   << "Component fractions must total to unity" << nl
+            << "Components: " << nl << components_ << nl << exit(FatalError);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::phaseProperties::phaseProperties()
+:
+    phase_(UNKNOWN),
+    names_(0),
+    fractions_(0),
+    globalIds_(0)
+{}
+
+
+Foam::phaseProperties::phaseProperties(Istream& is)
+:
+    phase_(UNKNOWN),
+    names_(0),
+    fractions_(0),
+    globalIds_(0)
+{
+    is.check("Foam::phaseProperties::phaseProperties(Istream& is)");
+
+    Tuple2<word, List<Tuple2<word, scalar> > > components(is);
+
+    phase_ = phaseTypeNames_.read(components.first());
+
+    label nComponents = components.second().size();
+    names_.setSize(nComponents);
+    fractions_.setSize(nComponents);
+
+    forAll(components.second(), cmptI)
+    {
+        names_[cmptI] = components.second()[cmptI].first();
+        fractions_[cmptI] = components.second()[cmptI].second();
+    }
+
+    // initialise global ids to -1
+    globalIds_.setSize(nComponents, -1);
+
+    checkTotalMassFraction();
+}
+
+
+Foam::phaseProperties::phaseProperties(const phaseProperties& pp)
+:
+    phase_(pp.phase_),
+    names_(pp.names_),
+    fractions_(pp.fractions_),
+    globalIds_(pp.globalIds_)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::phaseProperties::~phaseProperties()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::phaseProperties::initialiseGlobalIds
+(
+    const PtrList<volScalarField>& YGas,
+    const wordList& liquidNames,
+    const wordList& solidNames
+)
+{
+    // determine the addressing to map between components listed in the phase
+    // with those given in the (main) thermo properties
+    switch (phase_)
+    {
+        case GAS:
+        {
+            setGlobalGasIds(YGas);
+            break;
+        }
+        case LIQUID:
+        {
+            setGlobalIds(liquidNames);
+            break;
+        }
+        case SOLID:
+        {
+            setGlobalIds(solidNames);
+            break;
+        }
+        default:
+        {
+            FatalErrorIn
+            (
+                "Foam::phaseProperties::setGlobalIds\n"
+                "(\n"
+                "    const PtrList<specieReactingProperties>& gases,\n"
+                "    const wordList& liquidNames,\n"
+                "    const wordList& solidNames\n"
+                ")"
+            )   << "Invalid phase: " << phaseTypeNames_[phase_] << nl
+                << "    phase must be gas, liquid or solid" << nl
+                << exit(FatalError);
+        }
+}
+
+
+Foam::phaseProperties::phaseType Foam::phaseProperties::phase() const
+{
+    return phase_;
+}
+
+
+Foam::word Foam::phaseProperties::phaseTypeName() const
+{
+    return phaseTypeNames_[phase_];
+}
+
+
+const Foam::List<Foam::Tuple2<Foam::word, Foam::scalar> >&
+Foam::phaseProperties::components() const
+{
+    return components_;
+}
+
+
+const Foam::word& Foam::phaseProperties::name(const label cmptI) const
+{
+    if (cmptI >= components_.size())
+    {
+        FatalErrorIn
+        (
+            "const Foam::word& Foam::phaseProperties::name"
+            "("
+            "    const label cmptI"
+            ") const"
+        )   << "Requested component " << cmptI << "out of range" << nl
+            << "Available phase components:" << nl << components_ << nl
+            << exit(FatalError);
+    }
+
+    return components_[cmptI].first();
+}
+
+
+const Foam::wordList Foam::phaseProperties::names() const
+{
+    wordList cmptNames(components_.size());
+
+    forAll(components_, cmptI)
+    {
+        cmptNames[cmptI] = components_[cmptI].first();
+    }
+
+    return cmptNames;
+}
+
+
+Foam::label Foam::phaseProperties::id(const word& cmptName) const
+{
+    forAll(components_, cmptI)
+    {
+        if (components_[cmptI].first() == cmptName)
+        {
+            return cmptI;
+        }
+    }
+
+    return -1;
+}
+
+
+Foam::label Foam::phaseProperties::globalId(const word& cmptName) const
+{
+    label id = this->id(cmptName);
+
+    if (id < 0)
+    {
+        return id;
+    }
+    else
+    {
+        return globalIds_[id];
+    }
+
+}
+
+
+const Foam::labelList& Foam::phaseProperties::globalIds() const
+{
+    return globalIds_;
+}
+
+
+Foam::scalar& Foam::phaseProperties::Y(const label cmptI)
+{
+    if (cmptI >= components_.size())
+    {
+        FatalErrorIn
+        (
+            "const Foam::scalar& Foam::phaseProperties::Y"
+            "("
+            "    const label cmptI"
+            ") const"
+        )   << "Requested component " << cmptI << "out of range" << nl
+            << "Available phase components:" << nl << components_ << nl
+            << exit(FatalError);
+    }
+
+    return components_[cmptI].second();
+}
+
+
+const Foam::scalarList Foam::phaseProperties::Y() const
+{
+    scalarList cmptYs(components_.size(), 0.0);
+
+    forAll(cmptYs, i)
+    {
+        cmptYs[i] = components_[i].second();
+    }
+
+    return cmptYs;
+}
+
+
+// ************************************************************************* //
+
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
new file mode 100644
index 0000000000..258d0069ae
--- /dev/null
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
@@ -0,0 +1,177 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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::phaseProperties
+
+Description
+    Helper class to manage multi-component phase properties
+
+SourceFiles
+    phaseProperties.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef phaseProperties_H
+#define phaseProperties_H
+
+#include "NamedEnum.H"
+#include "Tuple2.H"
+#include "PtrList.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                      Class phaseProperties Declaration
+\*---------------------------------------------------------------------------*/
+
+class phaseProperties
+{
+public:
+
+    // Public data
+
+        //- Phase type enumeration
+        enum phaseType
+        {
+            GAS,
+            LIQUID,
+            SOLID,
+            UNKNOWN
+        };
+
+        //- Corresponding word representations for phase type enumerations
+        static const NamedEnum<phaseType, 4> phaseTypeNames_;
+
+
+private:
+
+   // Private data
+
+        //- Phase type
+        phaseType phase_;
+
+        //- List of component names
+        List<word> names_;
+
+        //- List of component mass fractions
+        scalarField Y_;
+
+        //- Global ids
+        labelList globalIds_;
+
+
+    // Private member functions
+
+        //- Set global ids - specialisation for carrier gas phases
+        void setGlobalGasIds(const PtrList<volScalarField>& YGas);
+
+        //- Set global ids - liquid and solid phases
+        void setGlobalIds(const wordList& globalNames);
+
+        //- Check the total mass fraction
+        void checkTotalMassFraction() const;
+
+
+public:
+
+    // Constructors
+
+        //- Null constructor
+        phaseProperties();
+
+        //- Construct from Istream
+        phaseProperties(Istream&);
+
+        //- Construct as copy
+        phaseProperties(const phaseProperties&);
+
+
+    //- Destructor
+    ~phaseProperties();
+
+
+    // Public member functions
+
+        //- Initialise the global ids
+        void initialiseGlobalIds
+        (
+            const PtrList<volScalarField>& YGas,
+            const wordList& liquidNames,
+            const wordList& solidNames
+        );
+
+
+        // Access
+
+            //- Return const access to the phase type
+            phaseType phase() const;
+
+            //- Return word representation of the phase type
+            word phaseTypeName() const;
+
+            //- Return the list of component names
+            const List<word>& names() const;
+
+            //- Return const access to a component name
+            const word& name(const label cmptI) const;
+
+            //- Return const access to all component mass fractions
+            const scalarField& Y() const;
+
+            //- Return non-const access to a component mass fraction
+            scalar& Y(const label cmptI);
+
+            //- Return const acccess to the global ids
+            const labelList& globalIds() const;
+
+            //- Return the global id of a component in the local list by name
+            //  Returns -1 if not found
+            label globalId(const word& cmptName) const;
+
+            //- Return the id of a component in the local list by name
+            //  Returns -1 if not found
+            label id(const word& cmptName) const;
+
+
+    // IOstream Operators
+
+        friend Istream& operator>>(Istream&, phaseProperties&);
+        friend Ostream& operator<<(Ostream&, const phaseProperties&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H.bakNew b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H.bakNew
new file mode 100644
index 0000000000..b7ca428715
--- /dev/null
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H.bakNew
@@ -0,0 +1,177 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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::phaseProperties
+
+Description
+    Helper class to manage multi-component phase properties
+
+SourceFiles
+    phaseProperties.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef phaseProperties_H
+#define phaseProperties_H
+
+#include "NamedEnum.H"
+#include "Tuple2.H"
+#include "PtrList.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                      Class phaseProperties Declaration
+\*---------------------------------------------------------------------------*/
+
+class phaseProperties
+{
+public:
+
+    // Public data
+
+        //- Phase type enumeration
+        enum phaseType
+        {
+            GAS,
+            LIQUID,
+            SOLID,
+            UNKNOWN
+        };
+
+        //- Corresponding word representations for phase type enumerations
+        static const NamedEnum<phaseType, 4> phaseTypeNames_;
+
+
+private:
+
+   // Private data
+
+        //- Phase type
+        phaseType phase_;
+
+        //- List of component names
+        List<word> names_;
+
+        //- List of component mass fractions
+        List<scalar> fractions_;
+
+        //- Global ids
+        labelList globalIds_;
+
+
+    // Private member functions
+
+        //- Set global ids - specialisation for carrier gas phases
+        void setGlobalGasIds(const PtrList<volScalarField>& YGas);
+
+        //- Set global ids - liquid and solid phases
+        void setGlobalIds(const wordList& globalNames);
+
+        //- Check the total mass fraction
+        void checkTotalMassFraction() const;
+
+
+public:
+
+    // Constructors
+
+        //- Null constructor
+        phaseProperties();
+
+        //- Construct from Istream
+        phaseProperties(Istream&);
+
+        //- Construct as copy
+        phaseProperties(const phaseProperties&);
+
+
+    //- Destructor
+    ~phaseProperties();
+
+
+    // Public member functions
+
+        //- Initialise the global ids
+        void initialiseGlobalIds
+        (
+            const PtrList<volScalarField>& YGas,
+            const wordList& liquidNames,
+            const wordList& solidNames
+        );
+
+        //- Return const access to the phase type
+        phaseType phase() const;
+
+        //- Return word representation of the phase type
+        word phaseTypeName() const;
+
+        //- Return const access to the component name vs mass fraction list
+        const List<Tuple2<word, scalar> >& components() const;
+
+        //- Return const access to a component name
+        const word& name(const label cmptI) const;
+
+        //- Return a list of component names
+        const wordList names() const;
+
+        //- Return the id of a component in the local list by name
+        //  Returns -1 if not found
+        label id(const word& cmptName) const;
+
+        //- Return the global id of a component in the local list by name
+        //  Returns -1 if not found
+        label globalId(const word& cmptName) const;
+
+        //- Return const acccess to the global ids
+        const labelList& globalIds() const;
+
+        //- Return non-const access to a component mass fraction
+        scalar& Y(const label cmptI);
+
+        //- Return const access to all component mass fractions
+        const scalarList Y() const;
+
+
+    // IOstream Operators
+
+        friend Istream& operator>>(Istream&, phaseProperties&);
+        friend Ostream& operator<<(Ostream&, const phaseProperties&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
new file mode 100644
index 0000000000..34641fe4d4
--- /dev/null
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
@@ -0,0 +1,145 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "phaseProperties.H"
+#include "dictionaryEntry.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+
+Foam::phaseProperties::phaseProperties(Istream& is)
+:
+    phase_(UNKNOWN),
+    names_(0),
+    Y_(0),
+    globalIds_(0)
+{
+    is.check("Foam::phaseProperties::phaseProperties(Istream& is)");
+
+    dictionaryEntry phaseInfo(dictionary::null, is);
+
+    if (!phaseInfo.isDict())
+    {
+        FatalErrorIn("Foam::phaseProperties::phaseProperties(Istream& is)")
+            << "Phase properties should be given in dictionary entries"
+            << nl << exit(FatalError);
+    }
+
+    label nComponents = phaseInfo.size();
+    names_.setSize(nComponents);
+    Y_.setSize(nComponents);
+
+    phase_ = phaseTypeNames_[phaseInfo.keyword()];
+
+    label cmptI = 0;
+    forAllConstIter(IDLList<entry>, phaseInfo, iter)
+    {
+        names_[cmptI] = iter().keyword();
+        Y_[cmptI] = readScalar(phaseInfo.lookup(names_[cmptI]));
+        cmptI++;
+    }
+
+    // initialise global ids to -1
+    globalIds_.setSize(nComponents, -1);
+
+    checkTotalMassFraction();
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+Foam::Istream& Foam::operator>>(Istream& is, phaseProperties& pp)
+{
+    is.check
+    (
+        "Foam::Istream& Foam::operator>>"
+        "(Foam::Istream&, Foam::phaseProperties&)"
+    );
+
+    dictionaryEntry phaseInfo(dictionary::null, is);
+
+    if (!phaseInfo.isDict())
+    {
+        FatalErrorIn
+        (
+            "Foam::Istream& Foam::operator>>(Istream& is, phaseProperties& pp)"
+        )   << "Phase properties should be given in dictionary entries"
+            << nl << exit(FatalError);
+    }
+
+    label nComponents = phaseInfo.size();
+    pp.names_.setSize(nComponents);
+    pp.Y_.setSize(nComponents);
+
+    pp.phase_ = pp.phaseTypeNames_[phaseInfo.keyword()];
+
+    label cmptI = 0;
+    forAllConstIter(IDLList<entry>, phaseInfo, iter)
+    {
+        pp.names_[cmptI] = iter().keyword();
+        pp.Y_[cmptI] = readScalar(phaseInfo.lookup(pp.names_[cmptI]));
+        cmptI++;
+    }
+
+    // initialise global ids to -1
+    pp.globalIds_.setSize(nComponents, -1);
+
+    pp.checkTotalMassFraction();
+
+    return is;
+}
+
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const phaseProperties& pp)
+{
+    os.check
+    (
+        "Foam::Ostream& Foam::operator<<"
+        "(Foam::Ostream&, const Foam::phaseProperties&)"
+    );
+
+    os  << pp.phaseTypeNames_[pp.phase_] << nl << token::BEGIN_BLOCK << nl
+        << incrIndent;
+
+    forAll(pp.names_, cmptI)
+    {
+        os.writeKeyword(pp.names_[cmptI]) << pp.Y_[cmptI]
+            << token::END_STATEMENT << nl;
+    }
+
+    os  << decrIndent << token::END_BLOCK << nl;
+
+    os.check
+    (
+        "Foam::Ostream& Foam::operator<<"
+        "(Foam::Ostream&, const Foam::phaseProperties&)"
+    );
+
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudThermoTypes.H b/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.C
similarity index 53%
rename from src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudThermoTypes.H
rename to src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.C
index 2341e65aa0..9e5aeb69c3 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudThermoTypes.H
+++ b/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.C
@@ -22,44 +22,68 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Typedefs
-    Foam::cloudThermoTypes
-
-Description
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef ReactingCloudThermoTypes_H
-#define ReactingCloudThermoTypes_H
+#include "phasePropertiesList.H"
 
-#include "sutherlandTransport.H"
-#include "multiComponentMixture.H"
-#include "specie.H"
-#include "constTransport.H"
-#include "specieThermo.H"
-#include "hConstThermo.H"
-#include "janafThermo.H"
-#include "perfectGas.H"
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
+Foam::phasePropertiesList::phasePropertiesList
+(
+    Istream& is,
+    const PtrList<volScalarField>& YGas,
+    const wordList& liquidNames,
+    const wordList& solidNames
+)
+:
+    props_(is),
+    phaseTypeNames_()
 {
-//    typedef multiComponentMixture<constTransport<specieThermo<hConstThermo<perfectGas> > > > specieProperties;
-//    typedef hConstThermo<perfectGas> specieProperties;
+    forAll(props_, i)
+    {
+        props_[i].initialiseGlobalIds(YGas, liquidNames, solidNames);
+    }
 
-//    typedef sutherlandTransport<specieThermo<janafThermo<perfectGas> > >
-//        specieProperties;
-
-    typedef sutherlandTransport<specieThermo<janafThermo<perfectGas> > >
-        specieReactingProperties;
-
-    typedef constTransport<specieThermo<hConstThermo<perfectGas> > >
-        specieConstProperties;
+    phaseTypeNames_.setSize(props_.size());
+    forAll(phaseTypeNames_, i)
+    {
+        phaseTypeNames_[i] = props_[i].phaseTypeName();
+    }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#endif
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::phasePropertiesList::~phasePropertiesList()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+const Foam::List<Foam::phaseProperties>&
+Foam::phasePropertiesList::props() const
+{
+    return props_;
+}
+
+
+const Foam::wordList& Foam::phasePropertiesList::phaseTypes() const
+{
+    return phaseTypeNames_;
+}
+
+
+Foam::label Foam::phasePropertiesList::size() const
+{
+    return props_.size();
+}
+
+
+const Foam::phaseProperties&
+Foam::phasePropertiesList::operator[](const label phaseI) const
+{
+    return props_[phaseI];
+}
+
 
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.H b/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.H
new file mode 100644
index 0000000000..80e8f5c859
--- /dev/null
+++ b/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.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
+
+Class
+    Foam::phasePropertiesList
+
+Description
+    Simple container for a list of phase properties
+
+SourceFiles
+    phasePropertiesList.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef phasePropertiesList_H
+#define phasePropertiesList_H
+
+#include "Istream.H"
+#include "volFields.H"
+#include "wordList.H"
+#include "phaseProperties.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class phasePropertiesList Declaration
+\*---------------------------------------------------------------------------*/
+
+class phasePropertiesList
+{
+    // Private data
+
+        //- List of phase properties
+        List<phaseProperties> props_;
+
+        //- List of word representation of phase types
+        wordList phaseTypeNames_;
+
+
+public:
+
+    //- Constructor
+    phasePropertiesList
+    (
+        Istream& is,
+        const PtrList<volScalarField>& YGas,
+        const wordList& liquidNames,
+        const wordList& solidNames
+    );
+
+    //- Destructor
+    ~phasePropertiesList();
+
+
+    // Public member functions
+
+        //- Return the list of phase properties
+        const List<phaseProperties>& props() const;
+
+        //- Return the list of word representation of phase types
+        const wordList& phaseTypes() const;
+
+        //- Return the size (number of phases)
+        label size() const;
+
+
+    // Member operators
+
+        const phaseProperties& operator[](const label) const;
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
index 651b041538..5d1de160e8 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
@@ -46,7 +46,7 @@ Foam::CompositionModel<CloudType>::CompositionModel
         (
             owner.mesh().objectRegistry::lookupObject<dictionary>
             (
-                "thermophysicalProperties"
+                carrierThermo_.name()
             )
         )
     ),
@@ -56,9 +56,16 @@ Foam::CompositionModel<CloudType>::CompositionModel
         (
             owner.mesh().objectRegistry::lookupObject<dictionary>
             (
-                "thermophysicalProperties"
+                carrierThermo_.name()
             )
         )
+    ),
+    phaseProps_
+    (
+        coeffDict_.lookup("phases"),
+        carrierThermo_.composition().Y(),
+        liquids_().components(),
+        solids_().components()
     )
 {}
 
@@ -123,6 +130,240 @@ const Foam::solidMixture& Foam::CompositionModel<CloudType>::solids() const
 }
 
 
+template<class CloudType>
+const Foam::phasePropertiesList&
+Foam::CompositionModel<CloudType>::phaseProps() const
+{
+    return phaseProps_;
+}
+
+
+template<class CloudType>
+Foam::label Foam::CompositionModel<CloudType>::nPhase() const
+{
+    return phaseProps_.size();
+}
+
+
+template<class CloudType>
+const Foam::wordList&
+Foam::CompositionModel<CloudType>::phaseTypes() const
+{
+    // if only 1 phase, return the constituent component names
+    if (phaseProps_.size() == 1)
+    {
+        return phaseProps_[0].names();
+    }
+    else
+    {
+        return phaseProps_.phaseTypes();
+    }
+}
+
+
+template<class CloudType>
+const Foam::wordList&
+Foam::CompositionModel<CloudType>::componentNames(const label phaseI) const
+{
+    return phaseProps_[phaseI].names();
+}
+
+
+template<class CloudType>
+Foam::label Foam::CompositionModel<CloudType>::globalId
+(
+    const label phaseI,
+    const word& cmptName
+) const
+{
+    label id = phaseProps_[phaseI].globalId(cmptName);
+
+    if (id < 0)
+    {
+        FatalErrorIn
+        (
+            "Foam::label Foam::CompositionModel<CloudType>::globalId\n"
+            "(\n"
+            "    const label phaseI,\n"
+            "    const word& cmptName\n"
+            ") const"
+        )   << "Unable to determine global id for requested component "
+            << cmptName << nl << abort(FatalError);
+    }
+
+    return id;
+}
+
+
+template<class CloudType>
+const Foam::labelList& Foam::CompositionModel<CloudType>::globalIds
+(
+    const label phaseI
+) const
+{
+    return phaseProps_[phaseI].globalIds();
+}
+
+
+template<class CloudType>
+Foam::label Foam::CompositionModel<CloudType>::localId
+(
+    const label phaseI,
+    const word& cmptName
+) const
+{
+    label id = phaseProps_[phaseI].id(cmptName);
+
+    if (id < 0)
+    {
+        FatalErrorIn
+        (
+            "Foam::label Foam::CompositionModel<CloudType>::localId\n"
+            "(\n"
+            "    const label phaseI,\n"
+            "    const word& cmptName\n"
+            ") const"
+        )   << "Unable to determine local id for component " << cmptName
+            << nl << abort(FatalError);
+    }
+
+    return id;
+}
+
+
+template<class CloudType>
+const Foam::scalarField& Foam::CompositionModel<CloudType>::Y0
+(
+    const label phaseI
+) const
+{
+    return phaseProps_[phaseI].Y();
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::CompositionModel<CloudType>::H
+(
+    const label phaseI,
+    const scalarField& Y,
+    const scalar p,
+    const scalar T
+) const
+{
+    const phaseProperties& props = phaseProps_[phaseI];
+    scalar HMixture = 0.0;
+    switch (props.phase())
+    {
+        case phaseProperties::GAS:
+        {
+            forAll(Y, i)
+            {
+                label gid = props.globalIds()[i];
+                HMixture += Y[i]*this->gases()[gid].H(T);
+            }
+            break;
+        }
+        case phaseProperties::LIQUID:
+        {
+            forAll(Y, i)
+            {
+                label gid = props.globalIds()[i];
+                HMixture += Y[i]*this->liquids().properties()[gid].h(p, T);
+            }
+            break;
+        }
+        case phaseProperties::SOLID:
+        {
+            forAll(Y, i)
+            {
+                label gid = props.globalIds()[i];
+                HMixture +=
+                     Y[i]
+                    *(
+                        this->solids().properties()[gid].Hf()
+                      + this->solids().properties()[gid].cp()*T
+                     );
+            }
+            break;
+        }
+        default:
+        {
+            FatalErrorIn
+            (
+                "Foam::scalar Foam::CompositionModel<CloudType>::H\n"
+                "(\n"
+                "    const label phaseI,\n"
+                "    const scalarField& Y,"
+                "    const scalar p,\n"
+                "    const scalar T\n"
+                ") const"
+            )   << "Unknown phase enumeration" << nl << abort(FatalError);
+        }
+    }
+
+    return HMixture;
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::CompositionModel<CloudType>::cp
+(
+    const label phaseI,
+    const scalarField& Y,
+    const scalar p,
+    const scalar T
+) const
+{
+    const phaseProperties& props = phaseProps_[phaseI];
+    scalar cpMixture = 0.0;
+    switch (props.phase())
+    {
+        case phaseProperties::GAS:
+        {
+            forAll(Y, i)
+            {
+                label gid = props.globalIds()[i];
+                cpMixture += Y[i]*this->gases()[gid].Cp(T);
+            }
+            break;
+        }
+        case phaseProperties::LIQUID:
+        {
+            forAll(Y, i)
+            {
+                label gid = props.globalIds()[i];
+                cpMixture += Y[i]*this->liquids().properties()[gid].cp(p, T);
+            }
+            break;
+        }
+        case phaseProperties::SOLID:
+        {
+            forAll(Y, i)
+            {
+                label gid = props.globalIds()[i];
+                cpMixture += Y[i]*this->solids().properties()[gid].cp();
+            }
+            break;
+        }
+        default:
+        {
+            FatalErrorIn
+            (
+                "Foam::scalar Foam::CompositionModel<CloudType>::cp\n"
+                "(\n"
+                "    const label phaseI,\n"
+                "    const scalarField& Y,"
+                "    const scalar p,\n"
+                "    const scalar T\n"
+                ") const"
+            )   << "Unknown phase enumeration" << nl << abort(FatalError);
+        }
+    }
+
+    return cpMixture;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #include "NewCompositionModel.C"
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
index e5b5021fdf..9dd21529c8 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
@@ -25,7 +25,6 @@ License
 Class
     Foam::CompositionModel
 
-
 Description
     Templated reacting parcel composition model class
     Consists of gases (via thermo package), liquids and solids
@@ -49,6 +48,8 @@ SourceFiles
 #include "liquidMixture.H"
 #include "solidMixture.H"
 
+#include "phasePropertiesList.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -84,6 +85,9 @@ class CompositionModel
         //- Global solid properties data
         autoPtr<solidMixture> solids_;
 
+        //- List of phase properties
+        phasePropertiesList phaseProps_;
+
 
 public:
 
@@ -143,103 +147,85 @@ public:
             //- Return the carrier phase thermo package
             const hCombustionThermo& carrierThermo() const;
 
-            //- Return the gases
-            const PtrList<specieReactingProperties>& gases() const;
 
-            //- Return the global liquids
-            const liquidMixture& liquids() const;
+            // Composition lists
 
-            //- Return the global solids
-            const solidMixture& solids() const;
+                //- Return the gases
+                const PtrList<specieReactingProperties>& gases() const;
 
-            //- Return the list of composition names
-            virtual const wordList compositionNames() const = 0;
+                //- Return the global liquids
+                const liquidMixture& liquids() const;
 
-            //- Return the list of gas names
-            virtual const wordList& gasNames() const = 0;
+                //- Return the global solids
+                const solidMixture& solids() const;
 
-            //- Return local id of gas based on gasName
-            virtual label gasLocalId(const word& gasName) const = 0;
+                //- Return the list of phase properties
+                const phasePropertiesList& phaseProps() const;
 
-            //- Return global id of gas based on gasName
-            virtual label gasGlobalId(const word& gasName) const = 0;
+                //- Return the number of phases
+                label nPhase() const;
 
-            //- Return the list indices of gases in global thermo list
-            virtual const labelList& gasGlobalIds() const = 0;
 
-            //- Return the list of gas mass fractions
-            virtual const scalarField& YGas0() const = 0;
+            // Phase properties
 
-            //- Return the list of liquid names
-            virtual const wordList& liquidNames() const = 0;
+                //- Return the list of phase type names
+                //  If only 1 phase, return the component names of that phase
+                const wordList& phaseTypes() const;
 
-            //- Return local id of liquid based on liquidName
-            virtual label liquidLocalId(const word& liquidName) const = 0;
+                //- Return the list of component names for phaseI
+                const wordList& componentNames(const label phaseI) const;
 
-            //- Return global id of liquid based on liquidName
-            virtual label liquidGlobalId(const word& liquidName) const = 0;
+                //- Return global id of component cmptName in phase phaseI
+                label globalId(const label phaseI, const word& cmptName) const;
 
-            //- Return the list indices of liquid in global thermo list
-            virtual const labelList& liquidGlobalIds() const = 0;
+                //- Return global ids of for phase phaseI
+                const labelList& globalIds(const label phaseI) const;
 
-            //- Return the list of liquid mass fractions
-            virtual const scalarField& YLiquid0() const = 0;
+                //- Return local id of component cmptName in phase phaseI
+                label localId(const label phaseI, const word& cmptName) const;
 
-            //- Return the list of solid names
-            virtual const wordList& solidNames() const = 0;
+                //- Return the list of phase phaseI mass fractions
+                const scalarField& Y0(const label phaseI) const;
 
-            //- Return local id of solid based on solidName
-            virtual label solidLocalId(const word& solidName) const = 0;
 
-            //- Return global id of solid based on solidName
-            virtual label solidGlobalId(const word& solidName) const = 0;
+            // Mixture properties
 
-            //- Return the list indices of solids in global thermo list
-            virtual const labelList& solidGlobalIds() const = 0;
+                //- Return the list of mixture mass fractions
+                //  If only 1 phase, return component fractions of that phase
+                virtual const scalarField& YMixture0() const = 0;
 
-            //- Return the list of solid mass fractions
-            virtual const scalarField& YSolid0() const = 0;
+                // Indices of gas, liquid and solid phases in phase properties
+                // list - returns -1 if not applicable
 
-            //- Return the list of mixture mass fractions
-            virtual const scalarField& YMixture0() const = 0;
+                    //- Gas id
+                    virtual label idGas() const = 0;
 
-            //- Return the gas constant for the gas mixture
-            virtual scalar RGas(const scalarField& YGas) const = 0;
+                    //- Liquid id
+                    virtual label idLiquid() const = 0;
 
-            //- Return enthalpy for the gas mixture [energy per unit mass]
-            virtual scalar HGas
+                    //- Solid id
+                    virtual label idSolid() const = 0;
+
+
+        // Evaluation
+
+            //- Return enthalpy for the phase phaseI
+            virtual scalar H
             (
-                 const scalarField& YGas,
-                 const scalar T
-            ) const = 0;
-
-            //- Return enthalpy for the solid mixture [energy per unit mass]
-            virtual scalar HSolid
-            (
-                const scalarField& YSolid,
-                const scalar T
-            ) const = 0;
-
-            //- Return specific heat caparcity for the gas mixture
-            virtual scalar cpGas
-            (
-                 const scalarField& YGas,
-                 const scalar T
-            ) const = 0;
-
-            //- Return specific heat caparcity for the liquid mixture
-            virtual scalar cpLiquid
-            (
-                const scalarField& YLiquid,
+                const label phaseI,
+                const scalarField& Y,
                 const scalar p,
                 const scalar T
-            ) const = 0;
+            ) const;
 
-            //- Return specific heat caparcity for the solid mixture
-            virtual scalar cpSolid
+            //- Return cp for the phase phaseI
+            virtual scalar cp
             (
-                const scalarField& YSolid
-            ) const = 0;
+                const label phaseI,
+                const scalarField& Y,
+                const scalar p,
+                const scalar T
+            ) const;
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C
index 7fd051cd73..707c158cc6 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C
@@ -36,34 +36,32 @@ Foam::CompositionModel<CloudType>::New
     CloudType& owner
 )
 {
-    word ReactingCompositionModelType
-    (
-        dict.lookup("CompositionModel")
-    );
+    word CompositionModelType(dict.lookup("CompositionModel"));
 
-    Info<< "Selecting CompositionModel "
-        << ReactingCompositionModelType << endl;
+    Info<< "Selecting CompositionModel " << CompositionModelType << endl;
 
     typename dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(ReactingCompositionModelType);
+        dictionaryConstructorTablePtr_->find(CompositionModelType);
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorIn
         (
-            "CompositionModel<CloudType>::New"
-            "(const dictionary&, CloudType&)"
+            "CompositionModel<CloudType>::New\n"
+            "(\n"
+            "    const dictionary&,\n"
+            "    CloudType&\n"
+            ")"
         )
-            << "Unknown ReactingCompositionModelType type "
-            << ReactingCompositionModelType
+            << "Unknown CompositionModelType type "
+            << CompositionModelType
             << ", constructor not in hash table" << nl << nl
             << "    Valid CompositionModel types are :" << nl
-            << dictionaryConstructorTablePtr_->toc()
+            << dictionaryConstructorTablePtr_->toc() << nl
             << exit(FatalError);
     }
 
-    return autoPtr<CompositionModel<CloudType> >
-        (cstrIter()(dict, owner));
+    return autoPtr<CompositionModel<CloudType> >(cstrIter()(dict, owner));
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C
index afbaef7395..9f5eed2c7c 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C
@@ -26,6 +26,62 @@ License
 
 #include "SingleMixtureFraction.H"
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class CloudType>
+void Foam::SingleMixtureFraction<CloudType>::constructIds()
+{
+    forAll(this->phaseProps(), phaseI)
+    {
+        switch (this->phaseProps()[phaseI].phase())
+        {
+            case phaseProperties::GAS:
+            {
+                idGas_ = phaseI;
+                break;
+            }
+            case phaseProperties::LIQUID:
+            {
+                idLiquid_ = phaseI;
+                break;
+            }
+            case phaseProperties::SOLID:
+            {
+                idSolid_ = phaseI;
+                break;
+            }
+            default:
+            {
+                FatalErrorIn
+                (
+                    "void Foam::SingleMixtureFraction<CloudType>::"
+                    "constructIds()"
+                )   << "Unknown phase enumeration" << nl << abort(FatalError);
+            }
+        }
+    }
+
+    if (idGas_ < 0)
+    {
+        FatalErrorIn("Foam::SingleMixtureFraction<CloudType>::constructIds()")
+            << "No gas phase found in phase list:" << nl
+            << this->phaseTypes() << nl << endl;
+    }
+    if (idLiquid_ < 0)
+    {
+        FatalErrorIn("Foam::SingleMixtureFraction<CloudType>::constructIds()")
+            << "No liquid phase found in phase list:" << nl
+            << this->phaseTypes() << nl << endl;
+    }
+    if (idSolid_ < 0)
+    {
+        FatalErrorIn("Foam::SingleMixtureFraction<CloudType>::constructIds()")
+            << "No solid phase found in phase list:" << nl
+            << this->phaseTypes() << nl << endl;
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class CloudType>
@@ -37,181 +93,45 @@ Foam::SingleMixtureFraction<CloudType>::SingleMixtureFraction
 :
     CompositionModel<CloudType>(dict, owner, typeName),
 
-    gasNames_(this->coeffDict().lookup("gasNames")),
-    gasGlobalIds_(gasNames_.size(), -1),
-    YGas0_(this->coeffDict().lookup("YGas0")),
-    YGasTot0_(readScalar(this->coeffDict().lookup("YGasTot0"))),
-
-    liquidNames_(this->coeffDict().lookup("liquidNames")),
-    liquidGlobalIds_(liquidNames_.size(), -1),
-    YLiquid0_(this->coeffDict().lookup("YLiquid0")),
-    YLiquidTot0_(readScalar(this->coeffDict().lookup("YLiquidTot0"))),
-
-    solidNames_(this->coeffDict().lookup("solidNames")),
-    solidGlobalIds_(solidNames_.size(), -1),
-    YSolid0_(this->coeffDict().lookup("YSolid0")),
-    YSolidTot0_(readScalar(this->coeffDict().lookup("YSolidTot0"))),
+    idGas_(-1),
+    idLiquid_(-1),
+    idSolid_(-1),
 
     YMixture0_(3)
 {
-    // Construct gasGlobalIds_ list
-    forAll(gasNames_, i)
-    {
-        forAll (this->carrierThermo().composition().Y(), j)
-        {
-            word specieName(this->carrierThermo().composition().Y()[j].name());
+    constructIds();
 
-            if (specieName == gasNames_[i])
-            {
-                gasGlobalIds_[i] = j;
-                break;
-            }
-        }
-        if (gasGlobalIds_[i] == -1)
-        {
-            Info<< "\nThermo package species composition comprises:" << endl;
-            forAll (this->carrierThermo().composition().Y(), k)
-            {
-                Info<< this->carrierThermo().composition().Y()[k].name()
-                    << endl;
-            }
-
-            FatalErrorIn
-            (
-                "Foam::SingleMixtureFraction<CloudType>::SingleMixtureFraction"
-                "(const dictionary&, CloudType&)"
-            )   << "Could not find gas species " << gasNames_[i]
-                << " in species list" <<  exit(FatalError);
-        }
-    }
-
-    // Construct liquidGlobalIds_ list
-    forAll(liquidNames_, i)
-    {
-        forAll (this->liquids().components(), j)
-        {
-            word specieName(this->liquids().components()[j]);
-
-            if (specieName == liquidNames_[i])
-            {
-                liquidGlobalIds_[i] = j;
-                break;
-            }
-        }
-        if (liquidGlobalIds_[i] == -1)
-        {
-            Info<< "\nLiquid mixture species composition comprises:" << endl;
-            forAll (this->liquids().components(), k)
-            {
-                Info<< this->liquids().components()[k] << endl;
-            }
-
-            FatalErrorIn
-            (
-                "Foam::SingleMixtureFraction<CloudType>::SingleMixtureFraction"
-                "(const dictionary&, CloudType&)"
-            )   << "Could not find liquid species " << liquidNames_[i]
-                << " in species list" <<  exit(FatalError);
-        }
-    }
-
-    // Construct solidGlobalIds_ list
-    forAll(solidNames_, i)
-    {
-        forAll (this->solids().components(), j)
-        {
-            word specieName(this->solids().components()[j]);
-
-            if (specieName == solidNames_[i])
-            {
-                solidGlobalIds_[i] = j;
-                break;
-            }
-        }
-        if (solidGlobalIds_[i] == -1)
-        {
-            Info<< "\nSolid mixture species composition comprises:" << endl;
-            forAll (this->solids().components(), k)
-            {
-                Info<< this->solids().components()[k] << endl;
-            }
-
-            FatalErrorIn
-            (
-                "Foam::SingleMixtureFraction<CloudType>::SingleMixtureFraction"
-                "(const dictionary&, CloudType&)"
-            )   << "Could not find solid species " << solidNames_[i]
-                << " in species list" <<  exit(FatalError);
-        }
-    }
-
-    // Set mixture fractions
-    YMixture0_[0] = YGasTot0_;
-    YMixture0_[1] = YLiquidTot0_;
-    YMixture0_[2] = YSolidTot0_;
-
-    // Check that total mass fractions = 1
-
-    if (YGas0_.size())
-    {
-        if (mag(sum(YGas0_) - 1) > SMALL)
-        {
-            FatalErrorIn
-            (
-                "Foam::SingleMixtureFraction<CloudType>::SingleMixtureFraction"
-                "(const dictionary&, CloudType&)"
-            )<< "Mass fractions of YGas0 must sum to unity"
-             <<  exit(FatalError);
-        }
-    }
-    else
-    {
-        YMixture0_[0] = 0.0;
-    }
-
-    if (YLiquid0_.size())
-    {
-        if (mag(sum(YLiquid0_) - 1) > SMALL)
-        {
-            FatalErrorIn
-            (
-                "Foam::SingleMixtureFraction<CloudType>::SingleMixtureFraction"
-                "(const dictionary&, CloudType&)"
-            )<< "Mass fractions of YLiquid0 must sum to unity"
-             <<  exit(FatalError);
-        }
-    }
-    else
-    {
-        YMixture0_[1] = 0.0;
-    }
-
-    if (YSolid0_.size())
-    {
-        if (mag(sum(YSolid0_) - 1) > SMALL)
-        {
-            FatalErrorIn
-            (
-                "Foam::SingleMixtureFraction<CloudType>::SingleMixtureFraction"
-                "(const dictionary&, CloudType&)"
-            )<< "Mass fractions of YSolid0 must sum to unity"
-             <<  exit(FatalError);
-        }
-    }
-    else
-    {
-        YMixture0_[2] = 0.0;
-    }
-
-    // Check total mixture fraction sums to 1
-    if (mag(sum(YMixture0_) - 1) > SMALL)
+    if (this->phaseProps().size() != 3)
     {
         FatalErrorIn
         (
-            "Foam::SingleMixtureFraction<CloudType>::SingleMixtureFraction"
-            "(const dictionary&, CloudType&)"
-        )   << "Mass fractions YGasTot0 + YSolidTot0 + YSolidTot0 must sum "
-            << "to unity" <<  exit(FatalError);
+            "Foam::SingleMixtureFraction<CloudType>::"
+            "SingleMixtureFraction\n"
+            "(\n"
+            "    const dictionary&,\n"
+            "    CloudType&\n"
+            ")\n"
+        )   << "Incorrect numebr of phases: " << nl
+            << "    Please specify 1 gas, 1 liquid and 1 solid" << nl
+            << exit(FatalError);
+    }
+
+    this->coeffDict().lookup("YGasTot0") >> YMixture0_[idGas_];
+    this->coeffDict().lookup("YLiquidTot0") >> YMixture0_[idLiquid_];
+    this->coeffDict().lookup("YSolidTot0") >> YMixture0_[idSolid_];
+
+    if (mag(sum(YMixture0_) - 1.0) > SMALL)
+    {
+        FatalErrorIn
+        (
+            "Foam::SingleMixtureFraction<CloudType>::"
+            "SingleMixtureFraction\n"
+            "(\n"
+            "    const dictionary&,\n"
+            "    CloudType&\n"
+            ")\n"
+        )   << "Sum of phases should be 1. Phase fractions:" << nl
+            << YMixture0_ << nl << exit(FatalError);
     }
 }
 
@@ -225,157 +145,11 @@ Foam::SingleMixtureFraction<CloudType>::~SingleMixtureFraction()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class CloudType>
-const Foam::wordList
-Foam::SingleMixtureFraction<CloudType>::compositionNames() const
-{
-    wordList names(3);
-    names[0] = "Gas";
-    names[1] = "Liquid";
-    names[2] = "Solid";
-    return names;
-}
-
-template<class CloudType>
-const Foam::wordList&
-Foam::SingleMixtureFraction<CloudType>::gasNames() const
-{
-     return gasNames_;
-}
-
-
-template<class CloudType>
-Foam::label
-Foam::SingleMixtureFraction<CloudType>::gasLocalId(const word& gasName) const
-{
-    forAll(gasNames_, i)
-    {
-        if (gasName == gasNames_[i])
-        {
-            return i;
-        }
-    }
-
-    WarningIn
-    (
-        "Foam::label SingleMixtureFraction<CloudType>::"
-        "gasLocalId(const word& gasName) const"
-    )<< "Gas name " << gasName << " not found in gasNames_"
-     << endl;
-
-    return -1;
-}
-
-
-template<class CloudType>
-Foam::label
-Foam::SingleMixtureFraction<CloudType>::gasGlobalId(const word& gasName) const
-{
-    forAll(gasNames_, i)
-    {
-        if (gasName == gasNames_[i])
-        {
-            return gasGlobalIds_[i];
-        }
-    }
-
-    WarningIn
-    (
-        "Foam::label SingleMixtureFraction<CloudType>::"
-        "gasGlobalId(const word& gasName) const"
-    )<< "Gas name " << gasName << " not found in gasNames_"
-     << endl;
-
-    return -1;
-}
-
-
-template<class CloudType>
-const Foam::labelList&
-Foam::SingleMixtureFraction<CloudType>::gasGlobalIds() const
-{
-    return gasGlobalIds_;
-}
-
-
 template<class CloudType>
 const Foam::scalarField&
 Foam::SingleMixtureFraction<CloudType>::YGas0() const
 {
-    return YGas0_;
-}
-
-
-template<class CloudType>
-Foam::scalar Foam::SingleMixtureFraction<CloudType>::YGasTot0() const
-{
-    return YGasTot0_;
-}
-
-
-template<class CloudType>
-const Foam::wordList&
-Foam::SingleMixtureFraction<CloudType>::liquidNames() const
-{
-     return liquidNames_;
-}
-
-
-template<class CloudType>
-Foam::label Foam::SingleMixtureFraction<CloudType>::liquidLocalId
-(
-    const word& liquidName
-) const
-{
-    forAll(liquidNames_, i)
-    {
-        if (liquidName == liquidNames_[i])
-        {
-            return i;
-        }
-    }
-
-    WarningIn
-    (
-        "Foam::label SingleMixtureFraction<CloudType>::"
-        "liquidLocalId(const word& liquidName) const"
-    )<< "Liquid name " << liquidName << " not found in liquidNames_"
-     << endl;
-
-    return -1;
-}
-
-
-template<class CloudType>
-Foam::label Foam::SingleMixtureFraction<CloudType>::liquidGlobalId
-(
-    const word& liquidName
-) const
-{
-    forAll(liquidNames_, i)
-    {
-        if (liquidName == liquidNames_[i])
-        {
-            return liquidGlobalIds_[i];
-        }
-    }
-
-    WarningIn
-    (
-        "Foam::label SingleMixtureFraction<CloudType>::"
-        "liquidGlobalId(const word& liquidName) const"
-    )<< "Liquid name " << liquidName << " not found in liquidNames_"
-     << endl;
-
-    return -1;
-}
-
-
-template<class CloudType>
-const Foam::labelList&
-Foam::SingleMixtureFraction<CloudType>::liquidGlobalIds() const
-{
-    return liquidGlobalIds_;
+    return this->phaseProps()[idGas_].Y();
 }
 
 
@@ -383,81 +157,7 @@ template<class CloudType>
 const Foam::scalarField&
 Foam::SingleMixtureFraction<CloudType>::YLiquid0() const
 {
-    return YLiquid0_;
-}
-
-
-template<class CloudType>
-Foam::scalar Foam::SingleMixtureFraction<CloudType>::YLiquidTot0() const
-{
-    return YLiquidTot0_;
-}
-
-
-template<class CloudType>
-const Foam::wordList&
-Foam::SingleMixtureFraction<CloudType>::solidNames() const
-{
-    return solidNames_;
-}
-
-
-template<class CloudType>
-Foam::label Foam::SingleMixtureFraction<CloudType>::solidLocalId
-(
-    const word& solidName
-) const
-{
-    forAll(solidNames_, i)
-    {
-        if (solidName == solidNames_[i])
-        {
-            return i;
-        }
-    }
-
-    WarningIn
-    (
-        "Foam::label SingleMixtureFraction<CloudType>::"
-        "SolididLocalId(const word& solidName) const"
-    )<< "Solid name " << solidName << " not found in solidNames_"
-     << endl;
-
-    return -1;
-}
-
-
-template<class CloudType>
-Foam::label
-Foam::SingleMixtureFraction<CloudType>::solidGlobalId
-(
-    const word& solidName
-) const
-{
-    forAll(solidNames_, i)
-    {
-        if (solidName == solidNames_[i])
-        {
-            return solidGlobalIds_[i];
-        }
-    }
-
-    WarningIn
-    (
-        "Foam::label SingleMixtureFraction<CloudType>::"
-        "solidGlobalId(const word& solidName) const"
-    )<< "Solid name " << solidName << " not found in solidNames_"
-     << endl;
-
-    return -1;
-}
-
-
-template<class CloudType>
-const Foam::labelList&
-Foam::SingleMixtureFraction<CloudType>::solidGlobalIds() const
-{
-    return solidGlobalIds_;
+    return this->phaseProps()[idLiquid_].Y();
 }
 
 
@@ -465,15 +165,7 @@ template<class CloudType>
 const Foam::scalarField&
 Foam::SingleMixtureFraction<CloudType>::YSolid0() const
 {
-    return YSolid0_;
-}
-
-
-template<class CloudType>
-Foam::scalar
-Foam::SingleMixtureFraction<CloudType>::YSolidTot0() const
-{
-    return YSolidTot0_;
+    return this->phaseProps()[idSolid_].Y();
 }
 
 
@@ -486,115 +178,23 @@ Foam::SingleMixtureFraction<CloudType>::YMixture0() const
 
 
 template<class CloudType>
-Foam::scalar Foam::SingleMixtureFraction<CloudType>::RGas
-(
-    const scalarField& YGas
-) const
+Foam::label Foam::SingleMixtureFraction<CloudType>::idGas() const
 {
-    scalar RGasMixture = 0.0;
-    forAll(YGas, i)
-    {
-        label id = gasGlobalIds_[i];
-        RGasMixture += YGas[i]*this->gases()[id].R();
-    }
-    return RGasMixture;
+    return idGas_;
 }
 
 
 template<class CloudType>
-Foam::scalar Foam::SingleMixtureFraction<CloudType>::HGas
-(
-    const scalarField& YGas,
-    const scalar T
-)
-const
+Foam::label Foam::SingleMixtureFraction<CloudType>::idLiquid() const
 {
-    scalar HMixture = 0.0;
-    forAll(YGas, i)
-    {
-        label id = gasGlobalIds_[i];
-        HMixture += YGas[i]*this->gases()[id].H(T);
-    }
-    return HMixture;
+    return idLiquid_;
 }
 
 
 template<class CloudType>
-Foam::scalar Foam::SingleMixtureFraction<CloudType>::HSolid
-(
-    const scalarField& YSolid,
-    const scalar T
-)
-const
+Foam::label Foam::SingleMixtureFraction<CloudType>::idSolid() const
 {
-    scalar HMixture = 0.0;
-    forAll(YSolid, i)
-    {
-        label id = solidGlobalIds_[i];
-        HMixture +=
-            YSolid[i]
-           *(
-                this->solids().properties()[id].Hf()
-              + this->solids().properties()[id].cp()*T
-            );
-    }
-    return HMixture;
-}
-
-
-template<class CloudType>
-Foam::scalar Foam::SingleMixtureFraction<CloudType>::cpGas
-(
-    const scalarField& YGas,
-    const scalar T
-)
-const
-{
-    scalar cpMixture = 0.0;
-    forAll(YGas, i)
-    {
-        label id = gasGlobalIds_[i];
-        cpMixture += YGas[i]*this->gases()[id].Cp(T);
-    }
-    return cpMixture;
-}
-
-
-template<class CloudType>
-Foam::scalar Foam::SingleMixtureFraction<CloudType>::cpLiquid
-(
-    const scalarField& YLiquid,
-    const scalar p,
-    const scalar T
-)
-const
-{
-    scalar cpMixture = 0.0;
-    forAll(YLiquid, i)
-    {
-        label id = liquidGlobalIds_[i];
-        cpMixture += YLiquid[i]*this->liquids().properties()[id].cp(p, T);
-    }
-
-    return cpMixture;
-}
-
-
-template<class CloudType>
-Foam::scalar Foam::SingleMixtureFraction<CloudType>::cpSolid
-(
-    const scalarField& YSolid
-)
-const
-{
-    scalar cpMixture = 0.0;
-    forAll(YSolid, i)
-    {
-        label id = solidGlobalIds_[i];
-        cpMixture += YSolid[i]*this->solids().properties()[id].cp();
-    }
-
-    return cpMixture;
+    return idSolid_;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H
index 57d3535881..c2b7198a25 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H
@@ -25,10 +25,8 @@ License
 Class
     Foam::SingleMixtureFraction
 
-
 Description
-    Templated parcel single mixture fraction class
-    - Each phase sums to a mass fraction of 1
+    Templated parcel multi-phase, multi-component class
 
 SourceFiles
     SingleMixtureFraction.C
@@ -56,67 +54,31 @@ class SingleMixtureFraction
 {
     // Private data
 
-        //- Parcel properties
+        // Indices of the phases
 
-            //- List of gas names
-            const wordList gasNames_;
+            //- Gas
+            label idGas_;
 
-            //- Return local id of gas based on gasName
-            label gasLocalId(const word& gasName) const;
+            //- Liquid
+            label idLiquid_;
 
-            //- Return global id of gas based on gasName
-            label gasGlobalId(const word& gasName) const;
+            //- Solid
+            label idSolid_;
 
-            //- List of IDs of gases in global list
-            labelList gasGlobalIds_;
 
-            //- Initial mass fractions of gases
-            const scalarField YGas0_;
+       // Mixture properties
 
-            //- Initial total mass fractions of gases
-            const scalar YGasTot0_;
-
-            //- List of liquid names
-            const wordList liquidNames_;
-
-            //- Return local id of liquid based on liquidName
-            label liquidLocalId(const word& liquidName) const;
-
-            //- Return global id of liquid based on liquidName
-            label liquidGlobalId(const word& liquidName) const;
-
-            //- List of IDs of liquids in global list
-            labelList liquidGlobalIds_;
-
-            //- Initial mass fractions of liquids
-            const scalarField YLiquid0_;
-
-            //- Initial total mass fractions of liquids
-            const scalar YLiquidTot0_;
-
-            //- List of solids species
-            const wordList solidNames_;
-
-            //- Return local id of solid based on solidName
-            label solidLocalId(const word& solidName) const;
-
-            //- Return global id of solid based on solidName
-            label solidGlobalId(const word& solidName) const;
-
-            //- List of IDs of solids in global list
-            labelList solidGlobalIds_;
-
-            //- Initial mass fractions of solids
-            const scalarField YSolid0_;
-
-            //- Initial total mass fractions of solids
-            const scalar YSolidTot0_;
-
-            //- Initial total mass fractions of the mixture
-            //  Index 0 = gas, 1 = liquid, 2 = solid
+            //- Phase component total fractions
             scalarField YMixture0_;
 
 
+    // Private member functions
+
+        //- Construct the indices and check correct specification of
+        //  1 gas, 1 liquid and 1 solid
+        void constructIds();
+
+
 public:
 
     //- Runtime type information
@@ -126,11 +88,7 @@ public:
     // Constructors
 
         //- Construct from dictionary
-        SingleMixtureFraction
-        (
-            const dictionary& dict,
-            CloudType& owner
-        );
+        SingleMixtureFraction(const dictionary& dict, CloudType& owner);
 
 
     //- Destructor
@@ -141,70 +99,49 @@ public:
 
         // Access
 
-            //- Return the list of composition names
-            const wordList compositionNames() const;
+            // Gas properties
 
-            //- Return the list of gas names
-            const wordList& gasNames() const;
+                //- Return the list of gas mass fractions
+                const scalarField& YGas0() const;
 
-            //- Return the list indices of gases in global thermo list
-            const labelList& gasGlobalIds() const;
+                //- Return the total gas mass fraction
+                scalar YGasTot0() const;
 
-            //- Return the list of gas mass fractions
-            const scalarField& YGas0() const;
 
-            //- Return the total gas mass fraction
-            scalar YGasTot0() const;
+            // Liquid properties
 
-            //- Return the list of liquid names
-            const wordList& liquidNames() const;
+                //- Return the list of liquid mass fractions
+                const scalarField& YLiquid0() const;
 
-            //- Return the list indices of liquid in global thermo list
-            const labelList& liquidGlobalIds() const;
+                //- Return the total liquid mass fraction
+                scalar YLiquidTot0() const;
 
-            //- Return the list of liquid mass fractions
-            const scalarField& YLiquid0() const;
 
-            //- Return the total liquid mass fraction
-            scalar YLiquidTot0() const;
+            // Solid properties
 
-             //- Return the list of solid names
-            const wordList& solidNames() const;
+                //- Return the list of solid mass fractions
+                const scalarField& YSolid0() const;
 
-            //- Return the list indices of solids in global thermo list
-            const labelList& solidGlobalIds() const;
+                //- Return the total solid mass fraction
+                scalar YSolidTot0() const;
 
-            //- Return the list of solid mass fractions
-            const scalarField& YSolid0() const;
 
-            //- Return the total solid mass fraction
-            scalar YSolidTot0() const;
+            // Mixture properties
 
-            //- Return the list of mixture mass fractions
-            const scalarField& YMixture0() const;
+                //- Return the list of mixture mass fractions
+                virtual const scalarField& YMixture0() const;
 
-            //- Return the gas constant for the gas mixture
-            scalar RGas(const scalarField& YGas) const;
+                // Indices of gas, liquid and solid phases in phase properties
+                // list
 
-            //- Return enthalpy for the gas mixture [energy per unit mass]
-            scalar HGas(const scalarField& YGas, const scalar T) const;
+                    //- Gas id
+                    virtual label idGas() const;
 
-            //- Return enthalpy for the solid mixture [energy per unit mass]
-            scalar HSolid(const scalarField& YSolid, const scalar T) const;
+                    //- Liquid id
+                    virtual label idLiquid() const;
 
-            //- Return specific heat caparcity for the gas mixture
-            scalar cpGas(const scalarField& YGas, const scalar T) const;
-
-            //- Return specific heat caparcity for the liquid mixture
-            scalar cpLiquid
-            (
-                const scalarField& YLiquid,
-                const scalar p,
-                const scalar T
-            ) const;
-
-            //- Return specific heat caparcity for the solid mixture
-            scalar cpSolid(const scalarField& YSolid) const;
+                    //- Solid id
+                    virtual label idSolid() const;
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.C
new file mode 100644
index 0000000000..bed2f1f94b
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.C
@@ -0,0 +1,166 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "SinglePhaseMixture.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class CloudType>
+void Foam::SinglePhaseMixture<CloudType>::constructIds()
+{
+    if (this->phaseProps().size() != 1)
+    {
+        FatalErrorIn
+        (
+            "void Foam::SinglePhaseMixture<CloudType>::constructIds()"
+        )   << "Only one phase permitted" << nl << exit(FatalError);
+    }
+
+    switch (this->phaseProps()[0].phase())
+    {
+        case phaseProperties::GAS:
+        {
+            idGas_ = 0;
+            break;
+        }
+        case phaseProperties::LIQUID:
+        {
+            idLiquid_ = 0;
+            break;
+        }
+        case phaseProperties::SOLID:
+        {
+            idSolid_ = 0;
+            break;
+        }
+        default:
+        {
+            FatalErrorIn
+            (
+                "void Foam::SinglePhaseMixture<CloudType>::constructIds()"
+            )   << "Unknown phase enumeration" << nl << abort(FatalError);
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::SinglePhaseMixture<CloudType>::SinglePhaseMixture
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+:
+    CompositionModel<CloudType>(dict, owner, typeName),
+    idGas_(-1),
+    idLiquid_(-1),
+    idSolid_(-1)
+{
+    constructIds();
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::SinglePhaseMixture<CloudType>::~SinglePhaseMixture()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+const Foam::scalarField&
+Foam::SinglePhaseMixture<CloudType>::YGas0() const
+{
+    notImplemented
+    (
+        "const Foam::scalarField& "
+        "Foam::SinglePhaseMixture<CloudType>::YGas0() const"
+    );
+    return this->phaseProps()[0].Y();
+}
+
+
+template<class CloudType>
+const Foam::scalarField&
+Foam::SinglePhaseMixture<CloudType>::YLiquid0() const
+{
+    notImplemented
+    (
+        "const Foam::scalarField& "
+        "Foam::SinglePhaseMixture<CloudType>::YLiquid0() const"
+    );
+    return this->phaseProps()[0].Y();
+}
+
+
+template<class CloudType>
+const Foam::scalarField&
+Foam::SinglePhaseMixture<CloudType>::YSolid0() const
+{
+    notImplemented
+    (
+        "const Foam::scalarField& "
+        "Foam::SinglePhaseMixture<CloudType>::YSolid0() const"
+    );
+    return this->phaseProps()[0].Y();
+}
+
+
+template<class CloudType>
+const Foam::scalarField&
+Foam::SinglePhaseMixture<CloudType>::YMixture0() const
+{
+    return this->phaseProps()[0].Y();
+}
+
+
+template<class CloudType>
+Foam::label Foam::SinglePhaseMixture<CloudType>::idGas() const
+{
+    return idGas_;
+}
+
+
+template<class CloudType>
+Foam::label Foam::SinglePhaseMixture<CloudType>::idLiquid() const
+{
+    return idLiquid_;
+}
+
+
+template<class CloudType>
+Foam::label Foam::SinglePhaseMixture<CloudType>::idSolid() const
+{
+    return idSolid_;
+}
+
+
+// ************************************************************************* //
+
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H
new file mode 100644
index 0000000000..91a727587d
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H
@@ -0,0 +1,156 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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::SinglePhaseMixture
+
+Description
+    Templated parcel single phase, multi-component class
+
+SourceFiles
+    SinglePhaseMixture.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef SinglePhaseMixture_H
+#define SinglePhaseMixture_H
+
+#include "CompositionModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                      Class SinglePhaseMixture Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class SinglePhaseMixture
+:
+    public CompositionModel<CloudType>
+{
+    // Private data
+
+        // Indices of the phases - only 1 will be set
+
+            //- Gas
+            label idGas_;
+
+            //- Liquid
+            label idLiquid_;
+
+            //- Solid
+            label idSolid_;
+
+
+    // Private member functions
+
+        //- Construct the indices and check correct specification of
+        //  1 gas or 1 liquid or 1 solid
+        void constructIds();
+
+
+public:
+
+    //- Runtime type information
+    TypeName("SinglePhaseMixture");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        SinglePhaseMixture(const dictionary& dict, CloudType& owner);
+
+
+    //- Destructor
+    virtual ~SinglePhaseMixture();
+
+
+    // Member Functions
+
+        // Access
+
+            // Gas properties
+
+                //- Return the list of gas mass fractions
+                const scalarField& YGas0() const;
+
+                //- Return the total gas mass fraction
+                scalar YGasTot0() const;
+
+
+            // Liquid properties
+
+                //- Return the list of liquid mass fractions
+                const scalarField& YLiquid0() const;
+
+                //- Return the total liquid mass fraction
+                scalar YLiquidTot0() const;
+
+
+            // Solid properties
+
+                //- Return the list of solid mass fractions
+                const scalarField& YSolid0() const;
+
+                //- Return the total solid mass fraction
+                scalar YSolidTot0() const;
+
+
+            // Mixture properties
+
+                //- Return the list of mixture mass fractions
+                virtual const scalarField& YMixture0() const;
+
+                // Indices of gas, liquid and solid phases in phase properties
+                // list
+
+                    //- Gas id
+                    virtual label idGas() const;
+
+                    //- Liquid id
+                    virtual label idLiquid() const;
+
+                    //- Solid id
+                    virtual label idSolid() const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "SinglePhaseMixture.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
index 33b328f212..791512789c 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
@@ -58,8 +58,14 @@ bool Foam::NoPhaseChange<CloudType>::active() const
 template<class CloudType>
 Foam::scalar Foam::NoPhaseChange<CloudType>::calculate
 (
+    const scalar,
     const scalar,
     const scalarField&,
+    const scalarField&,
+    const vector,
+    const scalar,
+    const scalar,
+    const scalar,
     const scalar
 ) const
 {
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
index 7f4359925f..07341719db 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
@@ -26,7 +26,7 @@ Class
     Foam::NoPhaseChange
 
 Description
-    Dummy devolatilisation model for 'no phase change'
+    Dummy phase change model for 'no phase change'
 
 \*---------------------------------------------------------------------------*/
 
@@ -76,9 +76,15 @@ public:
         //- Update model
         scalar calculate
         (
-            const scalar,
-            const scalarField&,
-            const scalar
+            const scalar T,
+            const scalar d,
+            const scalarField& Xc,
+            const scalarField& dMassMT,
+            const vector Ur,
+            const scalar Tc,
+            const scalar pc,
+            const scalar nuc,
+            const scalar dt
         ) const;
 };
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
index 22ed27e080..b06506d828 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
@@ -67,6 +67,12 @@ protected:
         const dictionary coeffDict_;
 
 
+    // Protected member functions
+
+        //- Sherwood number
+        scalar Sh() const;
+
+
 public:
 
     //- Runtime type information
@@ -129,9 +135,15 @@ public:
         //- Update model
         virtual scalar calculate
         (
-            const scalar dt,
-            const scalarField& YMixture,
-            const scalar T
+            const scalar T,
+            const scalar d,
+            const scalarField& Xc,
+            const scalarField& dMassMT,
+            const vector Ur,
+            const scalar Tc,
+            const scalar pc,
+            const scalar nuc,
+            const scalar dt
         ) const = 0;
 };
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/liquidEvaporation/liquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/liquidEvaporation/liquidEvaporation.C
new file mode 100644
index 0000000000..792ae89c64
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/liquidEvaporation/liquidEvaporation.C
@@ -0,0 +1,201 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "liquidEvaporation.H"
+#include "specie.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::scalar Foam::liquidEvaporation<CloudType>::Sh
+(
+    const scalar Re,
+    const scalar Sc
+) const
+{
+    return 2.0 + 0.6*Foam::sqrt(Re)*pow(Sc, 0.333);
+}
+
+
+template <class CloudType>
+Foam::scalar Foam::liquidEvaporation<CloudType>::pSat
+(
+    const label i,
+    const scalar T
+) const
+{
+    const List<Tuple2<scalar, scalar> >& pSat = pSat_[i];
+
+    label id = 0;
+    label nT = pSat.size();
+    while ((id < nT) && (pSat[id].first() < T))
+    {
+        id++;
+    }
+
+    if (id == 0 || id == nT - 1)
+    {
+        return pSat[id].second();
+    }
+    else
+    {
+        return
+            (pSat[id].first() - T)
+           /(pSat[id].first() - pSat[id-1].first())
+           *(pSat[id].second() - pSat[id-1].second())
+          + pSat[id-1].second();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::liquidEvaporation<CloudType>::liquidEvaporation
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+:
+    PhaseChangeModel<CloudType>(dict, owner, typeName),
+    gases_(owner.gases()),
+    liquids_
+    (
+        liquidMixture::New
+        (
+            owner.mesh().objectRegistry::lookupObject<dictionary>
+            (
+                owner.carrierThermo().name().name()
+            )
+        )
+    ),
+    Tvap_(readScalar(coeffDict().lookup("Tvap"))),
+    Dm_(coeffDict().lookup("DiffusionCoeffs")),
+    pSat_(coeffDict().lookup("pSat"))
+{
+    if (liquids_.size() != Dm_.size())
+    {
+        FatalErrorIn
+        (
+            "Foam::liquidEvaporation<CloudType>::liquidEvaporation\n"
+            "(\n"
+            "    const dictionary& dict,\n"
+            "    CloudType& cloud\n"
+            ")\n"
+        )   << "Size of diffusionCoeffs list not equal to the number of liquid "
+            << "species" << nl << exit(FatalError);
+    }
+
+    if (liquids_.size() != pSat_.size())
+    {
+        FatalErrorIn
+        (
+            "Foam::liquidEvaporation<CloudType>::liquidEvaporation\n"
+            "(\n"
+            "    const dictionary& dict,\n"
+            "    CloudType& cloud\n"
+            ")\n"
+        )   << "Size of saturation pressure lists not equal to the number of "
+            << "liquid species" << nl << exit(FatalError);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::liquidEvaporation<CloudType>::~liquidEvaporation()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+bool Foam::liquidEvaporation<CloudType>::active() const
+{
+    return true;
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::liquidEvaporation<CloudType>::calculate
+(
+    const scalar T,
+    const scalar d,
+    const scalarField& Xc,
+    const scalarField& dMassMT,
+    const vector Ur
+    const scalar Tc,
+    const scalar pc,
+    const scalar nuc
+    const scalar dt,
+) const
+{
+    if (T < Tvap_)
+    {
+        // not reached temperature threshold
+        return 0.0;
+    }
+    else
+    {
+        // droplet area
+        scalar A = mathematicalConstant::pi*sqr(d);
+
+        // universal gas constant
+        const scalar R = specie::RR.value();
+
+        // Reynolds number
+        scalar Re = mag(Ur)*d/(nuc + ROOTVSMALL);
+
+        // calculate mass transfer of each specie
+        forAll(dMassMT, i)
+        {
+            // Schmidt number
+            scalar Sc = nuc/(Dm_[i] + ROOTVSMALL);
+
+            // Sherwood number
+            scalar Sh = this->Sh(Re, Sc);
+
+            // mass transfer coefficient [m/s]
+            scalar kc = Sh*Dm_[i]/(d + ROOTVSMALL);
+
+            // vapour concentration at droplet surface [kgmol/m3]
+            scalar Cs = pSat(i, T)/(R*T);
+
+            // vapour concentration in bulk gas [kgmol/m3]
+            scalar Cinf = Xc[i]*pc/(R*Tc);
+
+            // molar flux of vapour [kgmol/m2/s]
+            scalar Ni = max(kc*(Cs - Cinf), 0.0);
+
+            // mass transfer
+            dMassMT[i] -= Ni*A*liquids_.properies()[i].W()*dt;
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/liquidEvaporation/liquidEvaporation.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/liquidEvaporation/liquidEvaporation.H
new file mode 100644
index 0000000000..efc97fecab
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/liquidEvaporation/liquidEvaporation.H
@@ -0,0 +1,138 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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::liquidEvaporation
+
+Description
+    Liquid evaporation model
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef liquidEvaporation_H
+#define liquidEvaporation_H
+
+#include "PhaseChangeModel.H"
+#include "liquidMixture.H"
+#include "Tuple2.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+                       Class liquidEvaporation Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class liquidEvaporation
+:
+    public PhaseChangeModel<CloudType>
+{
+protected:
+
+    // Protected data
+
+        //- Global liquid properties data
+        autoPtr<liquidMixture> liquids_;
+
+        //- Vaporisation temperature [K]
+        //  Local droplet temperature must exceed Tvap before evaporation is
+        //  allowed
+        scalar Tvap_;
+
+        //- Component diffusion coefficients - one per specie
+        //  Note: need to be in same order as defined by liquids in thermo
+        //        props
+        scalarList Dm_;
+
+        //- Component saturation pressure vs temperature
+        List<List<Tuple2<scalar, scalar> > > pSat_;
+
+
+    // Protected member functions
+
+        //- Sherwood number as a function of Reynolds and Schmidt numbers
+        scalar Sh(const scalar Re, const scalar Sc) const;
+
+        //- Return the saturation pressure for species i at temperature, T
+        scalar pSat(const label i, const scalar T) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("liquidEvaporation");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        liquidEvaporation
+        (
+            const dictionary& dict,
+            CloudType& cloud
+        );
+
+
+    //- Destructor
+    virtual ~liquidEvaporation();
+
+
+    // Member Functions
+
+        //- Flag to indicate whether model activates phase change model
+        bool active() const;
+
+        //- Update model
+        scalar calculate
+        (
+            const scalar T,
+            const scalar d,
+            const scalarField& Xc,
+            const scalarField& dMassMT,
+            const vector Ur,
+            const scalar Tc,
+            const scalar pc,
+            const scalar nuc,
+            const scalar dt
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "liquidEvaporation.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
index 64d33f815f..c94fe00d4a 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
@@ -83,7 +83,7 @@ Foam::scalar Foam::HeatTransferModel<CloudType>::h
     const scalar muc
 ) const
 {
-    const scalar Re = rhoc*mag(Ur)*dp/(muc + SMALL);
+    const scalar Re = rhoc*mag(Ur)*dp/(muc + ROOTVSMALL);
 
 //    const scalar Pr = muc/alphac;
     const scalar Pr = this->Pr();

From aa84d7dd1a0aa6d7a1b63e1b93eddc2f7dfcc1bf Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 27 Feb 2009 17:29:07 +0000
Subject: [PATCH 012/175] added typedefs for the type of parcel the cloud was
 instantiated for

---
 .../clouds/Templates/KinematicCloud/KinematicCloud.H          | 4 ++++
 .../clouds/Templates/ReactingCloud/ReactingCloud.H            | 4 ++++
 .../ReactingMultiphaseCloud/ReactingMultiphaseCloud.H         | 4 ++++
 .../intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H   | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index d1c542a067..15c8cf4d03 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -194,6 +194,10 @@ public:
     virtual ~KinematicCloud();
 
 
+    //- Type of parcel the cloud was instantiated for
+    typedef ParcelType parcelType;
+
+
     // Member Functions
 
         // Access
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
index 9d66f9f3b5..ee541dd6d9 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
@@ -140,6 +140,10 @@ public:
     virtual ~ReactingCloud();
 
 
+    //- Type of parcel the cloud was instantiated for
+    typedef ParcelType parcelType;
+
+
     // Member Functions
 
         // Access
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
index 0feece303f..16e1140876 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
@@ -108,6 +108,10 @@ public:
     virtual ~ReactingMultiphaseCloud();
 
 
+    //- Type of parcel the cloud was instantiated for
+    typedef ParcelType parcelType;
+
+
     // Member Functions
 
         // Access
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
index dd47da7e01..13c560b152 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
@@ -134,6 +134,10 @@ public:
     virtual ~ThermoCloud();
 
 
+    //- Type of parcel the cloud was instantiated for
+    typedef ParcelType parcelType;
+
+
     // Member Functions
 
         // Access

From f613354d3d57363512489738e838d4c50433ecbd Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 27 Feb 2009 18:59:45 +0000
Subject: [PATCH 013/175] phase change update

---
 .../ReactingMultiphaseParcel.C                |  8 +--
 .../Templates/ReactingParcel/ReactingParcel.C | 42 ++++++----------
 .../Templates/ReactingParcel/ReactingParcel.H |  1 +
 .../phaseProperties/phasePropertiesIO.C       |  1 -
 .../CompositionModel/CompositionModel.C       | 50 +++++++++++++++++++
 .../CompositionModel/CompositionModel.H       |  8 +++
 .../NoPhaseChange/NoPhaseChange.C             |  4 +-
 .../NoPhaseChange/NoPhaseChange.H             |  4 +-
 .../PhaseChangeModel/PhaseChangeModel.H       |  4 +-
 .../liquidEvaporation/liquidEvaporation.C     | 12 +++--
 .../liquidEvaporation/liquidEvaporation.H     |  4 +-
 11 files changed, 97 insertions(+), 41 deletions(-)

diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 35d969714f..0ab68ded74 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -100,7 +100,8 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcCoupled
     // ~~~~~~~~~~~~~~~~~~~~~~
     // Calculate phase change
     // ~~~~~~~~~~~~~~~~~~~~~~
-    calcPhaseChange(td, dt, T0, dMassMT);
+    scalarField X = td.cloud().composition().X(idLiquid, YLiquid_);
+    calcPhaseChange(td, dt, T0, X, dMassMT);
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -271,7 +272,8 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcUncoupled
     // ~~~~~~~~~~~~~~~~~~~~~~
     // Calculate phase change
     // ~~~~~~~~~~~~~~~~~~~~~~
-    calcPhaseChange(td, dt, T0, dMassMT);
+    scalarField X = td.cloud().composition().X(idLiquid, YLiquid_);
+    calcPhaseChange(td, dt, T0, YLiquid_, dMassMT);
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -347,7 +349,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
         (
             "void Foam::ReactingMultiphaseParcel<ParcelType>::"
             "calcDevolatilisation \n"
-            "("
+            "(\n"
             "    TrackData&,\n"
             "    const scalar,\n"
             "    const scalar,\n"
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index daaa9ac66a..266f6e2530 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -97,7 +97,8 @@ void Foam::ReactingParcel<ParcelType>::calcCoupled
     // ~~~~~~~~~~~~~~~~~~~~~~
     // Calculate phase change
     // ~~~~~~~~~~~~~~~~~~~~~~
-    calcPhaseChange(td, dt, T, dMassMT);
+    scalarField X = td.cliud().composition().X(0, YMixture_);
+    calcPhaseChange(td, dt, T, X, dMassMT);
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -229,7 +230,8 @@ void Foam::ReactingParcel<ParcelType>::calcUncoupled
     // ~~~~~~~~~~~~~~~~~~~~~~
     // Calculate phase change
     // ~~~~~~~~~~~~~~~~~~~~~~
-    calcPhaseChange(td, dt, T, dMassMT);
+    scalarField X = td.cloud().composition().X(0, YMixture_);
+    calcPhaseChange(td, dt, T, X, dMassMT);
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -286,6 +288,7 @@ void Foam::ReactingParcel<ParcelType>::calcPhaseChange
     TrackData& td,
     const scalar dt,
     const scalar T,
+    scalarField& X,
     scalarList& dMassMT
 )
 {
@@ -296,35 +299,22 @@ void Foam::ReactingParcel<ParcelType>::calcPhaseChange
 
     // TODO: separate treatment for boiling
 
-    /*
-    // Determine mass to add to carrier phase
-    const scalar mass = this->mass();
-    const scalar dMassTot = td.cloud().devolatilisation().calculate
+    scalar dMassTot = td.cloud().phaseChange().calculate
     (
-        dt,
-        mass0_,
-        mass,
-        td.cloud().composition().YMixture0(),
-        YMixture_,
-        T0,
-        canCombust_
+        T,
+        this->d_,
+        X,
+        dMassMT,
+        this->U_ - this->Uc_,
+        this->Tc_,
+        pc_,
+        this->muc_/this->rhoc_,
+        dt
     );
 
-    // Update (total) mass fractions
-    YMixture_[0] = (YMixture_[0]*mass - dMassTot)/(mass - dMassTot);
-    YMixture_[1] = YMixture_[1]*mass/(mass - dMassTot);
-    YMixture_[2] = 1.0 - YMixture_[0] - YMixture_[1];
+    // TODO: Re-calculate mass fractions
 
-    // Add to cummulative mass transfer
-    forAll (YGas_, i)
-    {
-        label id = td.cloud().composition().gasGlobalIds()[i];
 
-        // Volatiles mass transfer
-        scalar volatileMass = YGas_[i]*dMassTot;
-        dMassMT[id] += volatileMass;
-    }
-        */
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index 763f1e2a6c..194ffc2d38 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -175,6 +175,7 @@ protected:
             TrackData& td,
             const scalar dt,
             const scalar T,
+            scalarField& X,
             scalarList& dMassMT
         );
 
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
index 34641fe4d4..192136ed8d 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
@@ -29,7 +29,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-
 Foam::phaseProperties::phaseProperties(Istream& is)
 :
     phase_(UNKNOWN),
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
index 5d1de160e8..df898464fd 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
@@ -241,6 +241,56 @@ const Foam::scalarField& Foam::CompositionModel<CloudType>::Y0
 }
 
 
+template<class CloudType>
+Foam::scalarField Foam::CompositionModel<CloudType>::X
+(
+    const label phaseI,
+    const scalarField& Y
+) const
+{
+    const phaseProperties& props = phaseProps_[phaseI];
+    scalarField X(Y.size(), 0.0);
+    scalar WInv = 0.0;
+    switch (props.phase())
+    {
+        case phaseProperties::GAS:
+        {
+            forAll(Y, i)
+            {
+                label gid = props.globalIds()[i];
+                WInv += Y[i]/this->gases()[gid].W();
+                X[i] = Y[i]/this->gases()[gid].W();
+            }
+            break;
+        }
+        case phaseProperties::LIQUID:
+        {
+            forAll(Y, i)
+            {
+                label gid = props.globalIds()[i];
+                WInv += Y[i]/this->liquids().properties()[gid].W();
+                X[i] += Y[i]/this->liquids().properties()[gid].W();
+            }
+            break;
+        }
+        default:
+        {
+            FatalErrorIn
+            (
+                "Foam::scalarField Foam::CompositionModel<CloudType>::X\n"
+                "(\n"
+                "    const label phaseI,\n"
+                "    const scalarField Y\n"
+                ") const"
+            )   << "Only possible to convert gas and liquid mass fractions"
+                << nl << abort(FatalError);
+        }
+    }
+
+    return X/WInv;
+}
+
+
 template<class CloudType>
 Foam::scalar Foam::CompositionModel<CloudType>::H
 (
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
index 9dd21529c8..5be0e2c1b9 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
@@ -187,6 +187,14 @@ public:
                 //- Return the list of phase phaseI mass fractions
                 const scalarField& Y0(const label phaseI) const;
 
+                //- Return the list of phase phaseI volume fractions fractions
+                //  based on supplied mass fractions Y
+                scalarField X
+                (
+                    const label phaseI,
+                    const scalarField& Y
+                ) const;
+
 
             // Mixture properties
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
index 791512789c..4029aa0570 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
@@ -61,8 +61,8 @@ Foam::scalar Foam::NoPhaseChange<CloudType>::calculate
     const scalar,
     const scalar,
     const scalarField&,
-    const scalarField&,
-    const vector,
+    const scalarList&,
+    const vector&,
     const scalar,
     const scalar,
     const scalar,
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
index 07341719db..74b065b75a 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
@@ -79,8 +79,8 @@ public:
             const scalar T,
             const scalar d,
             const scalarField& Xc,
-            const scalarField& dMassMT,
-            const vector Ur,
+            const scalarList& dMassMT,
+            const vector& Ur,
             const scalar Tc,
             const scalar pc,
             const scalar nuc,
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
index b06506d828..1a97370529 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
@@ -138,8 +138,8 @@ public:
             const scalar T,
             const scalar d,
             const scalarField& Xc,
-            const scalarField& dMassMT,
-            const vector Ur,
+            const scalarList& dMassMT,
+            const vector& Ur,
             const scalar Tc,
             const scalar pc,
             const scalar nuc,
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/liquidEvaporation/liquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/liquidEvaporation/liquidEvaporation.C
index 792ae89c64..8bba9d784d 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/liquidEvaporation/liquidEvaporation.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/liquidEvaporation/liquidEvaporation.C
@@ -146,14 +146,16 @@ Foam::scalar Foam::liquidEvaporation<CloudType>::calculate
     const scalar T,
     const scalar d,
     const scalarField& Xc,
-    const scalarField& dMassMT,
-    const vector Ur
+    const scalarList& dMassMT,
+    const vector& Ur
     const scalar Tc,
     const scalar pc,
     const scalar nuc
     const scalar dt,
 ) const
 {
+    scalar dMassTot = 0.0;
+
     if (T < Tvap_)
     {
         // not reached temperature threshold
@@ -192,9 +194,13 @@ Foam::scalar Foam::liquidEvaporation<CloudType>::calculate
             scalar Ni = max(kc*(Cs - Cinf), 0.0);
 
             // mass transfer
-            dMassMT[i] -= Ni*A*liquids_.properies()[i].W()*dt;
+            scalar dm = Ni*A*liquids_.properies()[i].W()*dt;
+            dMassMT[i] -= dm;
+            dMassTot += dm;
         }
     }
+
+    return dMassTot;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/liquidEvaporation/liquidEvaporation.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/liquidEvaporation/liquidEvaporation.H
index efc97fecab..a7e2325f17 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/liquidEvaporation/liquidEvaporation.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/liquidEvaporation/liquidEvaporation.H
@@ -111,8 +111,8 @@ public:
             const scalar T,
             const scalar d,
             const scalarField& Xc,
-            const scalarField& dMassMT,
-            const vector Ur,
+            const scalarList& dMassMT,
+            const vector& Ur,
             const scalar Tc,
             const scalar pc,
             const scalar nuc,

From 0f80edf285bbf432b85542ce2ef785f53de06e4a Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 2 Mar 2009 15:39:27 +0000
Subject: [PATCH 014/175] better treatment for 'none' option - added new
 constructor to base classes

read/write injector props to uniform for clean restarts
---
 .../Kinematic/DragModel/NoDrag/NoDrag.H       |   8 +-
 .../InjectionModel/InjectionModel.C           | 101 ++++++++++++++++--
 .../InjectionModel/InjectionModel.H           |  27 +++--
 .../InjectionModel/NoInjection/NoInjection.C  |   4 +-
 .../InjectionModel/NoInjection/NoInjection.H  |  10 +-
 .../NoPhaseChange/NoPhaseChange.C             |   6 +-
 .../NoPhaseChange/NoPhaseChange.H             |  10 +-
 .../PhaseChangeModel/PhaseChangeModel.C       |  11 ++
 .../PhaseChangeModel/PhaseChangeModel.H       |   3 +
 .../NoSurfaceReaction/NoSurfaceReaction.H     |   4 +-
 .../SurfaceReactionModel.C                    |  15 ++-
 .../SurfaceReactionModel.H                    |   3 +
 .../DevolatilisationModel.C                   |  15 ++-
 .../DevolatilisationModel.H                   |   3 +
 .../NoDevolatilisation/NoDevolatilisation.C   |   6 +-
 .../NoDevolatilisation/NoDevolatilisation.H   |  10 +-
 .../HeatTransferModel/HeatTransferModel.C     |   9 ++
 .../HeatTransferModel/HeatTransferModel.H     |   3 +
 .../NoHeatTransfer/NoHeatTransfer.C           |   6 +-
 .../NoHeatTransfer/NoHeatTransfer.H           |  12 +--
 20 files changed, 200 insertions(+), 66 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.H b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.H
index c05a7b3e04..b017f50270 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.H
@@ -26,7 +26,7 @@ Class
     Foam::NoDrag
 
 Description
-    Dummy drag model for 'no drag'
+    Dummy drag model for 'none'
 
 \*---------------------------------------------------------------------------*/
 
@@ -51,7 +51,7 @@ class NoDrag
 public:
 
     //- Runtime type information
-    TypeName("NoDrag");
+    TypeName("none");
 
 
     // Constructors
@@ -59,8 +59,8 @@ public:
         //- Construct from dictionary
         NoDrag
         (
-            const dictionary& dict,
-            CloudType& owner
+            const dictionary&,
+            CloudType&
         );
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 0dd1b106c9..0aaeb44cd4 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -29,6 +29,61 @@ License
 
 // * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * * //
 
+template<class CloudType>
+void Foam::InjectionModel<CloudType>::readProps()
+{
+    IOobject propsDictHeader
+    (
+        "injectionProperties",
+        owner_.db().time().timeName(),
+        "uniform/Lagrangian"/owner_.name(),
+        owner_.db(),
+        IOobject::MUST_READ,
+        IOobject::NO_WRITE,
+        false
+    );
+
+    if (propsDictHeader.headerOk())
+    {
+        const IOdictionary propsDict(propsDictHeader);
+
+        propsDict.readIfPresent("massInjected", massInjected_);
+        propsDict.readIfPresent("nInjections", nInjections_);
+        propsDict.readIfPresent("parcelsAddedTotal", parcelsAddedTotal_);
+        propsDict.readIfPresent("timeStep0", timeStep0_);
+    }
+}
+
+
+template<class CloudType>
+void Foam::InjectionModel<CloudType>::writeProps()
+{
+    if (owner_.db().time().outputTime())
+    {
+        IOdictionary propsDict
+        (
+            IOobject
+            (
+                "injectionProperties",
+                owner_.db().time().timeName(),
+                "uniform/Lagrangian"/owner_.name(),
+                owner_.db(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
+            )
+        );
+
+        propsDict.add("massInjected", massInjected_);
+        propsDict.add("nInjections", nInjections_);
+        propsDict.add("parcelsAddedTotal", parcelsAddedTotal_);
+        propsDict.add("timeStep0", timeStep0_);
+
+        propsDict.regIOobject::write();
+    }
+}
+
+
 template<class CloudType>
 void Foam::InjectionModel<CloudType>::prepareForNextTimeStep
 (
@@ -114,7 +169,7 @@ void Foam::InjectionModel<CloudType>::findCellAtPosition
     {
         FatalErrorIn
         (
-            "Foam::InjectionModel<CloudType>::findCellAtPosition"
+            "Foam::InjectionModel<CloudType>::findCellAtPosition\n"
             "(\n"
             "    label&,\n"
             "    vector&\n"
@@ -156,7 +211,7 @@ Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
             FatalErrorIn
             (
                 "Foam::scalar "
-                "Foam::InjectionModel<CloudType>::setNumberOfParticles"
+                "Foam::InjectionModel<CloudType>::setNumberOfParticles\n"
                 "(\n"
                 "    const label,\n"
                 "    const scalar,\n"
@@ -186,19 +241,42 @@ void Foam::InjectionModel<CloudType>::postInjectCheck()
     // Increment total number of parcels added
     parcelsAddedTotal_ += parcelsAdded_;
 
-    // Reset parcel counters
-    parcelsAdded_ = 0;
-
     // Update time for start of next injection
     time0_ = owner_.db().time().value();
 
     // Increment number of injections
     nInjections_++;
+
+    // Reset added parcels counter
+    parcelsAdded_ = 0;
+
+    writeProps();
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+template<class CloudType>
+Foam::InjectionModel<CloudType>::InjectionModel(CloudType& owner)
+:
+    dict_(dictionary::null),
+    owner_(owner),
+    coeffDict_(dictionary::null),
+    SOI_(0.0),
+    volumeTotal_(0.0),
+    massTotal_(0.0),
+    massInjected_(0.0),
+    nInjections_(0),
+    parcelsAdded_(0),
+    parcelsAddedTotal_(0),
+    parcelBasis_(pbNumber),
+    time0_(0.0),
+    timeStep0_(0.0)
+{
+    readProps();
+}
+
+
 template<class CloudType>
 Foam::InjectionModel<CloudType>::InjectionModel
 (
@@ -206,7 +284,8 @@ Foam::InjectionModel<CloudType>::InjectionModel
     CloudType& owner,
     const word& type
 )
-:   dict_(dict),
+:
+    dict_(dict),
     owner_(owner),
     coeffDict_(dict.subDict(type + "Coeffs")),
     SOI_(readScalar(coeffDict_.lookup("SOI"))),
@@ -216,16 +295,16 @@ Foam::InjectionModel<CloudType>::InjectionModel
     nInjections_(0),
     parcelsAdded_(0),
     parcelsAddedTotal_(0),
-    parcelBasisType_(coeffDict_.lookup("parcelBasisType")),
     parcelBasis_(pbNumber),
     time0_(owner.db().time().value()),
     timeStep0_(0.0)
 {
-    if (parcelBasisType_ == "mass")
+    word parcelBasisType = coeffDict_.lookup("parcelBasisType");
+    if (parcelBasisType == "mass")
     {
         parcelBasis_ = pbMass;
     }
-    else if (parcelBasisType_ == "number")
+    else if (parcelBasisType == "number")
     {
         parcelBasis_ = pbNumber;
     }
@@ -233,7 +312,7 @@ Foam::InjectionModel<CloudType>::InjectionModel
     {
         FatalErrorIn
         (
-            "Foam::InjectionModel<CloudType>::InjectionModel"
+            "Foam::InjectionModel<CloudType>::InjectionModel\n"
             "(\n"
             "    const dictionary&,\n"
             "    CloudType&,\n"
@@ -242,6 +321,8 @@ Foam::InjectionModel<CloudType>::InjectionModel
         )<< "parcelBasisType must be either 'number' or 'mass'" << nl
          << exit(FatalError);
     }
+
+    readProps();
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index ad2448681e..dd7d71de24 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -80,6 +80,15 @@ private:
         const dictionary coeffDict_;
 
 
+    // Private member functions
+
+        //- Read injector properties from previous run (if applicable)
+        void readProps();
+
+        //- Write injector properties
+        void writeProps();
+
+
 protected:
 
     // Protected data
@@ -114,13 +123,8 @@ protected:
 
         // Injection properties per Lagrangian time step
 
-            // Parcel basis
-
-                //- Parcel basis name
-                const word parcelBasisType_;
-
-                //- Parcel basis enumeration
-                parcelBasis parcelBasis_;
+            //- Parcel basis enumeration
+            parcelBasis parcelBasis_;
 
             //- Continuous phase time at start of injection time step [s]
             scalar time0_;
@@ -147,7 +151,7 @@ protected:
 
 
         //- Determine properties for next time step/injection interval
-        void prepareForNextTimeStep
+        virtual void prepareForNextTimeStep
         (
             const scalar time0,
             const scalar time1,
@@ -161,7 +165,7 @@ protected:
         virtual void findCellAtPosition(label& cellI, vector& position);
 
         //- Set number of particles to inject given parcel properties
-        scalar setNumberOfParticles
+        virtual scalar setNumberOfParticles
         (
             const label parcels,
             const scalar volume,
@@ -171,7 +175,7 @@ protected:
         );
 
         //- Post injection checks
-        void postInjectCheck();
+        virtual void postInjectCheck();
 
 
 public:
@@ -195,6 +199,9 @@ public:
 
     // Constructors
 
+        //- Construct null from owner
+        InjectionModel(CloudType& owner);
+
         //- Construct from dictionary
         InjectionModel
         (
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
index 43c03392f6..fcbd1b6981 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
@@ -56,11 +56,11 @@ Foam::scalar Foam::NoInjection<CloudType>::volumeToInject
 template<class CloudType>
 Foam::NoInjection<CloudType>::NoInjection
 (
-    const dictionary& dict,
+    const dictionary&,
     CloudType& owner
 )
 :
-    InjectionModel<CloudType>(dict, owner, typeName)
+    InjectionModel<CloudType>(owner)
 {}
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
index d7df9867e2..cb849a4951 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
@@ -26,7 +26,7 @@ Class
     Foam::NoInjection
 
 Description
-    Place holder for 'no injection' option
+    Place holder for 'none' option
 
 SourceFiles
     NoInjection.C
@@ -44,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                          Class NoInjection Declaration
+                       Class NoInjection Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class CloudType>
@@ -74,7 +74,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("NoInjection");
+    TypeName("none");
 
 
     // Constructors
@@ -82,8 +82,8 @@ public:
         //- Construct from components
         NoInjection
         (
-            const dictionary& dict,
-            CloudType& owner
+            const dictionary&,
+            CloudType&
         );
 
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
index 4029aa0570..06035d7224 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
@@ -31,11 +31,11 @@ License
 template <class CloudType>
 Foam::NoPhaseChange<CloudType>::NoPhaseChange
 (
-    const dictionary& dict,
-    CloudType& cloud
+    const dictionary&,
+    CloudType& owner
 )
 :
-    PhaseChangeModel<CloudType>(dict, cloud, typeName)
+    PhaseChangeModel<CloudType>(owner)
 {}
 
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
index 74b065b75a..92a9dd22e5 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
@@ -26,7 +26,7 @@ Class
     Foam::NoPhaseChange
 
 Description
-    Dummy phase change model for 'no phase change'
+    Dummy phase change model for 'none'
 
 \*---------------------------------------------------------------------------*/
 
@@ -51,17 +51,13 @@ class NoPhaseChange
 public:
 
     //- Runtime type information
-    TypeName("NoPhaseChange");
+    TypeName("none");
 
 
     // Constructors
 
         //- Construct from dictionary
-        NoPhaseChange
-        (
-            const dictionary& dict,
-            CloudType& cloud
-        );
+        NoPhaseChange(const dictionary&, CloudType&);
 
 
     //- Destructor
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
index c187165632..724da1e762 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
@@ -28,6 +28,17 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+template<class CloudType>
+Foam::PhaseChangeModel<CloudType>::PhaseChangeModel
+(
+    CloudType& owner
+)
+:   dict_(dictionary::null),
+    owner_(owner),
+    coeffDict_(dictionary::null)
+{}
+
+
 template<class CloudType>
 Foam::PhaseChangeModel<CloudType>::PhaseChangeModel
 (
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
index 1a97370529..22f12088b4 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
@@ -94,6 +94,9 @@ public:
 
     // Constructors
 
+        //- Construct null from owner
+        PhaseChangeModel(CloudType& owner);
+
         //- Construct from dictionary
         PhaseChangeModel
         (
diff --git a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H b/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
index 31776c1bd1..65ff10c0f2 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
@@ -26,7 +26,7 @@ Class
     Foam::NoSurfaceReaction
 
 Description
-    Dummy Devolatisation model for 'no devolatisation'
+    Dummy surface reaction model for 'none'
 
 \*---------------------------------------------------------------------------*/
 
@@ -51,7 +51,7 @@ class NoSurfaceReaction
 public:
 
     //- Runtime type information
-    TypeName("NoSurfaceReaction");
+    TypeName("none");
 
 
     // Constructors
diff --git a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C b/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C
index 1173ea1c59..c9fa9c4fce 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C
@@ -28,6 +28,18 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+template<class CloudType>
+Foam::SurfaceReactionModel<CloudType>::SurfaceReactionModel
+(
+    CloudType& owner
+)
+:
+    dict_(dictionary::null),
+    owner_(owner),
+    coeffDict_(dictionary::null)
+{}
+
+
 template<class CloudType>
 Foam::SurfaceReactionModel<CloudType>::SurfaceReactionModel
 (
@@ -35,7 +47,8 @@ Foam::SurfaceReactionModel<CloudType>::SurfaceReactionModel
     CloudType& owner,
     const word& type
 )
-:   dict_(dict),
+:
+    dict_(dict),
     owner_(owner),
     coeffDict_(dict.subDict(type + "Coeffs"))
 {}
diff --git a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H b/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
index dbeef7c237..339af3560b 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
@@ -91,6 +91,9 @@ public:
 
     // Constructors
 
+        //- Construct null from owner
+        SurfaceReactionModel(CloudType& owner);
+
         //- Construct from dictionary
         SurfaceReactionModel
         (
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C
index 913ea7fa1d..6a3d3efeb2 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C
@@ -28,6 +28,18 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+template<class CloudType>
+Foam::DevolatilisationModel<CloudType>::DevolatilisationModel
+(
+    CloudType& owner
+)
+:
+    dict_(dictionary::null),
+    owner_(owner),
+    coeffDict_(dictionary::null)
+{}
+
+
 template<class CloudType>
 Foam::DevolatilisationModel<CloudType>::DevolatilisationModel
 (
@@ -35,7 +47,8 @@ Foam::DevolatilisationModel<CloudType>::DevolatilisationModel
     CloudType& owner,
     const word& type
 )
-:   dict_(dict),
+:
+    dict_(dict),
     owner_(owner),
     coeffDict_(dict.subDict(type + "Coeffs"))
 {}
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
index 1195d6a2a0..004482a040 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
@@ -88,6 +88,9 @@ public:
 
     // Constructors
 
+        //- Construct null from owner
+        DevolatilisationModel(CloudType& owner);
+
         //- Construct from dictionary
         DevolatilisationModel
         (
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
index 745fcc8d52..9d7ff14749 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
@@ -31,11 +31,11 @@ License
 template <class CloudType>
 Foam::NoDevolatilisation<CloudType>::NoDevolatilisation
 (
-    const dictionary& dict,
-    CloudType& cloud
+    const dictionary&,
+    CloudType& owner
 )
 :
-    DevolatilisationModel<CloudType>(dict, cloud, typeName)
+    DevolatilisationModel<CloudType>(owner)
 {}
 
 
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
index 5f8462aad7..915547180a 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
@@ -26,7 +26,7 @@ Class
     Foam::NoDevolatilisation
 
 Description
-    Dummy devolatilisation model for 'no devolatilisation'
+    Dummy devolatilisation model for 'none'
 
 \*---------------------------------------------------------------------------*/
 
@@ -52,17 +52,13 @@ class NoDevolatilisation
 public:
 
     //- Runtime type information
-    TypeName("NoDevolatilisation");
+    TypeName("none");
 
 
     // Constructors
 
         //- Construct from dictionary
-        NoDevolatilisation
-        (
-            const dictionary& dict,
-            CloudType& cloud
-        );
+        NoDevolatilisation(const dictionary&, CloudType& owner);
 
 
     //- Destructor
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
index c94fe00d4a..f294d382a7 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
@@ -28,6 +28,15 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+template<class CloudType>
+Foam::HeatTransferModel<CloudType>::HeatTransferModel(CloudType& owner)
+:
+    dict_(dictionary::null),
+    owner_(owner),
+    coeffDict_(dictionary::null)
+{}
+
+
 template<class CloudType>
 Foam::HeatTransferModel<CloudType>::HeatTransferModel
 (
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
index cfb5c32c5f..1924be16c9 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
@@ -86,6 +86,9 @@ public:
 
     // Constructors
 
+        //- Construct null from owner
+        HeatTransferModel(CloudType& owner);
+
         //- Construct from dictionary
         HeatTransferModel
         (
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.C
index ab80ae9895..c50dd4d511 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.C
@@ -31,11 +31,11 @@ License
 template <class CloudType>
 Foam::NoHeatTransfer<CloudType>::NoHeatTransfer
 (
-    const dictionary& dict,
-    CloudType& cloud
+    const dictionary&,
+    CloudType& owner
 )
 :
-    HeatTransferModel<CloudType>(dict, cloud, typeName)
+    HeatTransferModel<CloudType>(owner)
 {}
 
 
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H
index 89112fef53..f03b4b3dc5 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H
@@ -26,7 +26,7 @@ Class
     Foam::NoHeatTransfer
 
 Description
-    Dummy heat transfer model for 'no heat transfer'
+    Dummy heat transfer model for 'none'
 
 \*---------------------------------------------------------------------------*/
 
@@ -40,7 +40,7 @@ Description
 namespace Foam
 {
 /*---------------------------------------------------------------------------*\
-                          Class NoHeatTransfer Declaration
+                       Class NoHeatTransfer Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class CloudType>
@@ -51,17 +51,13 @@ class NoHeatTransfer
 public:
 
     //- Runtime type information
-    TypeName("NoHeatTransfer");
+    TypeName("none");
 
 
     // Constructors
 
         //- Construct from dictionary
-        NoHeatTransfer
-        (
-            const dictionary& dict,
-            CloudType& cloud
-        );
+        NoHeatTransfer(const dictionary&, CloudType& owner);
 
 
     //- Destructor

From 5b7188afc98d33dbd37c6554e880c28d26beffea Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 2 Mar 2009 17:12:05 +0000
Subject: [PATCH 015/175] added Lvap + re-arranged constant properties

---
 .../ReactingMultiphaseParcel.H                | 12 --------
 .../ReactingMultiphaseParcelI.H               | 18 ------------
 .../Templates/ReactingParcel/ReactingParcel.H | 18 ++++++++++++
 .../ReactingParcel/ReactingParcelI.H          | 29 ++++++++++++++++++-
 4 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
index 416dc63d8b..a0d9ea528f 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -76,12 +76,6 @@ public:
     {
         // Private data
 
-            //- Vapourisation temperature [K]
-            const scalar Tvap_;
-
-            //- Boiling point [K]
-            const scalar Tbp_;
-
             //- Latent heat of devolatilisation [J/kg]
             const scalar Ldevol_;
 
@@ -93,12 +87,6 @@ public:
 
         // Access
 
-            //- Return const access to the vapourisation temperature
-            inline scalar Tvap() const;
-
-            //- Return const access to the boiling point
-            inline scalar Tbp() const;
-
             //- Return const access to the latent heat of devolatilisation
             inline scalar Ldevol() const;
     };
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
index 7becf84d6c..a87ad6032b 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
@@ -34,8 +34,6 @@ constantProperties
 )
 :
     ReactingParcel<ParcelType>::constantProperties(dict),
-    Tvap_(dimensionedScalar(dict.lookup("Tvap")).value()),
-    Tbp_(dimensionedScalar(dict.lookup("Tbp")).value()),
     Ldevol_(dimensionedScalar(dict.lookup("Ldevol")).value())
 {}
 
@@ -108,22 +106,6 @@ inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
 
 // * * * * * * * * * constantProperties Member Functions * * * * * * * * * * //
 
-template<class ParcelType>
-inline Foam::scalar
-Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::Tvap() const
-{
-    return Tvap_;
-}
-
-
-template<class ParcelType>
-inline Foam::scalar
-Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::Tbp() const
-{
-    return Tbp_;
-}
-
-
 template<class ParcelType>
 inline Foam::scalar
 Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::Ldevol() const
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index 194ffc2d38..a4e19fbbae 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -83,6 +83,15 @@ public:
             //- Constant volume flag - e.g. during mass transfer
             Switch constantVolume_;
 
+            //- Boiling point [K]
+            const scalar Tbp_;
+
+            //- Vapourisation temperature [K]
+            const scalar Tvap_;
+
+            //- Latent heat of vaporisation [J/kg]
+            const scalar Lvap_;
+
 
     public:
 
@@ -93,6 +102,15 @@ public:
 
             //- Return const access to the constant volume flag
             inline Switch constantVolume() const;
+
+            //- Return const access to the boiling point
+            inline scalar Tbp() const;
+
+            //- Return const access to the vapourisation temperature
+            inline scalar Tvap() const;
+
+            //- Return const access to the latent heat of vaporisation
+            inline scalar Lvap() const;
     };
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
index 1a5950b332..5e8c48025e 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
@@ -33,7 +33,10 @@ inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties
 )
 :
     ThermoParcel<ParcelType>::constantProperties(dict),
-    constantVolume_(dict.lookup("constantVolume"))
+    constantVolume_(dict.lookup("constantVolume")),
+    Tbp_(dimensionedScalar(dict.lookup("Tbp")).value()),
+    Tvap_(dimensionedScalar(dict.lookup("Tvap")).value()),
+    Lvap_(dimensionedScalar(dict.lookup("Lvap")).value())
 {}
 
 
@@ -112,6 +115,30 @@ Foam::ReactingParcel<ParcelType>::constantProperties::constantVolume() const
 }
 
 
+template<class ParcelType>
+inline Foam::scalar
+Foam::ReactingParcel<ParcelType>::constantProperties::Tbp() const
+{
+    return Tbp_;
+}
+
+
+template<class ParcelType>
+inline Foam::scalar
+Foam::ReactingParcel<ParcelType>::constantProperties::Tvap() const
+{
+    return Tvap_;
+}
+
+
+template<class ParcelType>
+inline Foam::scalar
+Foam::ReactingParcel<ParcelType>::constantProperties::Lvap() const
+{
+    return Lvap_;
+}
+
+
 // * * * * * * * * * * * trackData Member Functions  * * * * * * * * * * * * //
 
 template<class ParcelType>

From 6532fda297222ddebd4e129a8274adcfb793f93a Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 2 Mar 2009 19:15:45 +0000
Subject: [PATCH 016/175] restructing - surface reactions to multiphase level +
 clean-up

---
 src/lagrangian/intermediate/Make/files        | 51 +++++++++----------
 .../Templates/KinematicCloud/KinematicCloud.C |  3 +-
 .../Templates/ReactingCloud/ReactingCloud.C   | 29 +++++++----
 .../Templates/ReactingCloud/ReactingCloud.H   | 30 +++++------
 .../Templates/ReactingCloud/ReactingCloudI.H  |  8 ---
 .../ReactingMultiphaseCloud.C                 | 43 +++++++++++++++-
 .../ReactingMultiphaseCloud.H                 | 42 ++++++++++++++-
 .../ReactingMultiphaseCloudI.H                | 11 ++++
 .../Templates/ThermoCloud/ThermoCloud.C       |  7 +++
 .../Templates/ThermoCloud/ThermoCloud.H       |  6 +++
 .../ReactingMultiphaseParcel.C                |  4 ++
 .../Templates/ReactingParcel/ReactingParcel.C | 38 +++-----------
 ...makeBasicKinematicParcelDispersionModels.C |  2 +
 .../makeBasicKinematicParcelDragModels.C      |  2 +
 .../makeBasicKinematicParcelInjectionModels.C |  2 +
 ...asicKinematicParcelWallInteractionModels.C |  2 +
 ...eactingMultiphaseParcelCompositionModels.C |  2 +
 ...ngMultiphaseParcelDevolatilisationModels.C |  2 +
 ...ReactingMultiphaseParcelDispersionModels.C |  2 +
 ...eBasicReactingMultiphaseParcelDragModels.C |  2 +
 ...actingMultiphaseParcelHeatTransferModels.C |  2 +
 ...cReactingMultiphaseParcelInjectionModels.C |  2 +
 ...eactingMultiphaseParcelPhaseChangeModels.C |  2 +
 ...ingMultiphaseParcelSurfaceReactionModels.C |  8 +--
 ...ingMultiphaseParcelWallInteractionModels.C |  2 +
 ...BasicReactingParcelSurfaceReactionModels.C | 46 -----------------
 ...makeBasicReactingParcelCompositionModels.C |  2 +
 .../makeBasicReactingParcelDispersionModels.C |  2 +
 .../makeBasicReactingParcelDragModels.C       |  2 +
 ...akeBasicReactingParcelHeatTransferModels.C |  2 +
 .../makeBasicReactingParcelInjectionModels.C  |  2 +
 ...makeBasicReactingParcelPhaseChangeModels.C |  2 +
 ...BasicReactingParcelWallInteractionModels.C |  2 +
 .../makeBasicThermoParcelDispersionModels.C   |  2 +
 .../makeBasicThermoParcelDragModels.C         |  2 +
 .../makeBasicThermoParcelHeatTransferModels.C |  2 +
 .../makeBasicThermoParcelInjectionModels.C    |  2 +
 ...keBasicThermoParcelWallInteractionModels.C |  2 +
 .../NoSurfaceReaction/NoSurfaceReaction.C     |  0
 .../NoSurfaceReaction/NoSurfaceReaction.H     |  4 +-
 .../NewSurfaceReactionModel.C                 |  0
 .../SurfaceReactionModel.C                    |  0
 .../SurfaceReactionModel.H                    |  3 +-
 43 files changed, 234 insertions(+), 147 deletions(-)
 rename src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/{ => submodels}/makeBasicKinematicParcelDispersionModels.C (96%)
 rename src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/{ => submodels}/makeBasicKinematicParcelDragModels.C (95%)
 rename src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/{ => submodels}/makeBasicKinematicParcelInjectionModels.C (95%)
 rename src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/{ => submodels}/makeBasicKinematicParcelWallInteractionModels.C (95%)
 rename src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/{ => submodels}/makeBasicReactingMultiphaseParcelCompositionModels.C (95%)
 rename src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/{ => submodels}/makeBasicReactingMultiphaseParcelDevolatilisationModels.C (96%)
 rename src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/{ => submodels}/makeBasicReactingMultiphaseParcelDispersionModels.C (96%)
 rename src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/{ => submodels}/makeBasicReactingMultiphaseParcelDragModels.C (95%)
 rename src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/{ => submodels}/makeBasicReactingMultiphaseParcelHeatTransferModels.C (95%)
 rename src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/{ => submodels}/makeBasicReactingMultiphaseParcelInjectionModels.C (96%)
 rename src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/{ => submodels}/makeBasicReactingMultiphaseParcelPhaseChangeModels.C (95%)
 rename src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/{ => submodels}/makeBasicReactingMultiphaseParcelSurfaceReactionModels.C (88%)
 rename src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/{ => submodels}/makeBasicReactingMultiphaseParcelWallInteractionModels.C (95%)
 delete mode 100644 src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSurfaceReactionModels.C
 rename src/lagrangian/intermediate/parcels/derived/basicReactingParcel/{ => submodels}/makeBasicReactingParcelCompositionModels.C (95%)
 rename src/lagrangian/intermediate/parcels/derived/basicReactingParcel/{ => submodels}/makeBasicReactingParcelDispersionModels.C (96%)
 rename src/lagrangian/intermediate/parcels/derived/basicReactingParcel/{ => submodels}/makeBasicReactingParcelDragModels.C (95%)
 rename src/lagrangian/intermediate/parcels/derived/basicReactingParcel/{ => submodels}/makeBasicReactingParcelHeatTransferModels.C (95%)
 rename src/lagrangian/intermediate/parcels/derived/basicReactingParcel/{ => submodels}/makeBasicReactingParcelInjectionModels.C (95%)
 rename src/lagrangian/intermediate/parcels/derived/basicReactingParcel/{ => submodels}/makeBasicReactingParcelPhaseChangeModels.C (95%)
 rename src/lagrangian/intermediate/parcels/derived/basicReactingParcel/{ => submodels}/makeBasicReactingParcelWallInteractionModels.C (95%)
 rename src/lagrangian/intermediate/parcels/derived/basicThermoParcel/{ => submodels}/makeBasicThermoParcelDispersionModels.C (96%)
 rename src/lagrangian/intermediate/parcels/derived/basicThermoParcel/{ => submodels}/makeBasicThermoParcelDragModels.C (95%)
 rename src/lagrangian/intermediate/parcels/derived/basicThermoParcel/{ => submodels}/makeBasicThermoParcelHeatTransferModels.C (95%)
 rename src/lagrangian/intermediate/parcels/derived/basicThermoParcel/{ => submodels}/makeBasicThermoParcelInjectionModels.C (95%)
 rename src/lagrangian/intermediate/parcels/derived/basicThermoParcel/{ => submodels}/makeBasicThermoParcelWallInteractionModels.C (95%)
 rename src/lagrangian/intermediate/submodels/{Reacting => ReactingMultiphase}/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C (100%)
 rename src/lagrangian/intermediate/submodels/{Reacting => ReactingMultiphase}/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H (97%)
 rename src/lagrangian/intermediate/submodels/{Reacting => ReactingMultiphase}/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C (100%)
 rename src/lagrangian/intermediate/submodels/{Reacting => ReactingMultiphase}/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C (100%)
 rename src/lagrangian/intermediate/submodels/{Reacting => ReactingMultiphase}/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H (98%)

diff --git a/src/lagrangian/intermediate/Make/files b/src/lagrangian/intermediate/Make/files
index 44d371fdef..7e2bd41a8e 100644
--- a/src/lagrangian/intermediate/Make/files
+++ b/src/lagrangian/intermediate/Make/files
@@ -22,44 +22,43 @@ clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.C
 /* kinematic parcel sub-models */
 KINEMATICPARCEL=$(DERIVEDPARCELS)/basicKinematicParcel
 $(KINEMATICPARCEL)/defineBasicKinematicParcel.C
-$(KINEMATICPARCEL)/makeBasicKinematicParcelDispersionModels.C
-$(KINEMATICPARCEL)/makeBasicKinematicParcelDragModels.C
-$(KINEMATICPARCEL)/makeBasicKinematicParcelInjectionModels.C
-$(KINEMATICPARCEL)/makeBasicKinematicParcelWallInteractionModels.C
+$(KINEMATICPARCEL)/submodels/makeBasicKinematicParcelDispersionModels.C
+$(KINEMATICPARCEL)/submodels/makeBasicKinematicParcelDragModels.C
+$(KINEMATICPARCEL)/submodels/makeBasicKinematicParcelInjectionModels.C
+$(KINEMATICPARCEL)/submodels/makeBasicKinematicParcelWallInteractionModels.C
 
 /* thermo parcel sub-models */
 THERMOPARCEL=$(DERIVEDPARCELS)/basicThermoParcel
 $(THERMOPARCEL)/defineBasicThermoParcel.C
-$(THERMOPARCEL)/makeBasicThermoParcelDispersionModels.C
-$(THERMOPARCEL)/makeBasicThermoParcelDragModels.C
-$(THERMOPARCEL)/makeBasicThermoParcelHeatTransferModels.C
-$(THERMOPARCEL)/makeBasicThermoParcelInjectionModels.C
-$(THERMOPARCEL)/makeBasicThermoParcelWallInteractionModels.C
+$(THERMOPARCEL)/submodels/makeBasicThermoParcelDispersionModels.C
+$(THERMOPARCEL)/submodels/makeBasicThermoParcelDragModels.C
+$(THERMOPARCEL)/submodels/makeBasicThermoParcelHeatTransferModels.C
+$(THERMOPARCEL)/submodels/makeBasicThermoParcelInjectionModels.C
+$(THERMOPARCEL)/submodels/makeBasicThermoParcelWallInteractionModels.C
 
 /* reacting parcel sub-models */
 REACTINGPARCEL=$(DERIVEDPARCELS)/basicReactingParcel
 $(REACTINGPARCEL)/defineBasicReactingParcel.C
-$(REACTINGPARCEL)/makeBasicReactingParcelCompositionModels.C
-$(REACTINGPARCEL)/makeBasicReactingParcelDispersionModels.C
-$(REACTINGPARCEL)/makeBasicReactingParcelDragModels.C
-$(REACTINGPARCEL)/makeBasicReactingParcelHeatTransferModels.C
-$(REACTINGPARCEL)/makeBasicReactingParcelInjectionModels.C
-$(REACTINGPARCEL)/makeBasicReactingParcelPhaseChangeModels.C
-$(REACTINGPARCEL)/makeBasicReactingParcelSurfaceReactionModels.C
-$(REACTINGPARCEL)/makeBasicReactingParcelWallInteractionModels.C
+$(REACTINGPARCEL)/submodels/makeBasicReactingParcelCompositionModels.C
+$(REACTINGPARCEL)/submodels/makeBasicReactingParcelDispersionModels.C
+$(REACTINGPARCEL)/submodels/makeBasicReactingParcelDragModels.C
+$(REACTINGPARCEL)/submodels/makeBasicReactingParcelHeatTransferModels.C
+$(REACTINGPARCEL)/submodels/makeBasicReactingParcelInjectionModels.C
+$(REACTINGPARCEL)/submodels/makeBasicReactingParcelPhaseChangeModels.C
+$(REACTINGPARCEL)/submodels/makeBasicReactingParcelWallInteractionModels.C
 
 /* reacting multiphase parcel sub-models */
 REACTINGMPPARCEL=$(DERIVEDPARCELS)/basicReactingMultiphaseParcel
 $(REACTINGMPPARCEL)/defineBasicReactingMultiphaseParcel.C
-$(REACTINGMPPARCEL)/makeBasicReactingMultiphaseParcelCompositionModels.C
-$(REACTINGMPPARCEL)/makeBasicReactingMultiphaseParcelDevolatilisationModels.C
-$(REACTINGMPPARCEL)/makeBasicReactingMultiphaseParcelDispersionModels.C
-$(REACTINGMPPARCEL)/makeBasicReactingMultiphaseParcelDragModels.C
-$(REACTINGMPPARCEL)/makeBasicReactingMultiphaseParcelHeatTransferModels.C
-$(REACTINGMPPARCEL)/makeBasicReactingMultiphaseParcelInjectionModels.C
-$(REACTINGMPPARCEL)/makeBasicReactingMultiphaseParcelPhaseChangeModels.C
-$(REACTINGMPPARCEL)/makeBasicReactingMultiphaseParcelSurfaceReactionModels.C
-$(REACTINGMPPARCEL)/makeBasicReactingMultiphaseParcelWallInteractionModels.C
+$(REACTINGMPPARCEL)/submodels/makeBasicReactingMultiphaseParcelCompositionModels.C
+$(REACTINGMPPARCEL)/submodels/makeBasicReactingMultiphaseParcelDevolatilisationModels.C
+$(REACTINGMPPARCEL)/submodels/makeBasicReactingMultiphaseParcelDispersionModels.C
+$(REACTINGMPPARCEL)/submodels/makeBasicReactingMultiphaseParcelDragModels.C
+$(REACTINGMPPARCEL)/submodels/makeBasicReactingMultiphaseParcelHeatTransferModels.C
+$(REACTINGMPPARCEL)/submodels/makeBasicReactingMultiphaseParcelInjectionModels.C
+$(REACTINGMPPARCEL)/submodels/makeBasicReactingMultiphaseParcelPhaseChangeModels.C
+$(REACTINGMPPARCEL)/submodels/makeBasicReactingMultiphaseParcelSurfaceReactionModels.C
+$(REACTINGMPPARCEL)/submodels/makeBasicReactingMultiphaseParcelWallInteractionModels.C
 
 /* bolt-on models */
 submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index 3b92b98f0a..6584495b63 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -253,8 +253,7 @@ void Foam::KinematicCloud<ParcelType>::info() const
         << "    Current number of parcels       = "
         << returnReduce(this->size(), sumOp<label>()) << nl
         << "    Current mass in system          = "
-        << returnReduce(massInSystem(), sumOp<scalar>()) << nl
-        << endl;
+        << returnReduce(massInSystem(), sumOp<scalar>()) << nl;
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
index 640ce508d5..15a088c000 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -28,7 +28,6 @@ License
 
 #include "CompositionModel.H"
 #include "PhaseChangeModel.H"
-#include "SurfaceReactionModel.H"
 
 // * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * * //
 
@@ -97,15 +96,8 @@ Foam::ReactingCloud<ParcelType>::ReactingCloud
             *this
         )
     ),
-    surfaceReactionModel_
-    (
-        SurfaceReactionModel<ReactingCloud<ParcelType> >::New
-        (
-            this->particleProperties(),
-            *this
-        )
-    ),
-    rhoTrans_(thermo.composition().Y().size())
+    rhoTrans_(thermo.composition().Y().size()),
+    dMassPhaseChange_(0.0)
 {
     // Set storage for mass source fields and initialise to zero
     forAll(rhoTrans_, i)
@@ -224,4 +216,21 @@ void Foam::ReactingCloud<ParcelType>::evolve()
 }
 
 
+template<class ParcelType>
+void Foam::ReactingCloud<ParcelType>::info() const
+{
+    ThermoCloud<ParcelType>::info();
+
+    Info<< "    Mass transfer phase change      = "
+        << returnReduce(dMassPhaseChange_, sumOp<scalar>()) << nl;
+}
+
+
+template<class ParcelType>
+void Foam::ReactingCloud<ParcelType>::addToMassPhaseChange(const scalar dMass)
+{
+    dMassPhaseChange_ += dMass;
+}
+
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
index ee541dd6d9..3af70b1904 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
@@ -30,7 +30,6 @@ Description
     - Adds to thermodynamic cloud
       - Variable composition (single phase)
       - Phase change
-      - Surface reactions
 
 SourceFiles
     ReactingCloudI.H
@@ -62,9 +61,6 @@ class CompositionModel;
 template<class CloudType>
 class PhaseChangeModel;
 
-template<class CloudType>
-class SurfaceReactionModel;
-
 /*---------------------------------------------------------------------------*\
                       Class ReactingCloud Declaration
 \*---------------------------------------------------------------------------*/
@@ -97,13 +93,6 @@ class ReactingCloud
             autoPtr<PhaseChangeModel<ReactingCloud<ParcelType> > >
                 phaseChangeModel_;
 
-            //- Reacting surface reaction model
-            autoPtr
-            <
-                SurfaceReactionModel<ReactingCloud<ParcelType> >
-            >
-            surfaceReactionModel_;
-
 
         // Sources
 
@@ -111,6 +100,12 @@ class ReactingCloud
             PtrList<DimensionedField<scalar, volMesh> > rhoTrans_;
 
 
+        // Check
+
+            //- Total mass transferred to continuous phase via phase change
+            scalar dMassPhaseChange_;
+
+
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
@@ -168,10 +163,6 @@ public:
                 inline const PhaseChangeModel<ReactingCloud<ParcelType> >&
                     phaseChange() const;
 
-                //- Return reference to reacting surface reaction model
-                inline const SurfaceReactionModel<ReactingCloud<ParcelType> >&
-                    surfaceReaction() const;
-
 
             // Sources
 
@@ -196,6 +187,15 @@ public:
                         Srho1() const;
 
 
+        // Check
+
+            //- Print cloud information
+            void info() const;
+
+            //- Add to cumulative phase change mass transfer
+            void addToMassPhaseChange(const scalar dMass);
+
+
         // Cloud evolution functions
 
             //- Add new parcel
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
index 146db083cc..4bf20a37a9 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
@@ -66,14 +66,6 @@ Foam::ReactingCloud<ParcelType>::phaseChange() const
 }
 
 
-template<class ParcelType>
-inline const Foam::SurfaceReactionModel<Foam::ReactingCloud<ParcelType> >&
-Foam::ReactingCloud<ParcelType>::surfaceReaction() const
-{
-    return surfaceReactionModel_;
-}
-
-
 template<class ParcelType>
 inline Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
 Foam::ReactingCloud<ParcelType>::rhoTrans(const label i)
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
index 79a0581acd..708a3f7223 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
@@ -26,7 +26,6 @@ License
 
 #include "ReactingMultiphaseCloud.H"
 
-#include "CompositionModel.H"
 #include "DevolatilisationModel.H"
 #include "SurfaceReactionModel.H"
 
@@ -93,7 +92,16 @@ Foam::ReactingMultiphaseCloud<ParcelType>::ReactingMultiphaseCloud
             this->particleProperties(),
             *this
         )
-    )
+    ),
+    surfaceReactionModel_
+    (
+        SurfaceReactionModel<ReactingMultiphaseCloud<ParcelType> >::New
+        (
+            this->particleProperties(),
+            *this
+        )
+    ),
+    dMassDevolatilisation_(0.0)
 {}
 
 
@@ -185,4 +193,35 @@ void Foam::ReactingMultiphaseCloud<ParcelType>::evolve()
 }
 
 
+template<class ParcelType>
+void Foam::ReactingMultiphaseCloud<ParcelType>::info() const
+{
+    ReactingCloud<ParcelType>::info();
+    Info<< "    Mass transfer devolatilisation  = "
+        << returnReduce(dMassDevolatilisation_, sumOp<scalar>()) << nl;
+    Info<< "    Mass transfer surface reaction  = "
+        << returnReduce(dMassSurfaceReaction_, sumOp<scalar>()) << nl;
+}
+
+
+template<class ParcelType>
+void Foam::ReactingMultiphaseCloud<ParcelType>::addToMassDevolatilisation
+(
+    const scalar dMass
+)
+{
+    dMassDevolatilisation_ += dMass;
+}
+
+
+template<class ParcelType>
+void Foam::ReactingMultiphaseCloud<ParcelType>::addToMassSurfaceReaction
+(
+    const scalar dMass
+)
+{
+    dMassSurfaceReaction_ += dMass;
+}
+
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
index 16e1140876..b78a5c0242 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
@@ -28,8 +28,9 @@ Class
 Description
     Templated base class for multiphase reacting cloud
     - Adds to reacting cloud
-      - Devolatilisatsion
       - multiphase composition
+      - devolatilisatsion
+      - surface reactions
 
 SourceFiles
     ReactingMultiphaseCloudI.H
@@ -53,6 +54,9 @@ namespace Foam
 template<class CloudType>
 class DevolatilisationModel;
 
+template<class CloudType>
+class SurfaceReactionModel;
+
 /*---------------------------------------------------------------------------*\
                    Class ReactingMultiphaseCloud Declaration
 \*---------------------------------------------------------------------------*/
@@ -78,6 +82,23 @@ class ReactingMultiphaseCloud
             >
             devolatilisationModel_;
 
+            //- Surface reaction model
+            autoPtr
+            <
+                SurfaceReactionModel<ReactingMultiphaseCloud<ParcelType> >
+            >
+            surfaceReactionModel_;
+
+
+        // Check
+
+            //- Total mass transferred to continuous phase via devolatilisation
+            scalar dMassDevolatilisation_;
+
+            //- Total mass transferred to continuous phase via surface
+            //  reactions
+            scalar dMassSurfaceReaction_;
+
 
     // Private Member Functions
 
@@ -125,6 +146,25 @@ public:
                 >&
                 devolatilisation() const;
 
+                //- Return reference to reacting surface reaction model
+                inline const SurfaceReactionModel
+                <
+                    ReactingMultiphaseCloud<ParcelType>
+                >&
+                surfaceReaction() const;
+
+
+        // Check
+
+            //- Print cloud information
+            void info() const;
+
+            //- Add to cumulative volatilisation mass transfer
+            void addToMassDevolatilisation(const scalar dMass);
+
+            //- Add to cumulative surface reaction transfer
+            void addToMassSurfaceReaction(const scalar dMass);
+
 
         // Cloud evolution functions
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H
index f27fae24ea..752f2b8ca3 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H
@@ -37,4 +37,15 @@ Foam::ReactingMultiphaseCloud<ParcelType>::devolatilisation() const
 }
 
 
+template<class ParcelType>
+inline const Foam::SurfaceReactionModel
+<
+    Foam::ReactingMultiphaseCloud<ParcelType>
+>&
+Foam::ReactingMultiphaseCloud<ParcelType>::surfaceReaction() const
+{
+    return surfaceReactionModel_;
+}
+
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
index 05a0b5f2aa..b54624bb81 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
@@ -215,4 +215,11 @@ void Foam::ThermoCloud<ParcelType>::evolve()
 }
 
 
+template<class ParcelType>
+void Foam::ThermoCloud<ParcelType>::info() const
+{
+    KinematicCloud<ParcelType>::info();
+}
+
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
index 13c560b152..d845b725b1 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
@@ -197,6 +197,12 @@ public:
                     inline tmp<volScalarField> sigmap() const;
 
 
+        // Check
+
+            //- Print cloud information
+            void info() const;
+
+
         // Cloud evolution functions
 
             //- Add new parcel
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 0ab68ded74..bc132bb6f3 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -402,6 +402,8 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
         scalar volatileMass = YGas_[i]*dMassTot;
         dMassMT[id] += volatileMass;
     }
+
+    td.cloud().addToMassDevolatilisation(dMassTot);
 }
 
 
@@ -446,6 +448,8 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
         dMassSR,
         dhRet
     );
+
+    // TODO: td.cloud().addToMassDevolatilisation(sum(dMassSR));
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index 266f6e2530..01fa099a92 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -61,6 +61,7 @@ void Foam::ReactingParcel<ParcelType>::calcCoupled
     const scalar np0 = this->nParticle_;
     const scalar T0 = this->T_;
 
+
     // ~~~~~~~~~~~~~~~~~~~~~~~~~
     // Initialise transfer terms
     // ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -75,11 +76,6 @@ void Foam::ReactingParcel<ParcelType>::calcCoupled
     // - components exist in particle already
     scalarList dMassMT(td.cloud().gases().size(), 0.0);
 
-    // Mass transfer due to surface reactions from particle to carrier phase
-    // - components do not necessarily exist in particle already
-    scalarList dMassSR(td.cloud().gases().size(), 0.0);
-
-
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Calculate velocity - update U
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -100,23 +96,8 @@ void Foam::ReactingParcel<ParcelType>::calcCoupled
     scalarField X = td.cliud().composition().X(0, YMixture_);
     calcPhaseChange(td, dt, T, X, dMassMT);
 
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate surface reactions
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    // Initialise enthalpy retention to zero
-    scalar dhRet = 0.0;
-
-    calcSurfaceReactions(td, dt, celli, T0, T1, dMassMT, dMassSR, dhRet);
-
     // New total mass
-    const scalar mass1 = mass0 - sum(dMassMT) - sum(dMassSR);
-
-    // Add retained enthalpy from surface reaction to particle and remove
-    // from gas
-    T1 += dhRet/(0.5*(mass0 + mass1)*cp0);
-    dhTrans -= dhRet;
+    const scalar mass1 = mass0 - sum(dMassMT);
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~
@@ -126,7 +107,7 @@ void Foam::ReactingParcel<ParcelType>::calcCoupled
     // Transfer mass lost from particle to carrier mass source
     forAll(dMassMT, i)
     {
-        td.cloud().rhoTrans(i)[celli] += np0*(dMassMT[i] + dMassSR[i]);
+        td.cloud().rhoTrans(i)[celli] += np0*dMassMT[i];
     }
 
     // Update momentum transfer
@@ -194,6 +175,7 @@ void Foam::ReactingParcel<ParcelType>::calcUncoupled
     const scalar mass0 = this->mass();
     const scalar cp0 = this->cp_;
 
+
     // ~~~~~~~~~~~~~~~~~~~~~~~~~
     // Initialise transfer terms
     // ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -208,10 +190,6 @@ void Foam::ReactingParcel<ParcelType>::calcUncoupled
     // - components exist in particle already
     scalarList dMassMT(td.cloud().gases().size(), 0.0);
 
-    // Mass transfer due to surface reactions from particle to carrier phase
-    // - components do not necessarily exist in particle already
-    scalarList dMassSR(td.cloud().gases().size(), 0.0);
-
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Calculate velocity - update U
@@ -231,7 +209,8 @@ void Foam::ReactingParcel<ParcelType>::calcUncoupled
     // Calculate phase change
     // ~~~~~~~~~~~~~~~~~~~~~~
     scalarField X = td.cloud().composition().X(0, YMixture_);
-    calcPhaseChange(td, dt, T, X, dMassMT);
+    scalar dMassPC = calcPhaseChange(td, dt, T, X, dMassMT);
+    T1 -= td.constProps().Lvap()*dMassPC/(0.5*mass0*cp0);
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -241,10 +220,8 @@ void Foam::ReactingParcel<ParcelType>::calcUncoupled
     // Initialise enthalpy retention to zero
     scalar dhRet = 0.0;
 
-    calcSurfaceReactions(td, dt, celli, T0, T1, dMassMT, dMassSR, dhRet);
-
     // New total mass
-    const scalar mass1 = mass0 - sum(dMassMT) - sum(dMassSR);
+    const scalar mass1 = mass0 - sum(dMassMT);
 
     // New specific heat capacity
     const scalar cp1 = cp0; // TODO: new cp1
@@ -312,6 +289,7 @@ void Foam::ReactingParcel<ParcelType>::calcPhaseChange
         dt
     );
 
+    td.cloud().addToMassPhaseChange(dMassTot);
     // TODO: Re-calculate mass fractions
 
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelDispersionModels.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/submodels/makeBasicKinematicParcelDispersionModels.C
similarity index 96%
rename from src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelDispersionModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/submodels/makeBasicKinematicParcelDispersionModels.C
index 7a09f02321..f6444b1252 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelDispersionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/submodels/makeBasicKinematicParcelDispersionModels.C
@@ -31,6 +31,8 @@ License
 #include "GradientDispersionRAS.H"
 #include "StochasticDispersionRAS.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
     makeDispersionModel(KinematicCloud<basicKinematicParcel>);
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelDragModels.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/submodels/makeBasicKinematicParcelDragModels.C
similarity index 95%
rename from src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelDragModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/submodels/makeBasicKinematicParcelDragModels.C
index e88f4e1d37..6b10e4efb0 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelDragModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/submodels/makeBasicKinematicParcelDragModels.C
@@ -30,6 +30,8 @@ License
 #include "NoDrag.H"
 #include "SphereDrag.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
     makeDragModel(KinematicCloud<basicKinematicParcel>);
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelInjectionModels.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/submodels/makeBasicKinematicParcelInjectionModels.C
similarity index 95%
rename from src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelInjectionModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/submodels/makeBasicKinematicParcelInjectionModels.C
index e5cc927c67..c722ac91fd 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelInjectionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/submodels/makeBasicKinematicParcelInjectionModels.C
@@ -31,6 +31,8 @@ License
 #include "ManualInjection.H"
 #include "ConeInjection.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
     makeInjectionModel(KinematicCloud<basicKinematicParcel>);
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelWallInteractionModels.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/submodels/makeBasicKinematicParcelWallInteractionModels.C
similarity index 95%
rename from src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelWallInteractionModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/submodels/makeBasicKinematicParcelWallInteractionModels.C
index 95335509a6..544cddaf2a 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelWallInteractionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/submodels/makeBasicKinematicParcelWallInteractionModels.C
@@ -30,6 +30,8 @@ License
 #include "Rebound.H"
 #include "StandardWallInteraction.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
     makeWallInteractionModel(KinematicCloud<basicKinematicParcel>);
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelCompositionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelCompositionModels.C
similarity index 95%
rename from src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelCompositionModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelCompositionModels.C
index b598be9939..4dd31ffb58 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelCompositionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelCompositionModels.C
@@ -29,6 +29,8 @@ License
 
 #include "SingleMixtureFraction.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
     makeCompositionModel
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDevolatilisationModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelDevolatilisationModels.C
similarity index 96%
rename from src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDevolatilisationModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelDevolatilisationModels.C
index 71c9d6e7c0..8704e48d80 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDevolatilisationModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelDevolatilisationModels.C
@@ -31,6 +31,8 @@ License
 #include "ConstantRateDevolatilisation.H"
 #include "SingleKineticRateDevolatilisation.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
     makeDevolatilisationModel
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDispersionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelDispersionModels.C
similarity index 96%
rename from src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDispersionModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelDispersionModels.C
index 5c96a859a7..8e4a77d5e3 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDispersionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelDispersionModels.C
@@ -31,6 +31,8 @@ License
 #include "GradientDispersionRAS.H"
 #include "StochasticDispersionRAS.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
     makeDispersionModel(KinematicCloud<basicReactingMultiphaseParcel>);
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDragModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelDragModels.C
similarity index 95%
rename from src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDragModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelDragModels.C
index 253d546b7b..5e56985952 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelDragModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelDragModels.C
@@ -30,6 +30,8 @@ License
 #include "NoDrag.H"
 #include "SphereDrag.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
     makeDragModel(KinematicCloud<basicReactingMultiphaseParcel>);
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelHeatTransferModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelHeatTransferModels.C
similarity index 95%
rename from src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelHeatTransferModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelHeatTransferModels.C
index 1b6f4e06e1..f501421d8b 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelHeatTransferModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelHeatTransferModels.C
@@ -30,6 +30,8 @@ License
 #include "NoHeatTransfer.H"
 #include "RanzMarshall.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
     makeHeatTransferModel(ThermoCloud<basicReactingMultiphaseParcel>);
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelInjectionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelInjectionModels.C
similarity index 96%
rename from src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelInjectionModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelInjectionModels.C
index 53bed2ed11..6d8b5aeac9 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelInjectionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelInjectionModels.C
@@ -31,6 +31,8 @@ License
 #include "ManualInjection.H"
 #include "ConeInjection.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
     makeInjectionModel(KinematicCloud<basicReactingMultiphaseParcel>);
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelPhaseChangeModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelPhaseChangeModels.C
similarity index 95%
rename from src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelPhaseChangeModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelPhaseChangeModels.C
index 76383aaf11..88300dffb1 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelPhaseChangeModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelPhaseChangeModels.C
@@ -29,6 +29,8 @@ License
 
 #include "NoPhaseChange.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
     makePhaseChangeModel
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSurfaceReactionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelSurfaceReactionModels.C
similarity index 88%
rename from src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSurfaceReactionModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelSurfaceReactionModels.C
index 26c983dfac..d047880740 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSurfaceReactionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelSurfaceReactionModels.C
@@ -25,22 +25,24 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "basicReactingMultiphaseParcel.H"
-#include "ReactingCloud.H"
+#include "ReactingMultiphaseCloud.H"
 
 #include "NoSurfaceReaction.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
     makeSurfaceReactionModel
     (
-        ReactingCloud<basicReactingMultiphaseParcel>
+        ReactingMultiphaseCloud<basicReactingMultiphaseParcel>
     );
 
     // Add instances of surface reaction model to the table
     makeSurfaceReactionModelType
     (
         NoSurfaceReaction,
-        ReactingCloud,
+        ReactingMultiphaseCloud,
         basicReactingMultiphaseParcel
     );
 };
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelWallInteractionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelWallInteractionModels.C
similarity index 95%
rename from src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelWallInteractionModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelWallInteractionModels.C
index 19057c485e..3e7d911f8f 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelWallInteractionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelWallInteractionModels.C
@@ -30,6 +30,8 @@ License
 #include "Rebound.H"
 #include "StandardWallInteraction.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
     makeWallInteractionModel(KinematicCloud<basicReactingMultiphaseParcel>);
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSurfaceReactionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSurfaceReactionModels.C
deleted file mode 100644
index 0cb133d8ba..0000000000
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSurfaceReactionModels.C
+++ /dev/null
@@ -1,46 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  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 "basicReactingParcel.H"
-#include "ReactingCloud.H"
-
-#include "NoSurfaceReaction.H"
-
-namespace Foam
-{
-    makeSurfaceReactionModel(ReactingCloud<basicReactingParcel>);
-
-    // Add instances of surface reaction model to the table
-    makeSurfaceReactionModelType
-    (
-        NoSurfaceReaction,
-        ReactingCloud,
-        basicReactingParcel
-    );
-};
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelCompositionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelCompositionModels.C
similarity index 95%
rename from src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelCompositionModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelCompositionModels.C
index 786fa74ddc..7010ab4f2c 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelCompositionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelCompositionModels.C
@@ -29,6 +29,8 @@ License
 
 #include "SinglePhaseMixture.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
     makeCompositionModel(ReactingCloud<basicReactingParcel>);
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDispersionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelDispersionModels.C
similarity index 96%
rename from src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDispersionModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelDispersionModels.C
index 80a351c7bb..d2b6132bca 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDispersionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelDispersionModels.C
@@ -31,6 +31,8 @@ License
 #include "GradientDispersionRAS.H"
 #include "StochasticDispersionRAS.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
     makeDispersionModel(KinematicCloud<basicReactingParcel>);
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDragModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelDragModels.C
similarity index 95%
rename from src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDragModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelDragModels.C
index 178569796d..0c43e221b1 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDragModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelDragModels.C
@@ -30,6 +30,8 @@ License
 #include "NoDrag.H"
 #include "SphereDrag.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
     makeDragModel(KinematicCloud<basicReactingParcel>);
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelHeatTransferModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelHeatTransferModels.C
similarity index 95%
rename from src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelHeatTransferModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelHeatTransferModels.C
index e78caa71ec..5bc2ea33a8 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelHeatTransferModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelHeatTransferModels.C
@@ -30,6 +30,8 @@ License
 #include "NoHeatTransfer.H"
 #include "RanzMarshall.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
     makeHeatTransferModel(ThermoCloud<basicReactingParcel>);
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelInjectionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelInjectionModels.C
similarity index 95%
rename from src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelInjectionModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelInjectionModels.C
index 77b71a75ab..1af1e37088 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelInjectionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelInjectionModels.C
@@ -31,6 +31,8 @@ License
 #include "ManualInjection.H"
 #include "ConeInjection.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
     makeInjectionModel(KinematicCloud<basicReactingParcel>);
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelPhaseChangeModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelPhaseChangeModels.C
similarity index 95%
rename from src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelPhaseChangeModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelPhaseChangeModels.C
index 537ff586fa..65118fa8f7 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelPhaseChangeModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelPhaseChangeModels.C
@@ -29,6 +29,8 @@ License
 
 #include "NoPhaseChange.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
     makePhaseChangeModel(ReactingCloud<basicReactingParcel>);
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelWallInteractionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelWallInteractionModels.C
similarity index 95%
rename from src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelWallInteractionModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelWallInteractionModels.C
index 364d6f031e..637fd92aae 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelWallInteractionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelWallInteractionModels.C
@@ -30,6 +30,8 @@ License
 #include "Rebound.H"
 #include "StandardWallInteraction.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
     makeWallInteractionModel(KinematicCloud<basicReactingParcel>);
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelDispersionModels.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelDispersionModels.C
similarity index 96%
rename from src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelDispersionModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelDispersionModels.C
index f1ab424f9b..86bc63c72a 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelDispersionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelDispersionModels.C
@@ -30,6 +30,8 @@ License
 #include "GradientDispersionRAS.H"
 #include "StochasticDispersionRAS.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
     makeDispersionModel(KinematicCloud<basicThermoParcel>);
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelDragModels.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelDragModels.C
similarity index 95%
rename from src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelDragModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelDragModels.C
index b477000cf5..aaeacca70c 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelDragModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelDragModels.C
@@ -29,6 +29,8 @@ License
 #include "NoDrag.H"
 #include "SphereDrag.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
     makeDragModel(KinematicCloud<basicThermoParcel>);
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelHeatTransferModels.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelHeatTransferModels.C
similarity index 95%
rename from src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelHeatTransferModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelHeatTransferModels.C
index d8a3c67c97..afb3ae0833 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelHeatTransferModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelHeatTransferModels.C
@@ -29,6 +29,8 @@ License
 #include "NoHeatTransfer.H"
 #include "RanzMarshall.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
     makeHeatTransferModel(ThermoCloud<basicThermoParcel>);
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelInjectionModels.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelInjectionModels.C
similarity index 95%
rename from src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelInjectionModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelInjectionModels.C
index cb51b86852..f2f433b021 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelInjectionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelInjectionModels.C
@@ -30,6 +30,8 @@ License
 #include "ManualInjection.H"
 #include "ConeInjection.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
     makeInjectionModel(KinematicCloud<basicThermoParcel>);
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelWallInteractionModels.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelWallInteractionModels.C
similarity index 95%
rename from src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelWallInteractionModels.C
rename to src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelWallInteractionModels.C
index 03402510f6..361ffffdb1 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelWallInteractionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelWallInteractionModels.C
@@ -29,6 +29,8 @@ License
 #include "Rebound.H"
 #include "StandardWallInteraction.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
     makeWallInteractionModel(KinematicCloud<basicThermoParcel>);
diff --git a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C
similarity index 100%
rename from src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C
diff --git a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
similarity index 97%
rename from src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
index 65ff10c0f2..edb919a621 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
@@ -71,10 +71,10 @@ public:
     // Member Functions
 
         //- Flag to indicate whether model activates devolatisation model
-        bool active() const;
+        virtual bool active() const;
 
         //- Update surface reactions
-        void calculate
+        virtual void calculate
         (
             const scalar dt,
             const label celli,
diff --git a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C
similarity index 100%
rename from src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C
diff --git a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C
similarity index 100%
rename from src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C
diff --git a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
similarity index 98%
rename from src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
index 339af3560b..6b4f5be31c 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
@@ -56,7 +56,6 @@ namespace Foam
 template<class CloudType>
 class SurfaceReactionModel
 {
-
     // Private data
 
         //- The cloud dictionary
@@ -129,7 +128,7 @@ public:
 
     // Member Functions
 
-        //- Flag to indicate whether model activates devolatisation model
+        //- Flag to indicate whether model activates surface reaction model
         virtual bool active() const = 0;
 
         //- Update surface reactions

From e9065915220abb27a3c6ff7835da439552a5b4a0 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 3 Mar 2009 17:59:44 +0000
Subject: [PATCH 017/175] multiple updates

  Injection:
  - moved position and velocity constraints for 2-d cases to the base InjectionModel
  - added validInjection function

  Clouds
  - added an effective density function to the KinematicCloud
---
 .../Templates/KinematicCloud/KinematicCloud.H |  4 +
 .../KinematicCloud/KinematicCloudI.H          | 55 ++++++++++--
 .../ConeInjection/ConeInjection.C             | 38 ++------
 .../ConeInjection/ConeInjection.H             | 14 +--
 .../InjectionModel/InjectionModel.C           | 90 ++++++++++++++-----
 .../InjectionModel/InjectionModel.H           | 13 ++-
 .../ManualInjection/ManualInjection.C         | 41 ++-------
 .../ManualInjection/ManualInjection.H         | 18 ++--
 .../InjectionModel/NoInjection/NoInjection.C  | 11 ++-
 .../InjectionModel/NoInjection/NoInjection.H  | 14 +--
 10 files changed, 179 insertions(+), 119 deletions(-)

diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index 15c8cf4d03..7d05141fca 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -320,6 +320,10 @@ public:
                 //  Note: for particles belonging to this cloud only
                 inline const tmp<volScalarField> alpha() const;
 
+                //- Return the particle effective density field
+                //  Note: for particles belonging to this cloud only
+                inline const tmp<volScalarField> rhoEff() const;
+
 
         // Cloud evolution functions
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index 2b8cca12d1..948a6b5dff 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -91,6 +91,7 @@ Foam::KinematicCloud<ParcelType>::g() const
     return g_;
 }
 
+
 template<class ParcelType>
 inline const Foam::dictionary&
 Foam::KinematicCloud<ParcelType>::interpolationSchemes() const
@@ -212,7 +213,7 @@ Foam::KinematicCloud<ParcelType>::SU1() const
             dimensionedVector
             (
                  "zero",
-                 dimensionSet(1, -2, -2, 0, 0),
+                 dimDensity*dimVelocity/dimTime,
                  vector::zero
             )
         )
@@ -237,9 +238,10 @@ Foam::KinematicCloud<ParcelType>::SU2(volVectorField& U) const
             << min(UCoeff_) << ", " << max(UCoeff_) << endl;
     }
 
-    return UTrans_/(mesh_.V()*this->db().time().deltaT())
-         - fvm::Sp(UCoeff_/mesh_.V(), U)
-         + UCoeff_/mesh_.V()*U;
+    return
+        UTrans_/(mesh_.V()*this->db().time().deltaT())
+      - fvm::Sp(UCoeff_/mesh_.V(), U)
+      + UCoeff_/mesh_.V()*U;
 }
 
 
@@ -261,7 +263,7 @@ Foam::KinematicCloud<ParcelType>::theta() const
                 false
             ),
             mesh_,
-            dimensionedScalar("zero", dimensionSet(0, 0, 0, 0, 0), 0.0)
+            dimensionedScalar("zero", dimless, 0.0)
         )
     );
 
@@ -274,7 +276,7 @@ Foam::KinematicCloud<ParcelType>::theta() const
         theta[cellI] += p.nParticle()*p.volume();
     }
 
-    theta /= mesh().cellVolumes();
+    theta /= mesh().V();
 
     return ttheta;
 }
@@ -298,7 +300,7 @@ Foam::KinematicCloud<ParcelType>::alpha() const
                 false
             ),
             mesh_,
-            dimensionedScalar("zero", dimensionSet(0, 0, 0, 0, 0), 0.0)
+            dimensionedScalar("zero", dimless, 0.0)
         )
     );
 
@@ -311,10 +313,47 @@ Foam::KinematicCloud<ParcelType>::alpha() const
         alpha[cellI] += p.nParticle()*p.mass();
     }
 
-    alpha /= (mesh().cellVolumes()*rho_);
+    alpha /= (mesh().V()*rho_);
 
     return talpha;
 }
 
 
+template<class ParcelType>
+inline const Foam::tmp<Foam::volScalarField>
+Foam::KinematicCloud<ParcelType>::rhoEff() const
+{
+    tmp<volScalarField> trhoEff
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                this->name() + "RhoEff",
+                this->db().time().timeName(),
+                this->db(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
+            ),
+            mesh_,
+            dimensionedScalar("zero", dimDensity, 0.0)
+        )
+    );
+
+    scalarField& rhoEff = trhoEff().internalField();
+    forAllConstIter(typename KinematicCloud<ParcelType>, *this, iter)
+    {
+        const ParcelType& p = iter();
+        const label cellI = p.cell();
+
+        rhoEff[cellI] += p.nParticle()*p.mass();
+    }
+
+    rhoEff /= mesh().V();
+
+    return trhoEff;
+}
+
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
index a6d5a83041..56a497803a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
@@ -176,34 +176,12 @@ void Foam::ConeInjection<CloudType>::setPositionAndCell
 (
     const label,
     const scalar,
-    const polyMeshInfo& meshInfo,
     vector& position,
     label& cellOwner
 )
 {
     position = position_;
     this->findCellAtPosition(cellOwner, position);
-
-    if (meshInfo.caseIs2d())
-    {
-        if (meshInfo.caseIs2dWedge())
-        {
-            position.component(meshInfo.emptyComponent()) = 0.0;
-        }
-        else if (meshInfo.caseIs2dSlab())
-        {
-            position.component(meshInfo.emptyComponent()) =
-                meshInfo.centrePoint().component(meshInfo.emptyComponent());
-        }
-        else
-        {
-            FatalErrorIn
-            (
-                "void Foam::ConeInjection<CloudType>::setPositionAndCell"
-            )   << "Could not determine 2-D case geometry" << nl
-                << abort(FatalError);
-        }
-    }
 }
 
 
@@ -211,8 +189,7 @@ template<class CloudType>
 Foam::vector Foam::ConeInjection<CloudType>::velocity
 (
     const label,
-    const scalar time,
-    const polyMeshInfo& meshInfo
+    const scalar time
 )
 {
     const scalar deg2Rad = mathematicalConstant::pi/180.0;
@@ -231,13 +208,6 @@ Foam::vector Foam::ConeInjection<CloudType>::velocity
     vector normal = alpha*(tanVec1_*cos(beta) + tanVec2_*sin(beta));
     vector dirVec = dcorr*direction_;
     dirVec += normal;
-
-    // Remove empty component of velocity for slab cases
-    if (meshInfo.caseIs2dSlab())
-    {
-        dirVec.component(meshInfo.emptyComponent()) = 0.0;
-    }
-
     dirVec /= mag(dirVec);
 
     return Umag_().value(t)*dirVec;
@@ -255,4 +225,10 @@ Foam::scalar Foam::ConeInjection<CloudType>::d0
 }
 
 
+template<class CloudType>
+bool Foam::ConeInjection<CloudType>::validInjection(const label iParcel)
+{
+    return true;
+}
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
index 610f201a1d..22faf297eb 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
@@ -162,7 +162,6 @@ public:
             (
                 const label iParcel,
                 const scalar time,
-                const polyMeshInfo& meshInfo,
                 vector& position,
                 label& cellOwner
             );
@@ -170,17 +169,20 @@ public:
             //- Return the velocity of the parcel to introduce at a time
             vector velocity
             (
-                const label,
-                const scalar time,
-                const polyMeshInfo& meshInfo
+                const label iParcel,
+                const scalar time
             );
 
             //- Return the diameter of the parcel to introduce at a time
             scalar d0
             (
-                const label,
-                const scalar
+                const label iParcel,
+                const scalar time
             ) const;
+
+            //- Return flag to identify whether or not injection in cellI is
+            //  permitted
+            bool validInjection(const label iParcel);
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 0aaeb44cd4..98c762f0ec 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -228,6 +228,49 @@ Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
 }
 
 
+template<class CloudType>
+void Foam::InjectionModel<CloudType>::geometryCorrection(vector& pos) const
+{
+    if (owner_.meshInfo().caseIs2d())
+    {
+        if (owner_.meshInfo().caseIs2dWedge())
+        {
+            pos.component(owner_.meshInfo().emptyComponent()) = 0.0;
+        }
+        else if (owner_.meshInfo().caseIs2dSlab())
+        {
+            pos.component(owner_.meshInfo().emptyComponent()) =
+                owner_.meshInfo().centrePoint().component
+                (
+                    owner_.meshInfo().emptyComponent()
+                );
+        }
+        else
+        {
+            FatalErrorIn
+            (
+                "void Foam::InjectionModel<CloudType>::geometryCorrection"
+                "(vector& pos)"
+            )   << "Could not determine 2-D case geometry" << nl
+                << abort(FatalError);
+        }
+    }
+}
+
+
+template<class CloudType>
+void Foam::InjectionModel<CloudType>::velocityCorrection(vector& U) const
+{
+    if (owner_.meshInfo().caseIs2dSlab())
+    {
+        U.component(owner_.meshInfo().emptyComponent()) =
+            owner_.meshInfo().centrePoint().component
+            (
+                owner_.meshInfo().emptyComponent()
+            );
+    }
+}
+
 template<class CloudType>
 void Foam::InjectionModel<CloudType>::postInjectCheck()
 {
@@ -380,33 +423,40 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
         // Determine the injection position and owner cell
         label cellI = -1;
         vector pos = vector::zero;
-        setPositionAndCell(iParcel, timeInj, owner_.meshInfo(), pos, cellI);
+        setPositionAndCell(iParcel, timeInj, pos, cellI);
 
         if (cellI >= 0)
         {
-            // Diameter of parcels
-            scalar d = d0(iParcel, timeInj);
+            if (validInjection(iParcel))
+            {
+                // Diameter of parcels
+                scalar d = d0(iParcel, timeInj);
 
-            // Number of particles per parcel
-            scalar nP = setNumberOfParticles
-            (
-                newParcels,
-                newVolume,
-                volFraction,
-                d,
-                rho
-            );
+                // Number of particles per parcel
+                scalar nP = setNumberOfParticles
+                (
+                    newParcels,
+                    newVolume,
+                    volFraction,
+                    d,
+                    rho
+                );
 
-            // Velocity of parcels
-            vector U = velocity(iParcel, timeInj, owner_.meshInfo());
+                // Velocity of parcels
+                vector U = velocity(iParcel, timeInj);
 
-            // Lagrangian timestep
-            scalar dt = time - timeInj;
+                // Lagrangian timestep
+                scalar dt = time - timeInj;
 
-            // Add the new parcel
-            td.cloud().addNewParcel(pos, cellI, d, U, nP, dt);
-            massInjected_ += nP*rho*mathematicalConstant::pi*pow3(d)/6.0;
-            parcelsAdded_++;
+                // Apply corrections for 2-D cases
+                geometryCorrection(pos);
+                velocityCorrection(U);
+
+                // Add the new parcel
+                td.cloud().addNewParcel(pos, cellI, d, U, nP, dt);
+                massInjected_ += nP*rho*mathematicalConstant::pi*pow3(d)/6.0;
+                parcelsAdded_++;
+            }
         }
         else
         {
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index dd7d71de24..4c4d546c17 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -88,6 +88,12 @@ private:
         //- Write injector properties
         void writeProps();
 
+        //- Geometry correction for 2-D cases
+        void geometryCorrection(vector& pos) const;
+
+        //- Velocity correction for 2-D cases
+        void velocityCorrection(vector& U) const;
+
 
 protected:
 
@@ -149,6 +155,9 @@ protected:
             const scalar time1
         ) const = 0;
 
+        //- Additional flag to identify whether or not injection in cellI is
+        //  permitted
+        virtual bool validInjection(const label iParcel) = 0;
 
         //- Determine properties for next time step/injection interval
         virtual void prepareForNextTimeStep
@@ -287,7 +296,6 @@ public:
             (
                 const label iParcel,
                 const scalar time,
-                const polyMeshInfo& meshInfo,
                 vector& position,
                 label& cellOwner
             ) = 0;
@@ -296,8 +304,7 @@ public:
             virtual vector velocity
             (
                 const label iParcel,
-                const scalar time,
-                const polyMeshInfo& meshInfo
+                const scalar time
             ) = 0;
 
             //- Return the diameter of the parcel to introduce at a time
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
index 6a8361d7df..a059b81b7c 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
@@ -139,34 +139,12 @@ void Foam::ManualInjection<CloudType>::setPositionAndCell
 (
     const label iParcel,
     const scalar time,
-    const polyMeshInfo& meshInfo,
     vector& position,
     label& cellOwner
 )
 {
     position = positions_[iParcel];
     this->findCellAtPosition(cellOwner, position);
-
-    if (meshInfo.caseIs2d())
-    {
-        if (meshInfo.caseIs2dWedge())
-        {
-            position.component(meshInfo.emptyComponent()) = 0.0;
-        }
-        else if (meshInfo.caseIs2dSlab())
-        {
-            position.component(meshInfo.emptyComponent()) =
-                meshInfo.centrePoint().component(meshInfo.emptyComponent());
-        }
-        else
-        {
-            FatalErrorIn
-            (
-                "void Foam::ManualInjection<CloudType>::setPositionAndCell"
-            )   << "Could not determine 2-D case geometry" << nl
-                << abort(FatalError);
-        }
-    }
 }
 
 
@@ -174,18 +152,10 @@ template<class CloudType>
 Foam::vector Foam::ManualInjection<CloudType>::velocity
 (
     const label,
-    const scalar,
-    const polyMeshInfo& meshInfo
+    const scalar
 )
 {
-    vector vel = U0_;
-    if (meshInfo.caseIs2dSlab())
-    {
-        vel.component(meshInfo.emptyComponent()) =
-            meshInfo.centrePoint().component(meshInfo.emptyComponent());
-    }
-
-    return vel;
+    return U0_;
 }
 
 
@@ -200,4 +170,11 @@ Foam::scalar Foam::ManualInjection<CloudType>::d0
 }
 
 
+template<class CloudType>
+bool Foam::ManualInjection<CloudType>::validInjection(const label)
+{
+    return true;
+}
+
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
index 8403386357..d97ac34524 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
@@ -33,11 +33,7 @@ Description
       - Parcel positions in file @c positionsFile
       - Initial parcel velocity
     - Parcel diameters obtained by PDF model
-    - All parcels introduced at the start of the calculation
-
-Note
-    Not suitable for 2-D slab/wedge simulations unless the @c positionsFile
-    describes 2-D data.
+    - All parcels introduced at SOI
 
 SourceFiles
     ManualInjection.C
@@ -143,7 +139,6 @@ public:
             (
                 const label iParcel,
                 const scalar time,
-                const polyMeshInfo& meshInfo,
                 vector& position,
                 label& cellOwner
             );
@@ -151,17 +146,20 @@ public:
             //- Return the velocity of the parcel to introduce at a time
             vector velocity
             (
-                const label,
-                const scalar time,
-                const polyMeshInfo& meshInfo
+                const label iParcel,
+                const scalar time
             );
 
             //- Return the diameter of the parcel to introduce at a time
             scalar d0
             (
-                const label,
+                const label iParcel,
                 const scalar
             ) const;
+
+            //- Return flag to identify whether or not injection in cellI is
+            //  permitted
+            bool validInjection(const label iParcel);
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
index fcbd1b6981..5e51bc26a9 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
@@ -92,7 +92,6 @@ void Foam::NoInjection<CloudType>::setPositionAndCell
 (
     const label,
     const scalar,
-    const polyMeshInfo&,
     vector&,
     label&
 )
@@ -103,8 +102,7 @@ template<class CloudType>
 Foam::vector Foam::NoInjection<CloudType>::velocity
 (
     const label,
-    const scalar,
-    const polyMeshInfo&
+    const scalar
 )
 {
     return vector::zero;
@@ -122,4 +120,11 @@ Foam::scalar Foam::NoInjection<CloudType>::d0
 }
 
 
+template<class CloudType>
+bool Foam::NoInjection<CloudType>::validInjection(const label)
+{
+    return false;
+}
+
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
index cb849a4951..ab6a2ec54a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
@@ -107,7 +107,6 @@ public:
             (
                 const label iParcel,
                 const scalar time,
-                const polyMeshInfo& meshInfo,
                 vector& position,
                 label& cellOwner
             );
@@ -115,17 +114,20 @@ public:
             //- Return the velocity of the parcel to introduce at a time
             vector velocity
             (
-                const label,
-                const scalar time,
-                const polyMeshInfo& meshInfo
+                const label iParcel,
+                const scalar time
             );
 
             //- Return the diameter of the parcel to introduce at a time
             scalar d0
             (
-                const label,
-                const scalar
+                const label iParcel,
+                const scalar time
             ) const;
+
+            //- Return flag to identify whether or not injection in cellI is
+            //  permitted
+            bool validInjection(const label cellI);
 };
 
 

From 295b0e7367dcb0c969c2e76d486c2886f752463b Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 3 Mar 2009 18:11:09 +0000
Subject: [PATCH 018/175] consistency update

---
 .../InjectionModel/ConeInjection/ConeInjection.C |  2 +-
 .../InjectionModel/ConeInjection/ConeInjection.H |  8 ++++----
 .../InjectionModel/InjectionModel.C              | 16 ++++++++--------
 .../InjectionModel/InjectionModel.H              |  8 ++++----
 .../ManualInjection/ManualInjection.C            |  8 ++++----
 .../ManualInjection/ManualInjection.H            |  8 ++++----
 .../InjectionModel/NoInjection/NoInjection.H     |  6 +++---
 7 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
index 56a497803a..167e0937f8 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
@@ -226,7 +226,7 @@ Foam::scalar Foam::ConeInjection<CloudType>::d0
 
 
 template<class CloudType>
-bool Foam::ConeInjection<CloudType>::validInjection(const label iParcel)
+bool Foam::ConeInjection<CloudType>::validInjection(const label parcelI)
 {
     return true;
 }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
index 22faf297eb..0c07e4622a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
@@ -160,7 +160,7 @@ public:
             //- Set the injection position and owner cell
             void setPositionAndCell
             (
-                const label iParcel,
+                const label parcelI,
                 const scalar time,
                 vector& position,
                 label& cellOwner
@@ -169,20 +169,20 @@ public:
             //- Return the velocity of the parcel to introduce at a time
             vector velocity
             (
-                const label iParcel,
+                const label parcelI,
                 const scalar time
             );
 
             //- Return the diameter of the parcel to introduce at a time
             scalar d0
             (
-                const label iParcel,
+                const label parcelI,
                 const scalar time
             ) const;
 
             //- Return flag to identify whether or not injection in cellI is
             //  permitted
-            bool validInjection(const label iParcel);
+            bool validInjection(const label parcelI);
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 98c762f0ec..a8fdec60c0 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -415,22 +415,22 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
     const scalar padTime = max(0.0, SOI_ - time0_);
 
     // Introduce new parcels linearly with time
-    for (label iParcel=0; iParcel<newParcels; iParcel++)
+    for (label parcelI=0; parcelI<newParcels; parcelI++)
     {
-        // Calculate the pseudo time of injection for parcel 'iParcel'
-        scalar timeInj = time0_ + padTime + deltaT*iParcel/newParcels;
+        // Calculate the pseudo time of injection for parcel 'parcelI'
+        scalar timeInj = time0_ + padTime + deltaT*parcelI/newParcels;
 
         // Determine the injection position and owner cell
         label cellI = -1;
         vector pos = vector::zero;
-        setPositionAndCell(iParcel, timeInj, pos, cellI);
+        setPositionAndCell(parcelI, timeInj, pos, cellI);
 
         if (cellI >= 0)
         {
-            if (validInjection(iParcel))
+            if (validInjection(parcelI))
             {
                 // Diameter of parcels
-                scalar d = d0(iParcel, timeInj);
+                scalar d = d0(parcelI, timeInj);
 
                 // Number of particles per parcel
                 scalar nP = setNumberOfParticles
@@ -443,7 +443,7 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
                 );
 
                 // Velocity of parcels
-                vector U = velocity(iParcel, timeInj);
+                vector U = velocity(parcelI, timeInj);
 
                 // Lagrangian timestep
                 scalar dt = time - timeInj;
@@ -462,7 +462,7 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
         {
             WarningIn("Foam::InjectionModel<CloudType>::inject(TrackData& td)")
                 << "Failed to inject new parcel:" << nl
-                << "    id = " << iParcel << ", position = " << pos
+                << "    id = " << parcelI << ", position = " << pos
                 << nl << endl;
         }
     }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index 4c4d546c17..5c2a00a4d5 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -157,7 +157,7 @@ protected:
 
         //- Additional flag to identify whether or not injection in cellI is
         //  permitted
-        virtual bool validInjection(const label iParcel) = 0;
+        virtual bool validInjection(const label parcelI) = 0;
 
         //- Determine properties for next time step/injection interval
         virtual void prepareForNextTimeStep
@@ -294,7 +294,7 @@ public:
             //- Set the injection position and owner cell
             virtual void setPositionAndCell
             (
-                const label iParcel,
+                const label parcelI,
                 const scalar time,
                 vector& position,
                 label& cellOwner
@@ -303,14 +303,14 @@ public:
             //- Return the velocity of the parcel to introduce at a time
             virtual vector velocity
             (
-                const label iParcel,
+                const label parcelI,
                 const scalar time
             ) = 0;
 
             //- Return the diameter of the parcel to introduce at a time
             virtual scalar d0
             (
-                const label iParcel,
+                const label parcelI,
                 const scalar time
             ) const = 0;
 };
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
index a059b81b7c..6d71828c23 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
@@ -137,13 +137,13 @@ Foam::scalar Foam::ManualInjection<CloudType>::timeEnd() const
 template<class CloudType>
 void Foam::ManualInjection<CloudType>::setPositionAndCell
 (
-    const label iParcel,
+    const label parcelI,
     const scalar time,
     vector& position,
     label& cellOwner
 )
 {
-    position = positions_[iParcel];
+    position = positions_[parcelI];
     this->findCellAtPosition(cellOwner, position);
 }
 
@@ -162,11 +162,11 @@ Foam::vector Foam::ManualInjection<CloudType>::velocity
 template<class CloudType>
 Foam::scalar Foam::ManualInjection<CloudType>::d0
 (
-    const label iParcel,
+    const label parcelI,
     const scalar
 ) const
 {
-    return diameters_[iParcel];
+    return diameters_[parcelI];
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
index d97ac34524..6dde70c746 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
@@ -137,7 +137,7 @@ public:
             //- Set the injection position and owner cell
             void setPositionAndCell
             (
-                const label iParcel,
+                const label parcelI,
                 const scalar time,
                 vector& position,
                 label& cellOwner
@@ -146,20 +146,20 @@ public:
             //- Return the velocity of the parcel to introduce at a time
             vector velocity
             (
-                const label iParcel,
+                const label parcelI,
                 const scalar time
             );
 
             //- Return the diameter of the parcel to introduce at a time
             scalar d0
             (
-                const label iParcel,
+                const label parcelI,
                 const scalar
             ) const;
 
             //- Return flag to identify whether or not injection in cellI is
             //  permitted
-            bool validInjection(const label iParcel);
+            bool validInjection(const label parcelI);
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
index ab6a2ec54a..e05790a64e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
@@ -105,7 +105,7 @@ public:
             //- Set the injection position and owner cell
             void setPositionAndCell
             (
-                const label iParcel,
+                const label parcelI,
                 const scalar time,
                 vector& position,
                 label& cellOwner
@@ -114,14 +114,14 @@ public:
             //- Return the velocity of the parcel to introduce at a time
             vector velocity
             (
-                const label iParcel,
+                const label parcelI,
                 const scalar time
             );
 
             //- Return the diameter of the parcel to introduce at a time
             scalar d0
             (
-                const label iParcel,
+                const label parcelI,
                 const scalar time
             ) const;
 

From 5d3db386e7d1666a70db7196d0a1e7bcd95d3755 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 3 Mar 2009 18:46:53 +0000
Subject: [PATCH 019/175] initial check-in of entrainment injection model

---
 .../makeBasicKinematicParcelInjectionModels.C |  15 +-
 ...cReactingMultiphaseParcelInjectionModels.C |  15 +-
 .../makeBasicReactingParcelInjectionModels.C  |  15 +-
 .../makeBasicThermoParcelInjectionModels.C    |  33 ++-
 .../EntrainmentInjection.C                    | 231 ++++++++++++++++++
 .../EntrainmentInjection.H                    | 196 +++++++++++++++
 6 files changed, 488 insertions(+), 17 deletions(-)
 create mode 100755 src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/EntrainmentInjection/EntrainmentInjection.C
 create mode 100755 src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/EntrainmentInjection/EntrainmentInjection.H

diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/submodels/makeBasicKinematicParcelInjectionModels.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/submodels/makeBasicKinematicParcelInjectionModels.C
index c722ac91fd..ca6eea491e 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/submodels/makeBasicKinematicParcelInjectionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/submodels/makeBasicKinematicParcelInjectionModels.C
@@ -27,9 +27,10 @@ License
 #include "basicKinematicParcel.H"
 #include "KinematicCloud.H"
 
-#include "NoInjection.H"
-#include "ManualInjection.H"
 #include "ConeInjection.H"
+#include "EntrainmentInjection.H"
+#include "ManualInjection.H"
+#include "NoInjection.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -40,7 +41,13 @@ namespace Foam
     // Add instances of injection model to the table
     makeInjectionModelType
     (
-        NoInjection,
+        ConeInjection,
+        KinematicCloud,
+        basicKinematicParcel
+    );
+    makeInjectionModelType
+    (
+        EntrainmentInjection,
         KinematicCloud,
         basicKinematicParcel
     );
@@ -52,7 +59,7 @@ namespace Foam
     );
     makeInjectionModelType
     (
-        ConeInjection,
+        NoInjection,
         KinematicCloud,
         basicKinematicParcel
     );
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelInjectionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelInjectionModels.C
index 6d8b5aeac9..38b738d924 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelInjectionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelInjectionModels.C
@@ -27,9 +27,10 @@ License
 #include "basicReactingMultiphaseParcel.H"
 #include "ReactingCloud.H"
 
-#include "NoInjection.H"
-#include "ManualInjection.H"
 #include "ConeInjection.H"
+#include "EntrainmentInjection.H"
+#include "ManualInjection.H"
+#include "NoInjection.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -40,7 +41,13 @@ namespace Foam
     // Add instances of injection model to the table
     makeInjectionModelType
     (
-        NoInjection,
+        ConeInjection,
+        KinematicCloud,
+        basicReactingMultiphaseParcel
+    );
+    makeInjectionModelType
+    (
+        EntrainmentInjection,
         KinematicCloud,
         basicReactingMultiphaseParcel
     );
@@ -52,7 +59,7 @@ namespace Foam
     );
     makeInjectionModelType
     (
-        ConeInjection,
+        NoInjection,
         KinematicCloud,
         basicReactingMultiphaseParcel
     );
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelInjectionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelInjectionModels.C
index 1af1e37088..b5a7e83610 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelInjectionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelInjectionModels.C
@@ -27,9 +27,10 @@ License
 #include "basicReactingParcel.H"
 #include "ReactingCloud.H"
 
-#include "NoInjection.H"
-#include "ManualInjection.H"
 #include "ConeInjection.H"
+#include "EntrainmentInjection.H"
+#include "ManualInjection.H"
+#include "NoInjection.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -40,7 +41,13 @@ namespace Foam
     // Add instances of injection model to the table
     makeInjectionModelType
     (
-        NoInjection,
+        ConeInjection,
+        KinematicCloud,
+        basicReactingParcel
+    );
+    makeInjectionModelType
+    (
+        EntrainmentInjection,
         KinematicCloud,
         basicReactingParcel
     );
@@ -52,7 +59,7 @@ namespace Foam
     );
     makeInjectionModelType
     (
-        ConeInjection,
+        NoInjection,
         KinematicCloud,
         basicReactingParcel
     );
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelInjectionModels.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelInjectionModels.C
index f2f433b021..feb948d66c 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelInjectionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelInjectionModels.C
@@ -26,9 +26,11 @@ License
 
 #include "basicThermoParcel.H"
 #include "ThermoCloud.H"
-#include "NoInjection.H"
-#include "ManualInjection.H"
+
 #include "ConeInjection.H"
+#include "EntrainmentInjection.H"
+#include "ManualInjection.H"
+#include "NoInjection.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -37,11 +39,32 @@ namespace Foam
     makeInjectionModel(KinematicCloud<basicThermoParcel>);
 
     // Add instances of injection model to the table
-    makeInjectionModelType(NoInjection, KinematicCloud, basicThermoParcel);
 
-    makeInjectionModelType(ManualInjection, KinematicCloud, basicThermoParcel);
+    makeInjectionModelType
+    (
+        ConeInjection,
+        KinematicCloud,
+        basicThermoParcel
+    );
+    makeInjectionModelType
+    (
+        EntrainmentInjection,
+        KinematicCloud,
+        basicThermoParcel
+    );
+    makeInjectionModelType
+    (
+        ManualInjection,
+        KinematicCloud,
+        basicThermoParcel
+    );
+    makeInjectionModelType
+    (
+        NoInjection,
+        KinematicCloud,
+        basicThermoParcel
+    );
 
-    makeInjectionModelType(ConeInjection, KinematicCloud, basicThermoParcel);
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/EntrainmentInjection/EntrainmentInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/EntrainmentInjection/EntrainmentInjection.C
new file mode 100755
index 0000000000..758a14ee33
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/EntrainmentInjection/EntrainmentInjection.C
@@ -0,0 +1,231 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 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 "EntrainmentInjection.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::label Foam::EntrainmentInjection<CloudType>::parcelsToInject
+(
+    const scalar time0,
+    const scalar time1
+) const
+{
+    if (sum(nParcelsInjected_) < nParcelsPerInjector_*positions_.size())
+    {
+        return positions_.size();
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::EntrainmentInjection<CloudType>::volumeToInject
+(
+    const scalar time0,
+    const scalar time1
+) const
+{
+    if (sum(nParcelsInjected_) < nParcelsPerInjector_*positions_.size())
+    {
+        return this->volumeTotal_/nParcelsPerInjector_;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::EntrainmentInjection<CloudType>::EntrainmentInjection
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+:
+    InjectionModel<CloudType>(dict, owner, typeName),
+    c_(readScalar(this->coeffDict().lookup("c"))),
+    rhoc_
+    (
+        owner.db().objectRegistry::lookupObject<volScalarField>
+        (
+            this->coeffDict().lookup("rhoc")
+        )
+    ),
+    rhol_
+    (
+        owner.db().objectRegistry::lookupObject<volScalarField>
+        (
+            this->coeffDict().lookup("rhol")
+        )
+    ),
+    Uc_
+    (
+        owner.db().objectRegistry::lookupObject<volVectorField>
+        (
+            this->coeffDict().lookup("Uc")
+        )
+    ),
+    positionsFile_(this->coeffDict().lookup("positionsFile")),
+    positions_
+    (
+        IOobject
+        (
+            positionsFile_,
+            owner.db().time().constant(),
+            owner.mesh(),
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        )
+    ),
+    injectorCells_(positions_.size()),
+    nParcelsPerInjector_
+    (
+        readLabel(this->coeffDict().lookup("parcelsPerInjector"))
+    ),
+    nParcelsInjected_(positions_.size(), 0),
+    U0_(this->coeffDict().lookup("U0")),
+    diameters_(positions_.size()),
+    parcelPDF_
+    (
+        pdf::New
+        (
+            this->coeffDict().subDict("parcelPDF"),
+            owner.rndGen()
+        )
+    )
+{
+    // Construct parcel diameters - one per injector cell
+    forAll(diameters_, i)
+    {
+        diameters_[i] = parcelPDF_->sample();
+    }
+
+    // Determine total volume of particles to inject
+    this->volumeTotal_ =
+         nParcelsPerInjector_
+        *sum(pow3(diameters_))
+        *mathematicalConstant::pi/6.0;
+
+    // Set/cahce the injector cells
+    forAll(positions_, i)
+    {
+        this->findCellAtPosition
+        (
+            injectorCells_[i],
+            positions_[i]
+        );
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::EntrainmentInjection<CloudType>::~EntrainmentInjection()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+bool Foam::EntrainmentInjection<CloudType>::active() const
+{
+    return true;
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::EntrainmentInjection<CloudType>::timeEnd() const
+{
+    return GREAT;
+}
+
+
+template<class CloudType>
+void Foam::EntrainmentInjection<CloudType>::setPositionAndCell
+(
+    const label parcelI,
+    const scalar,
+    vector& position,
+    label& cellOwner
+)
+{
+    position = positions_[parcelI];
+    cellOwner = injectorCells_[parcelI];
+}
+
+
+template<class CloudType>
+Foam::vector Foam::EntrainmentInjection<CloudType>::velocity
+(
+    const label,
+    const scalar
+)
+{
+    return U0_;
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::EntrainmentInjection<CloudType>::d0
+(
+    const label parcelI,
+    const scalar
+) const
+{
+    return diameters_[parcelI];
+}
+
+
+template<class CloudType>
+bool Foam::EntrainmentInjection<CloudType>::validInjection(const label parcelI)
+{
+
+    const label cellI = injectorCells_[parcelI];
+    if
+    (
+         nParcelsInjected_[parcelI] < nParcelsPerInjector_
+      && rhol_[cellI] < c_*0.5*rhoc_[cellI]*magSqr(Uc_[cellI])
+    )
+    {
+        nParcelsInjected_[parcelI]++;
+        return true;
+    }
+
+    return false;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/EntrainmentInjection/EntrainmentInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/EntrainmentInjection/EntrainmentInjection.H
new file mode 100755
index 0000000000..845a0d58bc
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/EntrainmentInjection/EntrainmentInjection.H
@@ -0,0 +1,196 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2008 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::EntrainmentInjection
+
+Description
+
+SourceFiles
+    EntrainmentInjection.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef EntrainmentInjection_H
+#define EntrainmentInjection_H
+
+#include "InjectionModel.H"
+#include "pdf.H"
+#include "volFieldsFwd.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class EntrainmentInjection Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class EntrainmentInjection
+:
+    public InjectionModel<CloudType>
+{
+    // Private data
+
+        // Model parameters
+
+            //- Injection permission: rhol <= c_*0.5*rho*|U|^2
+            const scalar c_;
+
+            //- Carrier phase density field
+            const volScalarField& rhoc_;
+
+            //- Lagrangian phase density field
+            const scalarField& rhol_;
+
+            //- Carrier phase velocity field
+            const vectorField& Uc_;
+
+
+        // Injector properties
+
+            //- Name of file containing positions data
+            const word positionsFile_;
+
+            //- Field of injector (x,y,z) positions
+            vectorIOField positions_;
+
+            //- Field of cell labels corresoponding to injector positions
+            labelField injectorCells_;
+
+            //- nParcels per injector
+            const label nParcelsPerInjector_;
+
+            //- Field of number of parcels injected for each injector
+            labelField nParcelsInjected_;
+
+
+        // Parcel properties
+
+            //- Initial parcel velocity
+            const vector U0_;
+
+            //- Field of parcel diameters
+            scalarField diameters_;
+
+            //- Parcel size PDF model
+            const autoPtr<pdf> parcelPDF_;
+
+
+protected:
+
+    // Protected member functions
+
+        //- Number of parcels to introduce over the time step
+        label parcelsToInject
+        (
+            const scalar time0,
+            const scalar time1
+        ) const;
+
+        //- Volume of parcels to introduce over the time step
+        scalar volumeToInject
+        (
+            const scalar time0,
+            const scalar time1
+        ) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("EntrainmentInjection");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        EntrainmentInjection
+        (
+            const dictionary& dict,
+            CloudType& owner
+        );
+
+
+    // Destructor
+    virtual ~EntrainmentInjection();
+
+
+    // 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
+            void setPositionAndCell
+            (
+                const label parcelI,
+                const scalar time,
+                vector& position,
+                label& cellOwner
+            );
+
+            //- Return the velocity of the parcel to introduce at a time
+            vector velocity
+            (
+                const label parcelI,
+                const scalar time
+            );
+
+            //- Return the diameter of the parcel to introduce at a time
+            scalar d0
+            (
+                const label parcelI,
+                const scalar time
+            ) const;
+
+            //- Return flag to identify whether or not injection in cellI is
+            //  permitted
+            bool validInjection(const label parcelI);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "EntrainmentInjection.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From cb697ea37a7ae67335de6995b4d11500258a0983 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 3 Mar 2009 18:54:10 +0000
Subject: [PATCH 020/175] moved warningIn msgs to inside if (debug) statements

---
 .../cellPointWeight/cellPointWeight.C         | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.C b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.C
index 6666d347f0..65ef6826fa 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.C
@@ -164,12 +164,12 @@ void Foam::cellPointWeight::findTetrahedron
         }
     }
 
-    WarningIn
-    (
-        "cellPointWeight::findTetrahedron"
-        "(const polyMesh&, const vector&, const label, const label)"
-    )   << "Tetrahedron search failed; using closest tet values to point "
-        << nl << "    cell: " << cellIndex << endl;
+    if (debug)
+    {
+        Pout<< "cellPointWeight::findTetrahedron" << nl
+            << "    Tetrahedron search failed; using closest tet values to "
+            << "point " << nl << "    cell: " << cellIndex << nl << endl;
+    }
 
     const labelList& facePointsClose = mesh.faces()[cellFaces[faceClose]];
     faceVertices_[0] = facePointsClose[0];
@@ -284,13 +284,12 @@ void Foam::cellPointWeight::findTriangle
         pointI++;
     }
 
-    WarningIn
-    (
-        "Foam::cellPointWeight::findTriangle"
-        "(const polyMesh&, const vector&, const label)"
-    )   << "Triangle search failed; using closest triangle to "
-        << "point" << nl
-        << "    cell face: " << faceIndex << endl;
+    if (debug)
+    {
+        Pout<< "Foam::cellPointWeight::findTriangle"
+            << "Triangle search failed; using closest triangle to point" << nl
+            << "    cell face: " << faceIndex << nl << endl;
+    }
 
     // Indices of the cell vertices making up the triangle
     faceVertices_[0] = facePoints[0];

From 3b07525b5ad6ec90244fbea480e0338ade5469e5 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 4 Mar 2009 09:43:45 +0000
Subject: [PATCH 021/175] added interpolationCellPointWallModified

---
 src/finiteVolume/Make/files                   |   2 +
 .../cellPointWeight/cellPointWeight.H         |   6 +-
 .../interpolationCellPoint.H                  |   8 +-
 .../cellPointWeightWallModified.C             |  72 +++++++++++++
 .../cellPointWeightWallModified.H             |  79 ++++++++++++++
 .../interpolationCellPointWallModified.C      |  42 ++++++++
 .../interpolationCellPointWallModified.H      | 102 ++++++++++++++++++
 .../interpolationCellPointWallModifiedI.H     |  69 ++++++++++++
 .../makeInterpolationCellPointWallModified.C  |  36 +++++++
 9 files changed, 411 insertions(+), 5 deletions(-)
 create mode 100644 src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/cellPointWeightWallModified/cellPointWeightWallModified.C
 create mode 100644 src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/cellPointWeightWallModified/cellPointWeightWallModified.H
 create mode 100644 src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.C
 create mode 100644 src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.H
 create mode 100644 src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModifiedI.H
 create mode 100644 src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/makeInterpolationCellPointWallModified.C

diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 34a4606e08..847d91abc6 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -164,6 +164,8 @@ $(interpolation)/interpolationCell/makeInterpolationCell.C
 $(interpolation)/interpolationCellPoint/cellPointWeight/cellPointWeight.C
 $(interpolation)/interpolationCellPoint/makeInterpolationCellPoint.C
 $(interpolation)/interpolationCellPointFace/makeInterpolationCellPointFace.C
+$(interpolation)/interpolationCellPointWallModified/cellPointWeightWallModified/cellPointWeightWallModified.C
+$(interpolation)/interpolationCellPointWallModified/makeInterpolationCellPointWallModified.C
 
 volPointInterpolation = interpolation/volPointInterpolation
 $(volPointInterpolation)/pointPatchInterpolation/pointPatchInterpolation.C
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.H
index 767c903809..937e277b61 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.H
@@ -51,7 +51,9 @@ class polyMesh;
 
 class cellPointWeight
 {
-    // Private data
+protected:
+
+    // Protected data
 
        //- Cell index
        const label cellIndex_;
@@ -63,7 +65,7 @@ class cellPointWeight
        FixedList<label, 3> faceVertices_;
 
 
-    // Private Member Functions
+    // Protected Member Functions
 
         void findTetrahedron
         (
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H
index 9388a85fc8..bbe76871ba 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H
@@ -42,7 +42,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class interpolationCellPoint Declaration
+                   Class interpolationCellPoint Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Type>
@@ -50,7 +50,9 @@ class interpolationCellPoint
 :
     public interpolation<Type>
 {
-    // Private data
+protected:
+
+    // Protected data
 
         //- Interpolated volfield
         const GeometricField<Type, pointPatchField, pointMesh> psip_;
@@ -79,7 +81,7 @@ public:
         //- Interpolate field to the given point in the given cell
         inline Type interpolate
         (
-            const vector& position, 
+            const vector& position,
             const label nCell,
             const label facei = -1
         ) const;
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/cellPointWeightWallModified/cellPointWeightWallModified.C b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/cellPointWeightWallModified/cellPointWeightWallModified.C
new file mode 100644
index 0000000000..f33af9e7e3
--- /dev/null
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/cellPointWeightWallModified/cellPointWeightWallModified.C
@@ -0,0 +1,72 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "cellPointWeightWallModified.H"
+#include "wallPolyPatch.H"
+#include "polyMesh.H"
+#include "polyBoundaryMesh.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::cellPointWeightWallModified::cellPointWeightWallModified
+(
+    const polyMesh& mesh,
+    const vector& position,
+    const label cellIndex,
+    const label faceIndex
+)
+:
+    cellPointWeight(mesh, position, cellIndex, faceIndex)
+{
+    if (faceIndex < 0)
+    {
+        findTetrahedron(mesh, position, cellIndex);
+    }
+    else
+    {
+        const polyBoundaryMesh& bm = mesh.boundaryMesh();
+        label patchI = bm.whichPatch(faceIndex);
+        if (patchI != -1)
+        {
+            if (isA<wallPolyPatch>(bm[patchI]))
+            {
+                // Apply cell centre value wall faces
+                weights_[0] = 0.0;
+                weights_[1] = 0.0;
+                weights_[2] = 0.0;
+                weights_[3] = 1.0;
+            }
+        }
+        else
+        {
+            // Interpolate
+            findTriangle(mesh, position, faceIndex);
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/cellPointWeightWallModified/cellPointWeightWallModified.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/cellPointWeightWallModified/cellPointWeightWallModified.H
new file mode 100644
index 0000000000..e7903a7338
--- /dev/null
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/cellPointWeightWallModified/cellPointWeightWallModified.H
@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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::cellPointWeightWallModified
+
+Description
+    Foam::cellPointWeightWallModified
+
+SourceFiles
+    cellPointWeightWallModified.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef cellPointWeightWallModified_H
+#define cellPointWeightWallModified_H
+
+#include "cellPointWeight.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class polyMesh;
+
+/*---------------------------------------------------------------------------*\
+                 Class cellPointWeightWallModified Declaration
+\*---------------------------------------------------------------------------*/
+
+class cellPointWeightWallModified
+:
+    public cellPointWeight
+{
+public:
+
+    // Constructors
+
+        //- Construct from components
+        cellPointWeightWallModified
+        (
+            const polyMesh& mesh,
+            const vector& position,
+            const label nCell,
+            const label facei = -1
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.C b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.C
new file mode 100644
index 0000000000..762aeef1cb
--- /dev/null
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.C
@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "interpolationCellPointWallModified.H"
+
+// * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::interpolationCellPointWallModified<Type>::
+interpolationCellPointWallModified
+(
+    const GeometricField<Type, fvPatchField, volMesh>& psi
+)
+:
+    interpolationCellPoint<Type>(psi)
+{}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.H
new file mode 100644
index 0000000000..a54fc8fb7a
--- /dev/null
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.H
@@ -0,0 +1,102 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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::interpolationCellPoint
+
+Description
+    Same as interpolationCellPoint, but if interpolating a wall face, uses
+    cell centre value instead
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef interpolationCellPointWallModified_H
+#define interpolationCellPointWallModified_H
+
+#include "interpolationCellPoint.H"
+#include "cellPointWeightWallModified.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class interpolationCellPoint Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class interpolationCellPointWallModified
+:
+    public interpolationCellPoint<Type>
+{
+public:
+
+    //- Runtime type information
+    TypeName("cellPointWallModified");
+
+
+    // Constructors
+
+        //- Construct from components
+        interpolationCellPointWallModified
+        (
+            const GeometricField<Type, fvPatchField, volMesh>& psi
+        );
+
+
+    // Member Functions
+
+        //- Interpolate field for the given cellPointWeight
+        inline Type interpolate(const cellPointWeightWallModified& cpw) const;
+
+        //- Interpolate field to the given point in the given cell
+        inline Type interpolate
+        (
+            const vector& position,
+            const label nCell,
+            const label facei = -1
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "interpolationCellPointWallModifiedI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "interpolationCellPointWallModified.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModifiedI.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModifiedI.H
new file mode 100644
index 0000000000..4318ce8994
--- /dev/null
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModifiedI.H
@@ -0,0 +1,69 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+inline Type Foam::interpolationCellPointWallModified<Type>::interpolate
+(
+    const cellPointWeightWallModified& cpw
+) const
+{
+    const FixedList<scalar, 4>& weights = cpw.weights();
+    const FixedList<label, 3>& faceVertices = cpw.faceVertices();
+
+    Type t = this->psip_[faceVertices[0]]*weights[0];
+    t += this->psip_[faceVertices[1]]*weights[1];
+    t += this->psip_[faceVertices[2]]*weights[2];
+    t += this->psi_[cpw.cell()]*weights[3];
+
+    return t;
+}
+
+
+template<class Type>
+inline Type Foam::interpolationCellPointWallModified<Type>::interpolate
+(
+    const vector& position,
+    const label celli,
+    const label facei
+) const
+{
+    return
+        interpolate
+        (
+            cellPointWeightWallModified
+            (
+                this->pMesh_,
+                position,
+                celli,
+                facei
+            )
+        );
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/makeInterpolationCellPointWallModified.C b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/makeInterpolationCellPointWallModified.C
new file mode 100644
index 0000000000..c2e691f545
--- /dev/null
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/makeInterpolationCellPointWallModified.C
@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "interpolationCellPointWallModified.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makeInterpolation(interpolationCellPointWallModified);
+}
+
+// ************************************************************************* //

From 1b9ae82909734178a71ce8762a206412ba121ffa Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 4 Mar 2009 11:36:07 +0000
Subject: [PATCH 022/175] streamlined input for DataEntry

---
 .../IO/DataEntry/Constant/Constant.C          | 30 ++++++-------------
 .../IO/DataEntry/Constant/Constant.H          | 21 +++++--------
 .../IO/DataEntry/DataEntry/DataEntry.C        | 14 +++------
 .../IO/DataEntry/DataEntry/DataEntry.H        | 24 +++++----------
 .../IO/DataEntry/DataEntry/NewDataEntry.C     | 15 ++++------
 .../submodels/IO/DataEntry/Table/Table.C      | 22 ++++----------
 .../submodels/IO/DataEntry/Table/Table.H      | 22 ++++++--------
 7 files changed, 49 insertions(+), 99 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.C
index a2df7792aa..cc1676805b 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.C
@@ -29,38 +29,26 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::Constant<Type>::Constant
-(
-    const word& entryName,
-    const dictionary& dict
-)
+Foam::Constant<Type>::Constant(const word& entryName, Istream& is)
 :
-    DataEntry<Type>(typeName, entryName, dict),
-    value_(this->dict_.lookup("value"))
+    DataEntry<Type>(entryName),
+    value_(is)
 {}
 
 
 template<>
-Foam::Constant<Foam::label>::Constant
-(
-    const word& entryName,
-    const dictionary& dict
-)
+Foam::Constant<Foam::label>::Constant(const word& entryName, Istream& is)
 :
-    DataEntry<label>(typeName, entryName, dict),
-    value_(readLabel(this->dict_.lookup("value")))
+    DataEntry<label>(entryName),
+    value_(readLabel(is))
 {}
 
 
 template<>
-Foam::Constant<Foam::scalar>::Constant
-(
-    const word& entryName,
-    const dictionary& dict
-)
+Foam::Constant<Foam::scalar>::Constant(const word& entryName, Istream& is)
 :
-    DataEntry<scalar>(typeName, entryName, dict),
-    value_(readScalar(this->dict_.lookup("value")))
+    DataEntry<scalar>(entryName),
+    value_(readScalar(is))
 {}
 
 
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H
index b4af73e247..6183f3a2ab 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H
@@ -28,12 +28,9 @@ Class
 Description
     Templated basic entry that holds a constant value.
 
+    Usage - for entry <entryName> having the value <value>:
     @verbatim
-        entry                    Constant
-        entryCoeffs
-        {
-            value                100.0; // Constant value
-        }
+        <entryName>    constant  <value>
     @endverbatim
 
 SourceFiles
@@ -78,17 +75,13 @@ class Constant
 public:
 
     // Runtime type information
-    TypeName("Constant");
+    TypeName("constant");
 
 
     // Constructors
 
-        //- Construct from dictionary
-        Constant
-        (
-            const word& entryName,
-            const dictionary& dict
-        );
+        //- Construct from entry name and Istream
+        Constant(const word& entryName, Istream& is);
 
 
     //- Destructor
@@ -108,10 +101,10 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<>
-Constant<label>::Constant(const word& entryName, const dictionary& dict);
+Constant<label>::Constant(const word& entryName, Istream& is);
 
 template<>
-Constant<scalar>::Constant(const word& entryName, const dictionary& dict);
+Constant<scalar>::Constant(const word& entryName, Istream& is);
 
 
 } // End namespace Foam
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.C
index f6a99c2758..d4bcbc0373 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.C
@@ -29,15 +29,9 @@ License
 // * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::DataEntry<Type>::DataEntry
-(
-    const word& typeName,
-    const word& entryName,
-    const dictionary& dict
-)
+Foam::DataEntry<Type>::DataEntry(const word& entryName)
 :
-    dict_(dict.subDict(entryName + "Coeffs")),
-    entry_(entryName)
+    name_(entryName)
 {}
 
 
@@ -51,9 +45,9 @@ Foam::DataEntry<Type>::~DataEntry()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-const Foam::dictionary& Foam::DataEntry<Type>::dict() const
+const Foam::word& Foam::DataEntry<Type>::name() const
 {
-    return dict_;
+    return name_;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H
index f9a5cd6396..965b7afdf7 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H
@@ -48,7 +48,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                          Class DataEntry Declaration
+                         Class DataEntry Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Type>
@@ -67,11 +67,8 @@ protected:
 
     // Protected data
 
-        //- Coefficients dictionary
-        const dictionary dict_;
-
         //- Name of entry
-        const word entry_;
+        const word name_;
 
 
 public:
@@ -87,21 +84,16 @@ public:
         dictionary,
         (
             const word& entryName,
-            const dictionary& dict
+            Istream& is
         ),
-        (entryName, dict)
+        (entryName, is)
     );
 
 
     // Constructor
 
-        //- Construct from type name and dictionary
-        DataEntry
-        (
-            const word& TypeName,
-            const word& entryName,
-            const dictionary& dict
-        );
+        //- Construct from entry name
+        DataEntry(const word& entryName);
 
 
     //- Selector
@@ -120,8 +112,8 @@ public:
 
         // Access
 
-            //- Return the dictionary
-            const dictionary& dict() const;
+            //- Return the name of the entry
+            const word& name() const;
 
 
         // Evaluation
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C
index ac8f7c6860..425dcfe6f7 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C
@@ -35,27 +35,24 @@ Foam::autoPtr<Foam::DataEntry<Type> > Foam::DataEntry<Type>::New
     const dictionary& dict
 )
 {
-    word DataEntryType(dict.lookup(entryName));
+    Istream& is(dict.lookup(entryName));
 
-    //    Info<< "Selecting DataEntry " << DataEntryType << endl;
+    word DataEntryType(is);
 
     typename dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(DataEntryType);
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "DataEntry<Type>::New(const dictionary&"
-        )   << "Unknown DataEntry type "
-            << DataEntryType << " for " << entryName
-            << ", constructor not in hash table" << nl << nl
+        FatalErrorIn("DataEntry<Type>::New(Istream&)")
+            << "Unknown DataEntry type " << DataEntryType << " for DataEntry "
+            << entryName << ". Constructor not in hash table" << nl << nl
             << "    Valid DataEntry types are :" << nl
             << dictionaryConstructorTablePtr_->toc() << nl
             << exit(FatalError);
     }
 
-    return autoPtr<DataEntry<Type> >(cstrIter()(entryName, dict));
+    return autoPtr<DataEntry<Type> >(cstrIter()(entryName, is));
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C
index 3897049722..fd08858157 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C
@@ -29,26 +29,16 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::Table<Type>::Table
-(
-    const word& entryName,
-    const dictionary& dict
-)
+Foam::Table<Type>::Table(const word& entryName, Istream& is)
 :
-    DataEntry<Type>(typeName, entryName, dict),
-    table_(this->dict_.lookup("table"))
+    DataEntry<Type>(entryName),
+    table_(is)
 {
     if (!table_.size())
     {
-        FatalErrorIn
-        (
-             "Foam::Table<Type>::Table\n"
-             "(\n"
-             "    const word& entryName,\n"
-             "    const dictionary& dict\n"
-             ")\n"
-        ) << "Table is invalid (empty)" << nl
-          << exit(FatalError);
+        FatalErrorIn("Foam::Table<Type>::Table(const Istream&)")
+            << "Table for entry " << this->name_ << " is invalid (empty)"
+            << nl << exit(FatalError);
     }
 }
 
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H
index c30ba5e937..97bd77f171 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H
@@ -28,18 +28,14 @@ Class
 Description
     Templated table container data entry. Items are stored in a list of
     Tuple2's. First column is always stored as scalar entries. Data is read
-    in the form, e.g. for (scalar, vector):
+    in the form, e.g. for an entry <entryName> that is (scalar, vector):
 
     @verbatim
-        entry                    Table
-        entryCoeffs
-        {
-            table
-            (
-                0.0 (1 2 3)
-                1.0 (4 5 6)
-            )
-        }
+        <entryName>   table
+        (
+            0.0 (1 2 3)
+            1.0 (4 5 6)
+        );
     @endverbatim
 
 SourceFiles
@@ -85,13 +81,13 @@ class Table
 public:
 
     //- Runtime type information
-    TypeName("Table");
+    TypeName("table");
 
 
     // Constructors
 
-        //- Construct from dictionary
-        Table(const word& entryName, const dictionary& dict);
+        //- Construct from entry name and Istream
+        Table(const word& entryName, Istream& is);
 
 
     //- Destructor

From 603d744f4f7ab3985ae0cf7ca24baad04a0cdb4c Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 4 Mar 2009 14:47:37 +0000
Subject: [PATCH 023/175] removed polyMeshInfo - functionality now in
 meshTools/polyMesh

---
 src/lagrangian/basic/Cloud/Cloud.C            |   6 +-
 src/lagrangian/basic/Cloud/Cloud.H            |  13 +-
 src/lagrangian/basic/Cloud/CloudIO.C          |   6 +-
 src/lagrangian/basic/Make/files               |   2 -
 .../basic/polyMeshInfo/polyMeshInfo.C         | 325 ------------------
 .../basic/polyMeshInfo/polyMeshInfo.H         | 176 ----------
 src/lagrangian/intermediate/Make/options      |   6 +-
 .../KinematicParcel/KinematicParcel.C         |  34 --
 .../GradientDispersionRAS.C                   |   2 +-
 .../InjectionModel/InjectionModel.C           |  42 +--
 10 files changed, 19 insertions(+), 593 deletions(-)
 delete mode 100644 src/lagrangian/basic/polyMeshInfo/polyMeshInfo.C
 delete mode 100644 src/lagrangian/basic/polyMeshInfo/polyMeshInfo.H

diff --git a/src/lagrangian/basic/Cloud/Cloud.C b/src/lagrangian/basic/Cloud/Cloud.C
index e18e0e3b53..8d39c1f70a 100644
--- a/src/lagrangian/basic/Cloud/Cloud.C
+++ b/src/lagrangian/basic/Cloud/Cloud.C
@@ -48,8 +48,7 @@ Foam::Cloud<ParticleType>::Cloud
     cellFaces_(pMesh.cells()),
     allFaceCentres_(pMesh.faceCentres()),
     owner_(pMesh.faceOwner()),
-    neighbour_(pMesh.faceNeighbour()),
-    meshInfo_(polyMesh_)
+    neighbour_(pMesh.faceNeighbour())
 {}
 
 
@@ -69,8 +68,7 @@ Foam::Cloud<ParticleType>::Cloud
     cellFaces_(pMesh.cells()),
     allFaceCentres_(pMesh.faceCentres()),
     owner_(pMesh.faceOwner()),
-    neighbour_(pMesh.faceNeighbour()),
-    meshInfo_(polyMesh_)
+    neighbour_(pMesh.faceNeighbour())
 {}
 
 
diff --git a/src/lagrangian/basic/Cloud/Cloud.H b/src/lagrangian/basic/Cloud/Cloud.H
index 684ceb979e..d82dc933f1 100644
--- a/src/lagrangian/basic/Cloud/Cloud.H
+++ b/src/lagrangian/basic/Cloud/Cloud.H
@@ -39,8 +39,7 @@ SourceFiles
 #include "cloud.H"
 #include "IDLList.H"
 #include "IOField.H"
-
-#include "polyMeshInfo.H"
+#include "polyMesh.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -68,7 +67,6 @@ class Cloud
     public cloud,
     public IDLList<ParticleType>
 {
-
     // Private data
 
         const polyMesh& polyMesh_;
@@ -79,9 +77,6 @@ class Cloud
         const unallocLabelList& owner_;
         const unallocLabelList& neighbour_;
 
-        //- Mesh information object
-        const polyMeshInfo meshInfo_;
-
 
     // Private member functions
 
@@ -173,12 +168,6 @@ public:
                 return polyMesh_.boundaryMesh()[patchi].whichFace(facei);
             }
 
-            //- Return reference to the mesh information object
-            const polyMeshInfo& meshInfo() const
-            {
-                return meshInfo_;
-            }
-
             label size() const
             {
                 return IDLList<ParticleType>::size();
diff --git a/src/lagrangian/basic/Cloud/CloudIO.C b/src/lagrangian/basic/Cloud/CloudIO.C
index 9b58c12ea5..42c1a9317a 100644
--- a/src/lagrangian/basic/Cloud/CloudIO.C
+++ b/src/lagrangian/basic/Cloud/CloudIO.C
@@ -72,8 +72,7 @@ Foam::Cloud<ParticleType>::Cloud
     cellFaces_(pMesh.cells()),
     allFaceCentres_(pMesh.faceCentres()),
     owner_(pMesh.faceOwner()),
-    neighbour_(pMesh.faceNeighbour()),
-    meshInfo_(polyMesh_)
+    neighbour_(pMesh.faceNeighbour())
 {
     initCloud(checkClass);
 }
@@ -94,8 +93,7 @@ Foam::Cloud<ParticleType>::Cloud
     cellFaces_(pMesh.cells()),
     allFaceCentres_(pMesh.faceCentres()),
     owner_(pMesh.faceOwner()),
-    neighbour_(pMesh.faceNeighbour()),
-    meshInfo_(polyMesh_)
+    neighbour_(pMesh.faceNeighbour())
 {
     initCloud(checkClass);
 }
diff --git a/src/lagrangian/basic/Make/files b/src/lagrangian/basic/Make/files
index 629d47f474..969b966f1a 100644
--- a/src/lagrangian/basic/Make/files
+++ b/src/lagrangian/basic/Make/files
@@ -6,6 +6,4 @@ indexedParticle = indexedParticle
 $(passiveParticle)/passiveParticleCloud.C
 $(indexedParticle)/indexedParticleCloud.C
 
-polyMeshInfo/polyMeshInfo.C
-
 LIB = $(FOAM_LIBBIN)/liblagrangian
diff --git a/src/lagrangian/basic/polyMeshInfo/polyMeshInfo.C b/src/lagrangian/basic/polyMeshInfo/polyMeshInfo.C
deleted file mode 100644
index 16b347ccbe..0000000000
--- a/src/lagrangian/basic/polyMeshInfo/polyMeshInfo.C
+++ /dev/null
@@ -1,325 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  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 "polyMeshInfo.H"
-#include "wedgePolyPatch.H"
-#include "symmetryPolyPatch.H"
-#include "emptyPolyPatch.H"
-#include "mathematicalConstants.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    defineTypeNameAndDebug(polyMeshInfo, 0);
-}
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void Foam::polyMeshInfo::setCentrePoint()
-{
-    boundBox bounds = mesh_.bounds();
-
-    centrePoint_ = 0.5*(bounds.max() + bounds.min());
-}
-
-
-void Foam::polyMeshInfo::setEmptyComponent(const vector& dir)
-{
-    for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
-    {
-        if (dir[cmpt] > 1.0e-6)
-        {
-            emptyComponent_ = cmpt;
-        }
-    }
-}
-
-
-void Foam::polyMeshInfo::queryWedge()
-{
-    label patchId[4];
-
-    bool symmPlaneExists = false;
-
-    forAll(mesh_.boundaryMesh(), patchi)
-    {
-        const polyPatch& patch = mesh_.boundaryMesh()[patchi];
-        if (isA<wedgePolyPatch>(patch))
-        {
-            if (patch.size())
-            {
-                nWedge_++;
-                if (nWedge_ > 4)
-                {
-                    break;
-                }
-                patchId[nWedge_-1] = patchi;
-           }
-        }
-        else if (isA<symmetryPolyPatch>(patch))
-        {
-            symmPlaneExists = true;
-        }
-    }
-
-    if (nWedge_ != 0 && nWedge_ != 2 && nWedge_ != 4)
-    {
-        FatalErrorIn("void polyMeshInfo::queryWedge() const")
-            << "Number of wedge patches " << nWedge_ << " is incorrect, "
-               "should be 0, 2 or 4"
-            << exit(FatalError);
-    }
-    else
-    {
-        if (symmPlaneExists)
-        {
-            wedgeAngle_ = mathematicalConstant::pi;
-        }
-        else
-        {
-            if (nWedge_)
-            {
-               if (nWedge_ > 2)
-                {
-                    WarningIn("void polyMeshInfo::queryWedge() const")
-                        << "Only configured for cases with 2 wedges. "
-                        << "Lagrangian calculations may result in errors"
-                        << endl;
-                }
-               // Get the vector normal to wedge patch1
-                const wedgePolyPatch& patch1 = refCast<const wedgePolyPatch>
-                    (mesh_.boundaryMesh()[patchId[0]]);
-                vector n1 = patch1.patchNormal();
-
-                // Get the vector normal to wedge patch2
-                const wedgePolyPatch& patch2 = refCast<const wedgePolyPatch>
-                    (mesh_.boundaryMesh()[patchId[1]]);
-                vector n2 = patch2.patchNormal();
-
-                // Calculate the angle swept between the patches
-                const scalar arcCos = (n1 & n2)/mag(n1);
-                wedgeAngle_ = mathematicalConstant::pi - acos(arcCos);
-
-                // Get the centre normal
-                centreNormal_ = patch1.centreNormal();
-
-                // Get the wedge axis
-                wedgeAxis_  = patch1.axis();
-            }
-        }
-    }
-}
-
-
-void Foam::polyMeshInfo::queryDirections()
-{
-    vector dirVec = vector::zero;
-
-    forAll(mesh_.boundaryMesh(), patchi)
-    {
-        if (isA<emptyPolyPatch>(mesh_.boundaryMesh()[patchi]))
-        {
-            if (mesh_.boundaryMesh()[patchi].size())
-            {
-                nEmpty_++;
-                dirVec +=
-                    sum(cmptMag(mesh_.boundaryMesh()[patchi].faceAreas()));
-            }
-        }
-    }
-
-
-    for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
-    {
-        directions_[cmpt] = 1;
-    }
-
-    if (nEmpty_)
-    {
-        reduce(dirVec, sumOp<vector>());
-
-        dirVec /= mag(dirVec);
-
-        for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
-        {
-            if (dirVec[cmpt] > 1.0e-6)
-            {
-                directions_[cmpt] = -1;
-                emptyComponent_ = cmpt;
-            }
-            else
-            {
-                directions_[cmpt] = 1;
-            }
-        }
-
-        // Set the patch normal
-        centreNormal_ = dirVec;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::polyMeshInfo::polyMeshInfo
-(
-    const polyMesh& mesh
-)
-:
-    mesh_(mesh),
-    nGeometricD_(0),
-    nSolutionD_(0),
-    centreNormal_(vector::zero),
-    emptyComponent_(0),
-    centrePoint_(vector::zero),
-    nEmpty_(0),
-    nWedge_(0),
-    wedgeAxis_(vector::zero),
-    wedgeAngle_(0)
-{
-    setCentrePoint();
-
-    queryWedge();
-
-    queryDirections();
-
-    nSolutionD_ = cmptSum(directions_ + Vector<label>::one)/2;
-
-    nGeometricD_ = nSolutionD_ - nWedge_/2;
-
-    if (nGeometricD_ == 2)
-    {
-        setEmptyComponent(centreNormal_);
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::polyMeshInfo::~polyMeshInfo()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-Foam::label Foam::polyMeshInfo::nGeometricD() const
-{
-    return nGeometricD_;
-}
-
-
-Foam::label Foam::polyMeshInfo::nSolutionD() const
-{
-    return nSolutionD_;
-}
-
-
-bool Foam::polyMeshInfo::caseIs2dWedge() const
-{
-    return (nWedge_ > 0);
-}
-
-
-bool Foam::polyMeshInfo::caseIs2dSlab() const
-{
-    return (nEmpty_ > 0);
-}
-
-
-bool Foam::polyMeshInfo::caseIs2d() const
-{
-    return (nGeometricD_ == 2);
-}
-
-
-bool Foam::polyMeshInfo::caseIs3d() const
-{
-    return (nGeometricD_ == 3);
-}
-
-
-Foam::vector Foam::polyMeshInfo::wedgeAxis() const
-{
-    if (nWedge_)
-    {
-        return wedgeAxis_;
-    }
-    else
-    {
-        WarningIn("Foam::polyMeshInfo::wedgeAxis()")
-            << "wedgeAxis() requested, but case is not of wedge type. "
-            << "Returning zero vector" << endl;
-        return vector::zero;
-    }
-}
-
-
-Foam::scalar Foam::polyMeshInfo::wedgeAngle() const
-{
-    if (nWedge_)
-    {
-        return wedgeAngle_;
-    }
-    else
-    {
-        WarningIn("Foam::polyMeshInfo::wedgeAngle()")
-            << "wedgeAngle() requested, but case is not of wedge type. "
-            << "Returning zero" << endl;
-        return 0.0;
-    }
-}
-
-
-Foam::vector Foam::polyMeshInfo::centreNormal() const
-{
-    if (nGeometricD_ == 2)
-    {
-        return centreNormal_;
-    }
-    else
-    {
-        WarningIn("Foam::polyMeshInfo::centreNormal()")
-            << "centreNormal() requested, but case is not 2-D. "
-            << "Returning zero vector" << endl;
-        return vector::zero;
-    }
-}
-
-
-Foam::label Foam::polyMeshInfo::emptyComponent() const
-{
-    return emptyComponent_;
-}
-
-
-Foam::vector Foam::polyMeshInfo::centrePoint() const
-{
-    return centrePoint_;
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/basic/polyMeshInfo/polyMeshInfo.H b/src/lagrangian/basic/polyMeshInfo/polyMeshInfo.H
deleted file mode 100644
index c047afac18..0000000000
--- a/src/lagrangian/basic/polyMeshInfo/polyMeshInfo.H
+++ /dev/null
@@ -1,176 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  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::polyMeshInfo
-
-Description
-
-
-SourceFiles
-    polyMeshInfo.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef polyMeshInfo_H
-#define polyMeshInfo_H
-
-#include "polyMesh.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                        Class polyMeshInfo Declaration
-\*---------------------------------------------------------------------------*/
-
-class polyMeshInfo
-{
-
-    // Private data
-
-        //- Reference to the mesh
-        const polyMesh& mesh_;
-
-        //- Vector of valid directions in mesh
-        //  defined according to the presence of empty patches
-        mutable Vector<label> directions_;
-
-        //- Number of number of valid geoemtric dimensions in the mesh
-        label nGeometricD_;
-
-        //- Number of number of valid solution dimensions in the mesh
-        //  For wedge cases this includes the circumferential direction
-        //  in case of swirl
-        label nSolutionD_;
-
-        //- Plane normal to the wedge patches, or between empty patches
-        // for slab 2-D cases
-        vector centreNormal_;
-
-        //- Empty/unused component for 2-D cases
-        label emptyComponent_;
-
-        //- Geometric centre point
-        vector centrePoint_;
-
-        //- Number of empty patches
-        label nEmpty_;
-
-        //- Number of wedge patches
-        label nWedge_;
-
-        //- Axis of wedge
-        vector wedgeAxis_;
-
-        //- Angle of wedge
-        scalar wedgeAngle_;
-
-
-    // Private member functions
-
-        //- Set the value of the mesh centre point
-        void setCentrePoint();
-
-        //- Determine wedge information
-        void queryWedge();
-
-        //- Determine mesh directions
-        void queryDirections();
-
-
-public:
-
-    //- Runtime type information
-    TypeName("polyMeshInfo");
-
-    // Constructors
-
-        //- Construct from components
-        polyMeshInfo
-        (
-            const polyMesh& mesh
-        );
-
-
-    // Destructors
-
-        virtual ~polyMeshInfo();
-
-
-    // Member functions
-
-        //- Access
-
-            //- Return the number of valid geoemtric dimensions in the mesh
-            label nGeometricD() const;
-
-            //- Return the number of valid solution dimensions in the mesh
-            label nSolutionD() const;
-
-            //- Flag to indicate whether case is a 2-D wedge
-            bool caseIs2dWedge() const;
-
-            //- Flag to indicate whether case is a 2-D slab
-            bool caseIs2dSlab() const;
-
-            //- Flag to indicate whether case is 2-D
-            bool caseIs2d() const;
-
-            //- Flag to indicate whether case is 3-D
-            bool caseIs3d() const;
-
-            //- Return axis of wedge
-            vector wedgeAxis() const;
-
-            //- Return angle of wedge
-            scalar wedgeAngle() const;
-
-            //- Return the centre normal
-            vector centreNormal() const;
-
-            //- Return empty component
-            label emptyComponent() const;
-
-            //- Return centre point
-            vector centrePoint() const;
-
-            //- Set the empty component direction based on normal vector dir
-            void setEmptyComponent(const vector& dir);
-
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
-
diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options
index 4304ffde9f..e9d4852aa0 100644
--- a/src/lagrangian/intermediate/Make/options
+++ b/src/lagrangian/intermediate/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
@@ -17,6 +18,8 @@ EXE_INC = \
     -I$(LIB_SRC)/turbulenceModels/compressible/LES/lnInclude
 
 LIB_LIBS = \
+    -lfiniteVolume \
+    -lmeshTools \
     -llagrangian \
     -lpdf \
     -lliquids \
@@ -27,5 +30,4 @@ LIB_LIBS = \
     -lbasicThermophysicalModels \
     -lcombustionThermophysicalModels \
     -lcompressibleRASModels \
-    -lcompressibleLESModels \
-    -lfiniteVolume
+    -lcompressibleLESModels
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index ee4c699f05..bec040ca83 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -139,17 +139,9 @@ Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
     vector& dUTrans
 )
 {
-    // Correct carrier phase velocity for 2-D slab cases
-    const polyMeshInfo& meshInfo = td.cloud().meshInfo();
-    if (meshInfo.caseIs2dSlab())
-    {
-        Uc_.component(meshInfo.emptyComponent()) = 0.0;
-    }
-
     // Return linearised term from drag model
     Cud = td.cloud().drag().Cu(U_ - Uc_, d_, rhoc_, rho_, muc_);
 
-
     //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Set new particle velocity
     //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -164,32 +156,6 @@ Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
     // - do not include gravity impulse
     dUTrans = -mass()*(Unew - U_ - dt*td.g());
 
-    // Make corrections for 2-D cases
-    if (meshInfo.caseIs2d())
-    {
-        if (meshInfo.caseIs2dSlab())
-        {
-            // Remove the slab normal parcel velocity component
-            Unew.component(meshInfo.emptyComponent()) = 0.0;
-            dUTrans.component(meshInfo.emptyComponent()) = 0.0;
-
-            // Snap parcels to central plane
-            this->position().component(meshInfo.emptyComponent()) =
-                meshInfo.centrePoint().component(meshInfo.emptyComponent());
-        }
-        else if (meshInfo.caseIs2dWedge())
-        {
-            // Snap parcels to central plane
-            this->position().component(meshInfo.emptyComponent()) = 0.0;
-        }
-        else
-        {
-             FatalErrorIn("Foam::vector Foam::KinematicParcel::calcVelocity")
-                << "Could not determine 2-D case geometry" << nl
-                << abort(FatalError);
-        }
-    }
-
     return Unew;
 }
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
index e15ee595e0..daac8b5af3 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
@@ -111,7 +111,7 @@ Foam::vector Foam::GradientDispersionRAS<CloudType>::update
             // away from the axis of symmetry
             // This creates a 'hole' in the spray and to
             // prevent this we let x1 be both negative/positive
-            if (this->owner().meshInfo().caseIs2d())
+            if (this->owner().mesh().nSolutionD() == 2)
             {
                 fac *= x1;
             }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index a8fdec60c0..1a027a4047 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -26,6 +26,7 @@ License
 
 #include "InjectionModel.H"
 #include "mathematicalConstants.H"
+#include "meshTools.H"
 
 // * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * * //
 
@@ -231,44 +232,19 @@ Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
 template<class CloudType>
 void Foam::InjectionModel<CloudType>::geometryCorrection(vector& pos) const
 {
-    if (owner_.meshInfo().caseIs2d())
-    {
-        if (owner_.meshInfo().caseIs2dWedge())
-        {
-            pos.component(owner_.meshInfo().emptyComponent()) = 0.0;
-        }
-        else if (owner_.meshInfo().caseIs2dSlab())
-        {
-            pos.component(owner_.meshInfo().emptyComponent()) =
-                owner_.meshInfo().centrePoint().component
-                (
-                    owner_.meshInfo().emptyComponent()
-                );
-        }
-        else
-        {
-            FatalErrorIn
-            (
-                "void Foam::InjectionModel<CloudType>::geometryCorrection"
-                "(vector& pos)"
-            )   << "Could not determine 2-D case geometry" << nl
-                << abort(FatalError);
-        }
-    }
+    meshTools::constrainToMeshCentre(owner_.mesh(), pos);
 }
 
 
 template<class CloudType>
 void Foam::InjectionModel<CloudType>::velocityCorrection(vector& U) const
 {
-    if (owner_.meshInfo().caseIs2dSlab())
-    {
-        U.component(owner_.meshInfo().emptyComponent()) =
-            owner_.meshInfo().centrePoint().component
-            (
-                owner_.meshInfo().emptyComponent()
-            );
-    }
+    meshTools::constrainDirection
+    (
+        owner_.mesh(),
+        owner_.mesh().solutionD(),
+        U
+    );
 }
 
 template<class CloudType>
@@ -278,7 +254,7 @@ void Foam::InjectionModel<CloudType>::postInjectCheck()
     {
         Pout<< "\n--> Cloud: " << owner_.name() << nl
             << "    Added " << parcelsAdded_
-            <<  " new parcels" << nl << endl;
+            << " new parcels" << nl << endl;
     }
 
     // Increment total number of parcels added

From 9b8cb1b20d26dfc98e794420c0102100d03f1e16 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 4 Mar 2009 14:48:22 +0000
Subject: [PATCH 024/175] supply constrained dimensions for
 positions/velocities

---
 src/meshTools/meshTools/meshTools.C | 40 +++++++++++++++++++----------
 src/meshTools/meshTools/meshTools.H | 34 ++++++++++++++++++------
 2 files changed, 52 insertions(+), 22 deletions(-)

diff --git a/src/meshTools/meshTools/meshTools.C b/src/meshTools/meshTools/meshTools.C
index f826675b30..9119a4ffe0 100644
--- a/src/meshTools/meshTools/meshTools.C
+++ b/src/meshTools/meshTools/meshTools.C
@@ -46,7 +46,7 @@ bool Foam::meshTools::visNormal
             return false;
         }
     }
-    
+
     return true;
 }
 
@@ -63,7 +63,7 @@ Foam::vectorField Foam::meshTools::calcBoxPointNormals(const primitivePatch& pp)
     octantNormal[pXmYpZ] = vector(1, -1, 1);
     octantNormal[mXpYpZ] = vector(-1, 1, 1);
     octantNormal[pXpYpZ] = vector(1, 1, 1);
-    
+
     octantNormal /= mag(octantNormal);
 
 
@@ -300,7 +300,7 @@ bool Foam::meshTools::edgeOnCell
 )
 {
     return findIndex(mesh.edgeCells(edgeI), cellI) != -1;
-}        
+}
 
 
 bool Foam::meshTools::edgeOnFace
@@ -311,7 +311,7 @@ bool Foam::meshTools::edgeOnFace
 )
 {
     return findIndex(mesh.faceEdges(faceI), edgeI) != -1;
-}        
+}
 
 
 // Return true if faceI part of cellI
@@ -635,9 +635,14 @@ Foam::label Foam::meshTools::walkFace
 }
 
 
-void Foam::meshTools::constrainToMeshCentre(const polyMesh& mesh, point& pt)
+void Foam::meshTools::constrainToMeshCentre
+(
+    const polyMesh& mesh,
+    point& pt
+)
 {
     const Vector<label>& dirs = mesh.geometricD();
+
     const point& min = mesh.bounds().min();
     const point& max = mesh.bounds().max();
 
@@ -645,7 +650,7 @@ void Foam::meshTools::constrainToMeshCentre(const polyMesh& mesh, point& pt)
     {
         if (dirs[cmpt] == -1)
         {
-            pt[cmpt] = 0.5*(min[cmpt]+max[cmpt]);
+            pt[cmpt] = 0.5*(min[cmpt] + max[cmpt]);
         }
     }
 }
@@ -658,6 +663,7 @@ void Foam::meshTools::constrainToMeshCentre
 )
 {
     const Vector<label>& dirs = mesh.geometricD();
+
     const point& min = mesh.bounds().min();
     const point& max = mesh.bounds().max();
 
@@ -679,7 +685,7 @@ void Foam::meshTools::constrainToMeshCentre
             {
                 if (dirs[cmpt] == -1)
                 {
-                    pts[i][cmpt] = 0.5*(min[cmpt]+max[cmpt]);
+                    pts[i][cmpt] = 0.5*(min[cmpt] + max[cmpt]);
                 }
             }
         }
@@ -688,10 +694,13 @@ void Foam::meshTools::constrainToMeshCentre
 
 
 //- Set the constrained components of directions/velocity to zero
-void Foam::meshTools::constrainDirection(const polyMesh& mesh, vector& d)
+void Foam::meshTools::constrainDirection
+(
+    const polyMesh& mesh,
+    const Vector<label>& dirs,
+    vector& d
+)
 {
-    const Vector<label>& dirs = mesh.geometricD();
-
     for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
     {
         if (dirs[cmpt] == -1)
@@ -702,10 +711,13 @@ void Foam::meshTools::constrainDirection(const polyMesh& mesh, vector& d)
 }
 
 
-void Foam::meshTools::constrainDirection(const polyMesh& mesh, vectorField& d)
+void Foam::meshTools::constrainDirection
+(
+    const polyMesh& mesh,
+    const Vector<label>& dirs,
+    vectorField& d
+)
 {
-    const Vector<label>& dirs = mesh.geometricD();
-
     bool isConstrained = false;
     for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
     {
@@ -857,7 +869,7 @@ Foam::label Foam::meshTools::cutDirToEdge
                 doneEdges.insert(e2);
                 doneEdges.insert(e3);
             }
-        }       
+        }
     }
 
     forAll(cEdges, cEdgeI)
diff --git a/src/meshTools/meshTools/meshTools.H b/src/meshTools/meshTools/meshTools.H
index 3710d5af06..0bd033b889 100644
--- a/src/meshTools/meshTools/meshTools.H
+++ b/src/meshTools/meshTools/meshTools.H
@@ -215,7 +215,7 @@ namespace meshTools
             const label vertI
         );
 
-        //- Return face on cell using edgeI but not faceI. Throws error 
+        //- Return face on cell using edgeI but not faceI. Throws error
         //  if none found.
         label otherFace
         (
@@ -225,7 +225,7 @@ namespace meshTools
             const label edgeI
         );
 
-        //- Return cell on other side of face. Throws error 
+        //- Return cell on other side of face. Throws error
         //  if face not internal.
         label otherCell
         (
@@ -249,14 +249,32 @@ namespace meshTools
     // Constraints on position
 
         //- Set the constrained components of position to mesh centre
-        void constrainToMeshCentre(const polyMesh&, point&);
-        void constrainToMeshCentre(const polyMesh&, pointField&);
+        void constrainToMeshCentre
+        (
+            const polyMesh& mesh,
+            point& pt
+        );
+        void constrainToMeshCentre
+        (
+            const polyMesh& mesh,
+            pointField& pt
+        );
 
         //- Set the constrained components of directions/velocity to zero
-        void constrainDirection(const polyMesh&, vector&);
-        void constrainDirection(const polyMesh&, vectorField&);
+        void constrainDirection
+        (
+            const polyMesh& mesh,
+            const Vector<label>& dirs,
+            vector& d
+        );
+        void constrainDirection
+        (
+            const polyMesh& mesh,
+            const Vector<label>& dirs,
+            vectorField& d
+        );
+
 
-    
     // Hex only functionality.
 
         //- Given edge on hex find other 'parallel', non-connected edges.
@@ -287,7 +305,7 @@ namespace meshTools
             const label cellI,
             const vector& cutDir
         );
-    
+
 } // End namespace meshTools
 
 

From 1296e86758732a37d4f95df540525903d15bc868 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 4 Mar 2009 14:53:54 +0000
Subject: [PATCH 025/175] tidy-up of constrain functions for pos and U

---
 .../InjectionModel/InjectionModel.C           | 28 ++++++-------------
 .../InjectionModel/InjectionModel.H           |  6 ----
 2 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 1a027a4047..a21580845e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -229,24 +229,6 @@ Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
 }
 
 
-template<class CloudType>
-void Foam::InjectionModel<CloudType>::geometryCorrection(vector& pos) const
-{
-    meshTools::constrainToMeshCentre(owner_.mesh(), pos);
-}
-
-
-template<class CloudType>
-void Foam::InjectionModel<CloudType>::velocityCorrection(vector& U) const
-{
-    meshTools::constrainDirection
-    (
-        owner_.mesh(),
-        owner_.mesh().solutionD(),
-        U
-    );
-}
-
 template<class CloudType>
 void Foam::InjectionModel<CloudType>::postInjectCheck()
 {
@@ -269,6 +251,7 @@ void Foam::InjectionModel<CloudType>::postInjectCheck()
     // Reset added parcels counter
     parcelsAdded_ = 0;
 
+    // Write current state to properties file
     writeProps();
 }
 
@@ -425,8 +408,13 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
                 scalar dt = time - timeInj;
 
                 // Apply corrections for 2-D cases
-                geometryCorrection(pos);
-                velocityCorrection(U);
+                meshTools::constrainToMeshCentre(owner_.mesh(), pos);
+                meshTools::constrainDirection
+                (
+                    owner_.mesh(),
+                    owner_.mesh().solutionD(),
+                    U
+                );
 
                 // Add the new parcel
                 td.cloud().addNewParcel(pos, cellI, d, U, nP, dt);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index 5c2a00a4d5..a2f0cd1c16 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -88,12 +88,6 @@ private:
         //- Write injector properties
         void writeProps();
 
-        //- Geometry correction for 2-D cases
-        void geometryCorrection(vector& pos) const;
-
-        //- Velocity correction for 2-D cases
-        void velocityCorrection(vector& U) const;
-
 
 protected:
 

From a19fe7489015149b97dd20a7538957317c2dfa1c Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 4 Mar 2009 15:16:33 +0000
Subject: [PATCH 026/175] clean-up

---
 .../EntrainmentInjection/EntrainmentInjection.H      | 12 +++++++++++-
 .../InjectionModel/ManualInjection/ManualInjection.H |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/EntrainmentInjection/EntrainmentInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/EntrainmentInjection/EntrainmentInjection.H
index 845a0d58bc..9a82c46aaa 100755
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/EntrainmentInjection/EntrainmentInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/EntrainmentInjection/EntrainmentInjection.H
@@ -26,6 +26,16 @@ Class
     Foam::EntrainmentInjection
 
 Description
+    Injection at specified positions, with the condition that for injection
+    to be allowed
+
+        rhol <= c_*0.5*rhoc*|Uc|^2
+
+    where:
+      - rhol is the effective density (of all clouds)
+      - c_ is a modelling constant [s2/m2]
+      - rhoc is the carrier phase density
+      - Uc is the carrier phase velocity
 
 SourceFiles
     EntrainmentInjection.C
@@ -57,7 +67,7 @@ class EntrainmentInjection
 
         // Model parameters
 
-            //- Injection permission: rhol <= c_*0.5*rho*|U|^2
+            //- Modelling constant
             const scalar c_;
 
             //- Carrier phase density field
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
index 6dde70c746..a9b4ae0f5c 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
@@ -154,7 +154,7 @@ public:
             scalar d0
             (
                 const label parcelI,
-                const scalar
+                const scalar time
             ) const;
 
             //- Return flag to identify whether or not injection in cellI is

From 7b069d85bf15480c339a89ed7238721b0d13bf28 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 4 Mar 2009 19:31:56 +0000
Subject: [PATCH 027/175] further developments towards evap model

---
 src/lagrangian/intermediate/Make/files        |   5 +
 .../evaporationProperties.C                   |  80 ++++
 .../evaporationProperties.H                   | 117 ++++++
 .../evaporationPropertiesIO.C                 | 130 +++++++
 ...eactingMultiphaseParcelPhaseChangeModels.C |   7 +
 ...makeBasicReactingParcelPhaseChangeModels.C |   7 +
 .../phaseProperties/phaseProperties.C.bakNew  | 357 ------------------
 .../phaseProperties/phaseProperties.H.bakNew  | 177 ---------
 .../IO/DataEntry/Constant/Constant.C          |  13 +
 .../IO/DataEntry/Constant/Constant.H          |  24 +-
 .../IO/DataEntry/Constant/ConstantIO.C        |  63 ++++
 .../IO/DataEntry/DataEntry/DataEntry.C        |  12 +
 .../IO/DataEntry/DataEntry/DataEntry.H        |  24 +-
 .../IO/DataEntry/DataEntry/DataEntryIO.C      |  48 +++
 .../submodels/IO/DataEntry/Table/Table.C      |  13 +
 .../submodels/IO/DataEntry/Table/Table.H      |  24 +-
 .../submodels/IO/DataEntry/Table/TableIO.C    |  63 ++++
 .../LiquidEvaporation.C}                      | 159 ++++----
 .../LiquidEvaporation.H}                      |  38 +-
 .../NoPhaseChange/NoPhaseChange.C             |   2 +-
 .../NoPhaseChange/NoPhaseChange.H             |   2 +-
 .../PhaseChangeModel/PhaseChangeModel.H       |   2 +-
 22 files changed, 724 insertions(+), 643 deletions(-)
 create mode 100644 src/lagrangian/intermediate/evaporationProperties/evaporationProperties/evaporationProperties.C
 create mode 100644 src/lagrangian/intermediate/evaporationProperties/evaporationProperties/evaporationProperties.H
 create mode 100644 src/lagrangian/intermediate/evaporationProperties/evaporationProperties/evaporationPropertiesIO.C
 delete mode 100644 src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C.bakNew
 delete mode 100644 src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H.bakNew
 create mode 100644 src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/ConstantIO.C
 create mode 100644 src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryIO.C
 create mode 100644 src/lagrangian/intermediate/submodels/IO/DataEntry/Table/TableIO.C
 rename src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/{liquidEvaporation/liquidEvaporation.C => LiquidEvaporation/LiquidEvaporation.C} (53%)
 rename src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/{liquidEvaporation/liquidEvaporation.H => LiquidEvaporation/LiquidEvaporation.H} (80%)

diff --git a/src/lagrangian/intermediate/Make/files b/src/lagrangian/intermediate/Make/files
index 7e2bd41a8e..8ba5b4e0a0 100644
--- a/src/lagrangian/intermediate/Make/files
+++ b/src/lagrangian/intermediate/Make/files
@@ -72,6 +72,11 @@ phaseProperties/phaseProperties/phaseProperties.C
 phaseProperties/phaseProperties/phasePropertiesIO.C
 phaseProperties/phasePropertiesList/phasePropertiesList.C
 
+/* evaporation properties */
+evaporationProperties/evaporationProperties/evaporationProperties.C
+evaporationProperties/evaporationProperties/evaporationPropertiesIO.C
+
+
 /* data entries */
 submodels/IO/DataEntry/makeDataEntries.C
 
diff --git a/src/lagrangian/intermediate/evaporationProperties/evaporationProperties/evaporationProperties.C b/src/lagrangian/intermediate/evaporationProperties/evaporationProperties/evaporationProperties.C
new file mode 100644
index 0000000000..49a353a18a
--- /dev/null
+++ b/src/lagrangian/intermediate/evaporationProperties/evaporationProperties/evaporationProperties.C
@@ -0,0 +1,80 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "evaporationProperties.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::evaporationProperties::evaporationProperties()
+:
+    name_("unknownSpecie"),
+    Dab_(0.0),
+    TvsPSat_()
+{}
+
+
+Foam::evaporationProperties::evaporationProperties
+(
+    const evaporationProperties& pp
+)
+:
+    name_(pp.name_),
+    Dab_(pp.Dab_),
+    TvsPSat_(pp.TvsPSat_)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::evaporationProperties::~evaporationProperties()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+const Foam::word& Foam::evaporationProperties::name() const
+{
+    return name_;
+}
+
+
+Foam::scalar Foam::evaporationProperties::Dab() const
+{
+    return Dab_;
+}
+
+
+const Foam::DataEntry<Foam::scalar>&
+Foam::evaporationProperties::TvsPSat() const
+{
+    return TvsPSat_();
+}
+
+
+// ************************************************************************* //
+
diff --git a/src/lagrangian/intermediate/evaporationProperties/evaporationProperties/evaporationProperties.H b/src/lagrangian/intermediate/evaporationProperties/evaporationProperties/evaporationProperties.H
new file mode 100644
index 0000000000..1ee2ed1c6a
--- /dev/null
+++ b/src/lagrangian/intermediate/evaporationProperties/evaporationProperties/evaporationProperties.H
@@ -0,0 +1,117 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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::evaporationProperties
+
+Description
+    Helper class to manage evaporation properties
+
+SourceFiles
+    evaporationProperties.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef evaporationProperties_H
+#define evaporationProperties_H
+
+#include "DataEntry.H"
+#include "autoPtr.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class evaporationProperties Declaration
+\*---------------------------------------------------------------------------*/
+
+class evaporationProperties
+{
+   // Private data
+
+        //- Name of specie
+        word name_;
+
+        //- Diffusion coefficient
+        scalar Dab_;
+
+        //- Data entry for saturation pressure as a function of temperature
+        autoPtr<DataEntry<scalar> > TvsPSat_;
+
+
+    // Private member functions
+
+
+
+public:
+
+    // Constructors
+
+        //- Null constructor
+        evaporationProperties();
+
+        //- Construct from Istream
+        evaporationProperties(Istream&);
+
+        //- Construct as copy
+        evaporationProperties(const evaporationProperties&);
+
+
+    //- Destructor
+    ~evaporationProperties();
+
+
+    // Public member functions
+
+        // Access
+
+            //- Return const access to the specie name
+            const word& name() const;
+
+            //- Return const access to the diffusion coefficient
+            scalar Dab() const;
+
+            //- Return const access to the saturation pressure as a function
+            //  of temperature
+            const DataEntry<scalar>& TvsPSat() const;
+
+
+    // IOstream Operators
+
+        friend Istream& operator>>(Istream&, evaporationProperties&);
+        friend Ostream& operator<<(Ostream&, const evaporationProperties&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/evaporationProperties/evaporationProperties/evaporationPropertiesIO.C b/src/lagrangian/intermediate/evaporationProperties/evaporationProperties/evaporationPropertiesIO.C
new file mode 100644
index 0000000000..3eed20d37b
--- /dev/null
+++ b/src/lagrangian/intermediate/evaporationProperties/evaporationProperties/evaporationPropertiesIO.C
@@ -0,0 +1,130 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "evaporationProperties.H"
+#include "dictionaryEntry.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::evaporationProperties::evaporationProperties(Istream& is)
+:
+    name_("unknown"),
+    Dab_(0.0),
+    TvsPSat_(NULL)
+{
+    is.check
+    (
+        "Foam::evaporationProperties::evaporationProperties(Istream& is)"
+    );
+
+    dictionaryEntry evapInfo(dictionary::null, is);
+
+    if (!evapInfo.isDict())
+    {
+        FatalErrorIn
+        (
+            "Foam::evaporationProperties::evaporationProperties(Istream& is)"
+        )   << "Evaporation properties should be given in dictionary entries"
+            << nl << exit(FatalError);
+    }
+
+    name_ = evapInfo.keyword();
+
+    evapInfo.lookup("Dab") >> Dab_;
+    TvsPSat_.reset(DataEntry<scalar>::New("TvsPSat", evapInfo.dict()).ptr());
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+Foam::Istream& Foam::operator>>(Istream& is, evaporationProperties& ep)
+{
+    is.check
+    (
+        "Foam::Istream& Foam::operator>>"
+        "("
+            "Foam::Istream&,"
+            "Foam::evaporationProperties&"
+        ")"
+    );
+
+    dictionaryEntry evapInfo(dictionary::null, is);
+
+    if (!evapInfo.isDict())
+    {
+        FatalErrorIn
+        (
+            "Foam::Istream& Foam::operator>>"
+            "("
+                "Istream& is,"
+                "evaporationProperties& pp"
+            ")"
+        )   << "Evaporation properties should be given in dictionary entries"
+            << nl << exit(FatalError);
+    }
+
+    ep.name_ = evapInfo.keyword();
+
+    evapInfo.lookup("Dab") >> ep.Dab_;
+    ep.TvsPSat_.reset(DataEntry<scalar>::New("TvsPSat", evapInfo.dict()).ptr());
+
+    return is;
+}
+
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const evaporationProperties& ep)
+{
+    os.check
+    (
+        "Foam::Ostream& Foam::operator<<"
+        "("
+            "Foam::Ostream&,"
+            "const Foam::evaporationProperties&"
+        ")"
+    );
+
+    os  << ep.name_ << nl << token::BEGIN_BLOCK << nl
+        << incrIndent;
+
+    os.writeKeyword("Dab") << ep.Dab_ << token::END_STATEMENT << nl;
+//    os  <<  ep.TvsPSat_() << nl;
+
+    os  << decrIndent << token::END_BLOCK << nl;
+
+    os.check
+    (
+        "Foam::Ostream& Foam::operator<<"
+        "("
+            "Foam::Ostream&,"
+            "const Foam::evaporationProperties&"
+        ")"
+    );
+
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelPhaseChangeModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelPhaseChangeModels.C
index 88300dffb1..99e9dfb89b 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelPhaseChangeModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelPhaseChangeModels.C
@@ -28,6 +28,7 @@ License
 #include "ReactingCloud.H"
 
 #include "NoPhaseChange.H"
+#include "LiquidEvaporation.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,6 +46,12 @@ namespace Foam
         ReactingCloud,
         basicReactingMultiphaseParcel
     );
+    makePhaseChangeModelType
+    (
+        LiquidEvaporation,
+        ReactingCloud,
+        basicReactingMultiphaseParcel
+    );
 };
 
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelPhaseChangeModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelPhaseChangeModels.C
index 65118fa8f7..f8ce035ada 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelPhaseChangeModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelPhaseChangeModels.C
@@ -28,6 +28,7 @@ License
 #include "ReactingCloud.H"
 
 #include "NoPhaseChange.H"
+#include "LiquidEvaporation.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -42,6 +43,12 @@ namespace Foam
         ReactingCloud,
         basicReactingParcel
     );
+    makePhaseChangeModelType
+    (
+        LiquidEvaporation,
+        ReactingCloud,
+        basicReactingParcel
+    );
 };
 
 
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C.bakNew b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C.bakNew
deleted file mode 100644
index fe690e0ab6..0000000000
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C.bakNew
+++ /dev/null
@@ -1,357 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  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 "phaseProperties.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-template<>
-const char* Foam::NamedEnum<Foam::phaseProperties::phaseType, 4>::names[] =
-{
-    "gas",
-    "liquid",
-    "solid",
-    "unknown"
-};
-
-
-const Foam::NamedEnum<Foam::phaseProperties::phaseType, 4>
-    Foam::phaseProperties::phaseTypeNames_;
-
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void Foam::phaseProperties::setGlobalGasIds
-(
-    const PtrList<volScalarField>& YGas
-)
-{
-    forAll(components_, i)
-    {
-        forAll (YGas, j)
-        {
-            word specieName = YGas[j].name();
-
-            if (specieName == components_[i].first())
-            {
-                globalIds_[i] = j;
-                break;
-            }
-        }
-        if (globalIds_[i] == -1)
-        {
-            wordList globalGasNames(YGas.size());
-
-            forAll (YGas, k)
-            {
-                globalGasNames[k] = YGas[k].name();
-            }
-
-            FatalErrorIn
-            (
-                "void phaseProperties::setGlobalGasIds"
-                "("
-                "    const hCombustionThermo&"
-                ")"
-            )   << "Could not find gas species " << components_[i].first()
-                << " in species list" <<  nl
-                << "Available species are: " << nl << globalGasNames << nl
-                << exit(FatalError);
-        }
-    }
-}
-
-
-void Foam::phaseProperties::setGlobalIds(const wordList& globalNames)
-{
-    forAll(components_, i)
-    {
-        forAll(globalNames, j)
-        {
-            if (globalNames[j] == components_[i].first())
-            {
-                globalIds_[i] = j;
-                break;
-            }
-        }
-        if (globalIds_[i] == -1)
-        {
-            FatalErrorIn
-            (
-                "void Foam::phaseProperties::setGlobalGasIds\n"
-                "(\n"
-                "    const PtrList<volScalarField>& YGas\n"
-                ")"
-            )   << "Could not find specie " << components_[i].first()
-                << " in species list" <<  nl
-                << "Available species are: " << nl << globalNames << nl
-                << exit(FatalError);
-        }
-    }
-}
-
-
-void Foam::phaseProperties::checkTotalMassFraction() const
-{
-    scalar total = 0.0;
-    forAll(fractions_, cmptI)
-    {
-        total += fractions_[cmptI];
-    }
-
-    if (mag(total - 1.0) > SMALL)
-    {
-        FatalErrorIn
-        (
-            "void Foam::phaseProperties::checkTotalMassFraction() const"
-        )   << "Component fractions must total to unity" << nl
-            << "Components: " << nl << components_ << nl << exit(FatalError);
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::phaseProperties::phaseProperties()
-:
-    phase_(UNKNOWN),
-    names_(0),
-    fractions_(0),
-    globalIds_(0)
-{}
-
-
-Foam::phaseProperties::phaseProperties(Istream& is)
-:
-    phase_(UNKNOWN),
-    names_(0),
-    fractions_(0),
-    globalIds_(0)
-{
-    is.check("Foam::phaseProperties::phaseProperties(Istream& is)");
-
-    Tuple2<word, List<Tuple2<word, scalar> > > components(is);
-
-    phase_ = phaseTypeNames_.read(components.first());
-
-    label nComponents = components.second().size();
-    names_.setSize(nComponents);
-    fractions_.setSize(nComponents);
-
-    forAll(components.second(), cmptI)
-    {
-        names_[cmptI] = components.second()[cmptI].first();
-        fractions_[cmptI] = components.second()[cmptI].second();
-    }
-
-    // initialise global ids to -1
-    globalIds_.setSize(nComponents, -1);
-
-    checkTotalMassFraction();
-}
-
-
-Foam::phaseProperties::phaseProperties(const phaseProperties& pp)
-:
-    phase_(pp.phase_),
-    names_(pp.names_),
-    fractions_(pp.fractions_),
-    globalIds_(pp.globalIds_)
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::phaseProperties::~phaseProperties()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void Foam::phaseProperties::initialiseGlobalIds
-(
-    const PtrList<volScalarField>& YGas,
-    const wordList& liquidNames,
-    const wordList& solidNames
-)
-{
-    // determine the addressing to map between components listed in the phase
-    // with those given in the (main) thermo properties
-    switch (phase_)
-    {
-        case GAS:
-        {
-            setGlobalGasIds(YGas);
-            break;
-        }
-        case LIQUID:
-        {
-            setGlobalIds(liquidNames);
-            break;
-        }
-        case SOLID:
-        {
-            setGlobalIds(solidNames);
-            break;
-        }
-        default:
-        {
-            FatalErrorIn
-            (
-                "Foam::phaseProperties::setGlobalIds\n"
-                "(\n"
-                "    const PtrList<specieReactingProperties>& gases,\n"
-                "    const wordList& liquidNames,\n"
-                "    const wordList& solidNames\n"
-                ")"
-            )   << "Invalid phase: " << phaseTypeNames_[phase_] << nl
-                << "    phase must be gas, liquid or solid" << nl
-                << exit(FatalError);
-        }
-}
-
-
-Foam::phaseProperties::phaseType Foam::phaseProperties::phase() const
-{
-    return phase_;
-}
-
-
-Foam::word Foam::phaseProperties::phaseTypeName() const
-{
-    return phaseTypeNames_[phase_];
-}
-
-
-const Foam::List<Foam::Tuple2<Foam::word, Foam::scalar> >&
-Foam::phaseProperties::components() const
-{
-    return components_;
-}
-
-
-const Foam::word& Foam::phaseProperties::name(const label cmptI) const
-{
-    if (cmptI >= components_.size())
-    {
-        FatalErrorIn
-        (
-            "const Foam::word& Foam::phaseProperties::name"
-            "("
-            "    const label cmptI"
-            ") const"
-        )   << "Requested component " << cmptI << "out of range" << nl
-            << "Available phase components:" << nl << components_ << nl
-            << exit(FatalError);
-    }
-
-    return components_[cmptI].first();
-}
-
-
-const Foam::wordList Foam::phaseProperties::names() const
-{
-    wordList cmptNames(components_.size());
-
-    forAll(components_, cmptI)
-    {
-        cmptNames[cmptI] = components_[cmptI].first();
-    }
-
-    return cmptNames;
-}
-
-
-Foam::label Foam::phaseProperties::id(const word& cmptName) const
-{
-    forAll(components_, cmptI)
-    {
-        if (components_[cmptI].first() == cmptName)
-        {
-            return cmptI;
-        }
-    }
-
-    return -1;
-}
-
-
-Foam::label Foam::phaseProperties::globalId(const word& cmptName) const
-{
-    label id = this->id(cmptName);
-
-    if (id < 0)
-    {
-        return id;
-    }
-    else
-    {
-        return globalIds_[id];
-    }
-
-}
-
-
-const Foam::labelList& Foam::phaseProperties::globalIds() const
-{
-    return globalIds_;
-}
-
-
-Foam::scalar& Foam::phaseProperties::Y(const label cmptI)
-{
-    if (cmptI >= components_.size())
-    {
-        FatalErrorIn
-        (
-            "const Foam::scalar& Foam::phaseProperties::Y"
-            "("
-            "    const label cmptI"
-            ") const"
-        )   << "Requested component " << cmptI << "out of range" << nl
-            << "Available phase components:" << nl << components_ << nl
-            << exit(FatalError);
-    }
-
-    return components_[cmptI].second();
-}
-
-
-const Foam::scalarList Foam::phaseProperties::Y() const
-{
-    scalarList cmptYs(components_.size(), 0.0);
-
-    forAll(cmptYs, i)
-    {
-        cmptYs[i] = components_[i].second();
-    }
-
-    return cmptYs;
-}
-
-
-// ************************************************************************* //
-
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H.bakNew b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H.bakNew
deleted file mode 100644
index b7ca428715..0000000000
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H.bakNew
+++ /dev/null
@@ -1,177 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  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::phaseProperties
-
-Description
-    Helper class to manage multi-component phase properties
-
-SourceFiles
-    phaseProperties.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef phaseProperties_H
-#define phaseProperties_H
-
-#include "NamedEnum.H"
-#include "Tuple2.H"
-#include "PtrList.H"
-#include "volFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                      Class phaseProperties Declaration
-\*---------------------------------------------------------------------------*/
-
-class phaseProperties
-{
-public:
-
-    // Public data
-
-        //- Phase type enumeration
-        enum phaseType
-        {
-            GAS,
-            LIQUID,
-            SOLID,
-            UNKNOWN
-        };
-
-        //- Corresponding word representations for phase type enumerations
-        static const NamedEnum<phaseType, 4> phaseTypeNames_;
-
-
-private:
-
-   // Private data
-
-        //- Phase type
-        phaseType phase_;
-
-        //- List of component names
-        List<word> names_;
-
-        //- List of component mass fractions
-        List<scalar> fractions_;
-
-        //- Global ids
-        labelList globalIds_;
-
-
-    // Private member functions
-
-        //- Set global ids - specialisation for carrier gas phases
-        void setGlobalGasIds(const PtrList<volScalarField>& YGas);
-
-        //- Set global ids - liquid and solid phases
-        void setGlobalIds(const wordList& globalNames);
-
-        //- Check the total mass fraction
-        void checkTotalMassFraction() const;
-
-
-public:
-
-    // Constructors
-
-        //- Null constructor
-        phaseProperties();
-
-        //- Construct from Istream
-        phaseProperties(Istream&);
-
-        //- Construct as copy
-        phaseProperties(const phaseProperties&);
-
-
-    //- Destructor
-    ~phaseProperties();
-
-
-    // Public member functions
-
-        //- Initialise the global ids
-        void initialiseGlobalIds
-        (
-            const PtrList<volScalarField>& YGas,
-            const wordList& liquidNames,
-            const wordList& solidNames
-        );
-
-        //- Return const access to the phase type
-        phaseType phase() const;
-
-        //- Return word representation of the phase type
-        word phaseTypeName() const;
-
-        //- Return const access to the component name vs mass fraction list
-        const List<Tuple2<word, scalar> >& components() const;
-
-        //- Return const access to a component name
-        const word& name(const label cmptI) const;
-
-        //- Return a list of component names
-        const wordList names() const;
-
-        //- Return the id of a component in the local list by name
-        //  Returns -1 if not found
-        label id(const word& cmptName) const;
-
-        //- Return the global id of a component in the local list by name
-        //  Returns -1 if not found
-        label globalId(const word& cmptName) const;
-
-        //- Return const acccess to the global ids
-        const labelList& globalIds() const;
-
-        //- Return non-const access to a component mass fraction
-        scalar& Y(const label cmptI);
-
-        //- Return const access to all component mass fractions
-        const scalarList Y() const;
-
-
-    // IOstream Operators
-
-        friend Istream& operator>>(Istream&, phaseProperties&);
-        friend Ostream& operator<<(Ostream&, const phaseProperties&);
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.C
index cc1676805b..658fca8e7e 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.C
@@ -36,6 +36,14 @@ Foam::Constant<Type>::Constant(const word& entryName, Istream& is)
 {}
 
 
+template<class Type>
+Foam::Constant<Type>::Constant(const Constant<Type>& cnst)
+:
+    DataEntry<Type>(cnst),
+    value_(cnst.value_)
+{}
+
+
 template<>
 Foam::Constant<Foam::label>::Constant(const word& entryName, Istream& is)
 :
@@ -75,4 +83,9 @@ Type Foam::Constant<Type>::integrate(const scalar x1, const scalar x2) const
 }
 
 
+// * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
+
+#include "ConstantIO.C"
+
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H
index 6183f3a2ab..ff82343c1e 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H
@@ -48,6 +48,16 @@ SourceFiles
 namespace Foam
 {
 
+template<class Type>
+class Constant;
+
+template<class Type>
+Ostream& operator<<
+(
+    Ostream&,
+    const Constant<Type>&
+);
+
 /*---------------------------------------------------------------------------*\
                            Class Constant Declaration
 \*---------------------------------------------------------------------------*/
@@ -65,9 +75,6 @@ class Constant
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        Constant(const Constant<Type>&);
-
         //- Disallow default bitwise assignment
         void operator=(const Constant<Type>&);
 
@@ -83,6 +90,9 @@ public:
         //- Construct from entry name and Istream
         Constant(const word& entryName, Istream& is);
 
+        //- Copy constructor
+        Constant(const Constant<Type>& cnst);
+
 
     //- Destructor
     virtual ~Constant();
@@ -95,6 +105,14 @@ public:
 
         //- Integrate between two values
         Type integrate(const scalar x1, const scalar x2) const;
+
+
+    //- Ostream Operator
+    friend Ostream& operator<< <Type>
+    (
+        Ostream&,
+        const Constant<Type>&
+    );
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/ConstantIO.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/ConstantIO.C
new file mode 100644
index 0000000000..51212f9dbc
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/ConstantIO.C
@@ -0,0 +1,63 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "DataEntry.H"
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+template<class Type>
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const Constant<Type>& de
+)
+{
+    if (os.format() == IOstream::ASCII)
+    {
+        os  << static_cast<const DataEntry<Type>& >(de)
+            << token::SPACE << de.value_;
+    }
+    else
+    {
+        os  << static_cast<const DataEntry<Type>& >(de);
+        os.write
+        (
+            reinterpret_cast<const char*>(&de.value_),
+            sizeof(de.value_)
+        );
+    }
+
+    // Check state of Ostream
+    os.check
+    (
+        "Ostream& operator<<(Ostream&, const Constant<Type>&)"
+    );
+
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.C
index d4bcbc0373..b107a35010 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.C
@@ -35,6 +35,13 @@ Foam::DataEntry<Type>::DataEntry(const word& entryName)
 {}
 
 
+template<class Type>
+Foam::DataEntry<Type>::DataEntry(const DataEntry<Type>& de)
+:
+    name_(de.name_)
+{}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class Type>
@@ -51,4 +58,9 @@ const Foam::word& Foam::DataEntry<Type>::name() const
 }
 
 
+// * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
+
+#include "DataEntryIO.C"
+
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H
index 965b7afdf7..b3a670433d 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H
@@ -47,6 +47,16 @@ SourceFiles
 namespace Foam
 {
 
+template<class Type>
+class DataEntry;
+
+template<class Type>
+Ostream& operator<<
+(
+    Ostream&,
+    const DataEntry<Type>&
+);
+
 /*---------------------------------------------------------------------------*\
                          Class DataEntry Declaration
 \*---------------------------------------------------------------------------*/
@@ -56,9 +66,6 @@ class DataEntry
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        DataEntry(const DataEntry<Type>&);
-
         //- Disallow default bitwise assignment
         void operator=(const DataEntry<Type>&);
 
@@ -95,6 +102,9 @@ public:
         //- Construct from entry name
         DataEntry(const word& entryName);
 
+        //- Copy constructor
+        DataEntry(const DataEntry<Type>& de);
+
 
     //- Selector
     static autoPtr<DataEntry<Type> > New
@@ -123,6 +133,14 @@ public:
 
             //- Integrate between two (scalar) values
             virtual Type integrate(const scalar x1, const scalar x2) const = 0;
+
+
+    //- Ostream Operator
+    friend Ostream& operator<< <Type>
+    (
+        Ostream&,
+        const DataEntry<Type>&
+    );
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryIO.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryIO.C
new file mode 100644
index 0000000000..7afa2ef201
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryIO.C
@@ -0,0 +1,48 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "DataEntry.H"
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+template<class Type>
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const DataEntry<Type>&
+)
+{
+    // Check state of Ostream
+    os.check
+    (
+        "Ostream& operator<<(Ostream&, const DataEntry<Type>&)"
+    );
+
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C
index fd08858157..98abaf6e67 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C
@@ -43,6 +43,14 @@ Foam::Table<Type>::Table(const word& entryName, Istream& is)
 }
 
 
+template<class Type>
+Foam::Table<Type>::Table(const Table<Type>& tbl)
+:
+    DataEntry<Type>(tbl),
+    table_(tbl.table_)
+{}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class Type>
@@ -132,4 +140,9 @@ Type Foam::Table<Type>::integrate(const scalar x1, const scalar x2) const
 }
 
 
+// * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
+
+#include "TableIO.C"
+
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H
index 97bd77f171..f96c79a816 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H
@@ -54,6 +54,16 @@ SourceFiles
 namespace Foam
 {
 
+template<class Type>
+class Table;
+
+template<class Type>
+Ostream& operator<<
+(
+    Ostream&,
+    const Table<Type>&
+);
+
 /*---------------------------------------------------------------------------*\
                            Class Table Declaration
 \*---------------------------------------------------------------------------*/
@@ -71,9 +81,6 @@ class Table
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        Table(const Table<Type>&);
-
         //- Disallow default bitwise assignment
         void operator=(const Table<Type>&);
 
@@ -89,6 +96,9 @@ public:
         //- Construct from entry name and Istream
         Table(const word& entryName, Istream& is);
 
+        //- Copy constructor
+        Table(const Table<Type>& tbl);
+
 
     //- Destructor
     virtual ~Table();
@@ -101,6 +111,14 @@ public:
 
         //- Integrate between two (scalar) values
         Type integrate(const scalar x1, const scalar x2) const;
+
+
+    //- Ostream Operator
+    friend Ostream& operator<< <Type>
+    (
+        Ostream&,
+        const Constant<Type>&
+    );
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/TableIO.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/TableIO.C
new file mode 100644
index 0000000000..8ee842c4c3
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/TableIO.C
@@ -0,0 +1,63 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "DataEntry.H"
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+template<class Type>
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const Table<Type>& de
+)
+{
+    if (os.format() == IOstream::ASCII)
+    {
+        os  << static_cast<const DataEntry<Type>& >(de)
+            << token::SPACE << de.table_;
+    }
+    else
+    {
+        os  << static_cast<const DataEntry<Type>& >(de);
+        os.write
+        (
+            reinterpret_cast<const char*>(&de.table_),
+            sizeof(de.table_)
+        );
+    }
+
+    // Check state of Ostream
+    os.check
+    (
+        "Ostream& operator<<(Ostream&, const Table<Type>&)"
+    );
+
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/liquidEvaporation/liquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
similarity index 53%
rename from src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/liquidEvaporation/liquidEvaporation.C
rename to src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
index 8bba9d784d..b72c34f9bc 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/liquidEvaporation/liquidEvaporation.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
@@ -24,13 +24,51 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "liquidEvaporation.H"
+#include "LiquidEvaporation.H"
 #include "specie.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template <class CloudType>
-Foam::scalar Foam::liquidEvaporation<CloudType>::Sh
+Foam::label Foam::LiquidEvaporation<CloudType>::carrierSpecieId
+(
+    const word& specieName
+) const
+{
+    forAll (this->owner().carrierThermo().composition().Y(), i)
+    {
+        if
+        (
+            this->owner().carrierThermo().composition().Y()[i].name()
+         == specieName
+        )
+        {
+            return i;
+        }
+    }
+
+    wordList species(this->owner().carrierThermo().composition().Y().size());
+    forAll (this->owner().carrierThermo().composition().Y(), i)
+    {
+        species[i] = this->owner().carrierThermo().composition().Y()[i].name();
+    }
+
+    FatalErrorIn
+    (
+        "Foam::label Foam::LiquidEvaporation<CloudType>::carrierSpecieId"
+        "("
+            "const word&"
+        ") const"
+    )   << "Could not find " << specieName << " in species list" << nl
+        <<  "Avialable species:" << nl << species
+        << nl << exit(FatalError);
+
+    return -1;
+}
+
+
+template <class CloudType>
+Foam::scalar Foam::LiquidEvaporation<CloudType>::Sh
 (
     const scalar Re,
     const scalar Sc
@@ -40,86 +78,47 @@ Foam::scalar Foam::liquidEvaporation<CloudType>::Sh
 }
 
 
-template <class CloudType>
-Foam::scalar Foam::liquidEvaporation<CloudType>::pSat
-(
-    const label i,
-    const scalar T
-) const
-{
-    const List<Tuple2<scalar, scalar> >& pSat = pSat_[i];
-
-    label id = 0;
-    label nT = pSat.size();
-    while ((id < nT) && (pSat[id].first() < T))
-    {
-        id++;
-    }
-
-    if (id == 0 || id == nT - 1)
-    {
-        return pSat[id].second();
-    }
-    else
-    {
-        return
-            (pSat[id].first() - T)
-           /(pSat[id].first() - pSat[id-1].first())
-           *(pSat[id].second() - pSat[id-1].second())
-          + pSat[id-1].second();
-    }
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template <class CloudType>
-Foam::liquidEvaporation<CloudType>::liquidEvaporation
+Foam::LiquidEvaporation<CloudType>::LiquidEvaporation
 (
     const dictionary& dict,
     CloudType& owner
 )
 :
     PhaseChangeModel<CloudType>(dict, owner, typeName),
-    gases_(owner.gases()),
     liquids_
     (
         liquidMixture::New
         (
             owner.mesh().objectRegistry::lookupObject<dictionary>
             (
-                owner.carrierThermo().name().name()
+                owner.carrierThermo().name()
             )
         )
     ),
-    Tvap_(readScalar(coeffDict().lookup("Tvap"))),
-    Dm_(coeffDict().lookup("DiffusionCoeffs")),
-    pSat_(coeffDict().lookup("pSat"))
+    Tvap_(readScalar(this->coeffDict().lookup("Tvap"))),
+    evapProps_(this->coeffDict().lookup("activeLiquids")),
+    liqToGasMap_(evapProps_.size())
 {
-    if (liquids_.size() != Dm_.size())
+    if (evapProps_.size() == 0)
     {
-        FatalErrorIn
+        WarningIn
         (
-            "Foam::liquidEvaporation<CloudType>::liquidEvaporation\n"
-            "(\n"
-            "    const dictionary& dict,\n"
-            "    CloudType& cloud\n"
-            ")\n"
-        )   << "Size of diffusionCoeffs list not equal to the number of liquid "
-            << "species" << nl << exit(FatalError);
+            "Foam::LiquidEvaporation<CloudType>::LiquidEvaporation"
+            "("
+                "const dictionary& dict, "
+                "CloudType& owner"
+            ")"
+        )   << "Evaporation model selected, but no active liquids defined"
+            << nl << endl;
     }
 
-    if (liquids_.size() != pSat_.size())
+    // Calculate mapping between liquid and carrier phase species
+    forAll(evapProps_, i)
     {
-        FatalErrorIn
-        (
-            "Foam::liquidEvaporation<CloudType>::liquidEvaporation\n"
-            "(\n"
-            "    const dictionary& dict,\n"
-            "    CloudType& cloud\n"
-            ")\n"
-        )   << "Size of saturation pressure lists not equal to the number of "
-            << "liquid species" << nl << exit(FatalError);
+        liqToGasMap_[i] = carrierSpecieId(evapProps_[i].name());
     }
 }
 
@@ -127,75 +126,79 @@ Foam::liquidEvaporation<CloudType>::liquidEvaporation
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template <class CloudType>
-Foam::liquidEvaporation<CloudType>::~liquidEvaporation()
+Foam::LiquidEvaporation<CloudType>::~LiquidEvaporation()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CloudType>
-bool Foam::liquidEvaporation<CloudType>::active() const
+bool Foam::LiquidEvaporation<CloudType>::active() const
 {
     return true;
 }
 
 
 template<class CloudType>
-Foam::scalar Foam::liquidEvaporation<CloudType>::calculate
+Foam::scalar Foam::LiquidEvaporation<CloudType>::calculate
 (
     const scalar T,
     const scalar d,
     const scalarField& Xc,
-    const scalarList& dMassMT,
-    const vector& Ur
+    scalarList& dMassMT,
+    const vector& Ur,
     const scalar Tc,
     const scalar pc,
-    const scalar nuc
-    const scalar dt,
+    const scalar nuc,
+    const scalar dt
 ) const
 {
     scalar dMassTot = 0.0;
 
     if (T < Tvap_)
     {
-        // not reached temperature threshold
-        return 0.0;
+        // not reached model activation temperature
+        return dMassTot;
     }
     else
     {
         // droplet area
         scalar A = mathematicalConstant::pi*sqr(d);
 
-        // universal gas constant
-        const scalar R = specie::RR.value();
-
         // Reynolds number
         scalar Re = mag(Ur)*d/(nuc + ROOTVSMALL);
 
-        // calculate mass transfer of each specie
-        forAll(dMassMT, i)
+        // Calculate mass transfer of each specie in liquid
+        forAll(evapProps_, i)
         {
+            // Diffusion coefficient for species i
+            scalar Dab = evapProps_[i].Dab();
+
+            // Saturation pressure for species i at temperature T
+            scalar pSat = evapProps_[i].TvsPSat().value(T);
+
             // Schmidt number
-            scalar Sc = nuc/(Dm_[i] + ROOTVSMALL);
+            scalar Sc = nuc/(Dab + ROOTVSMALL);
 
             // Sherwood number
             scalar Sh = this->Sh(Re, Sc);
 
             // mass transfer coefficient [m/s]
-            scalar kc = Sh*Dm_[i]/(d + ROOTVSMALL);
+            scalar kc = Sh*Dab/(d + ROOTVSMALL);
 
             // vapour concentration at droplet surface [kgmol/m3]
-            scalar Cs = pSat(i, T)/(R*T);
+            scalar Cs = pSat/(specie::RR*T);
 
             // vapour concentration in bulk gas [kgmol/m3]
-            scalar Cinf = Xc[i]*pc/(R*Tc);
+            scalar Cinf = Xc[i]*pc/(specie::RR*Tc);
 
             // molar flux of vapour [kgmol/m2/s]
             scalar Ni = max(kc*(Cs - Cinf), 0.0);
 
             // mass transfer
-            scalar dm = Ni*A*liquids_.properies()[i].W()*dt;
-            dMassMT[i] -= dm;
+            label globalLiqId = liqToGasMap_[i];
+            scalar dm = Ni*A*liquids_->properties()[globalLiqId].W()*dt;
+            dMassMT[globalLiqId] -= dm;
             dMassTot += dm;
         }
     }
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/liquidEvaporation/liquidEvaporation.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
similarity index 80%
rename from src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/liquidEvaporation/liquidEvaporation.H
rename to src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
index a7e2325f17..0224b1bd5d 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/liquidEvaporation/liquidEvaporation.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
@@ -23,30 +23,32 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::liquidEvaporation
+    Foam::LiquidEvaporation
 
 Description
     Liquid evaporation model
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef liquidEvaporation_H
-#define liquidEvaporation_H
+#ifndef LiquidEvaporation_H
+#define LiquidEvaporation_H
 
 #include "PhaseChangeModel.H"
 #include "liquidMixture.H"
 #include "Tuple2.H"
 
+#include "evaporationProperties.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 /*---------------------------------------------------------------------------*\
-                       Class liquidEvaporation Declaration
+                       Class LiquidEvaporation Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class CloudType>
-class liquidEvaporation
+class LiquidEvaporation
 :
     public PhaseChangeModel<CloudType>
 {
@@ -62,34 +64,32 @@ protected:
         //  allowed
         scalar Tvap_;
 
-        //- Component diffusion coefficients - one per specie
-        //  Note: need to be in same order as defined by liquids in thermo
-        //        props
-        scalarList Dm_;
+        //- List of evaporation properties
+        List<evaporationProperties> evapProps_;
 
-        //- Component saturation pressure vs temperature
-        List<List<Tuple2<scalar, scalar> > > pSat_;
+        //- Mapping between liquid and carrier gas species
+        List<label> liqToGasMap_;
 
 
     // Protected member functions
 
+        //- Return the id of species specieName in the carrier phase
+        label carrierSpecieId(const word& specieName) const;
+
         //- Sherwood number as a function of Reynolds and Schmidt numbers
         scalar Sh(const scalar Re, const scalar Sc) const;
 
-        //- Return the saturation pressure for species i at temperature, T
-        scalar pSat(const label i, const scalar T) const;
-
 
 public:
 
     //- Runtime type information
-    TypeName("liquidEvaporation");
+    TypeName("LiquidEvaporation");
 
 
     // Constructors
 
         //- Construct from dictionary
-        liquidEvaporation
+        LiquidEvaporation
         (
             const dictionary& dict,
             CloudType& cloud
@@ -97,7 +97,7 @@ public:
 
 
     //- Destructor
-    virtual ~liquidEvaporation();
+    virtual ~LiquidEvaporation();
 
 
     // Member Functions
@@ -111,7 +111,7 @@ public:
             const scalar T,
             const scalar d,
             const scalarField& Xc,
-            const scalarList& dMassMT,
+            scalarList& dMassMT,
             const vector& Ur,
             const scalar Tc,
             const scalar pc,
@@ -128,7 +128,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "liquidEvaporation.C"
+#   include "LiquidEvaporation.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
index 06035d7224..360f0b3926 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
@@ -61,7 +61,7 @@ Foam::scalar Foam::NoPhaseChange<CloudType>::calculate
     const scalar,
     const scalar,
     const scalarField&,
-    const scalarList&,
+    scalarList&,
     const vector&,
     const scalar,
     const scalar,
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
index 92a9dd22e5..d360e36d09 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
@@ -75,7 +75,7 @@ public:
             const scalar T,
             const scalar d,
             const scalarField& Xc,
-            const scalarList& dMassMT,
+            scalarList& dMassMT,
             const vector& Ur,
             const scalar Tc,
             const scalar pc,
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
index 22f12088b4..d0d40badc4 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
@@ -141,7 +141,7 @@ public:
             const scalar T,
             const scalar d,
             const scalarField& Xc,
-            const scalarList& dMassMT,
+            scalarList& dMassMT,
             const vector& Ur,
             const scalar Tc,
             const scalar pc,

From d25686db619d92a24d5ae9650676f0135e4e92c1 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Thu, 5 Mar 2009 10:56:22 +0000
Subject: [PATCH 028/175] Data entry updates + new polynomial type

---
 src/lagrangian/intermediate/Make/files        |   2 +-
 .../IO/DataEntry/Constant/ConstantIO.C        |  12 +-
 .../submodels/IO/DataEntry/Table/Table.H      |   4 +-
 .../submodels/IO/DataEntry/Table/TableIO.C    |  12 +-
 .../IO/DataEntry/polynomial/polynomial.C      |  90 ++++++++++++
 .../IO/DataEntry/polynomial/polynomial.H      | 130 ++++++++++++++++++
 .../IO/DataEntry/polynomial/polynomialIO.C    |  62 +++++++++
 7 files changed, 297 insertions(+), 15 deletions(-)
 create mode 100644 src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C
 create mode 100644 src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
 create mode 100644 src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C

diff --git a/src/lagrangian/intermediate/Make/files b/src/lagrangian/intermediate/Make/files
index 8ba5b4e0a0..bc6b095488 100644
--- a/src/lagrangian/intermediate/Make/files
+++ b/src/lagrangian/intermediate/Make/files
@@ -79,6 +79,6 @@ evaporationProperties/evaporationProperties/evaporationPropertiesIO.C
 
 /* data entries */
 submodels/IO/DataEntry/makeDataEntries.C
-
+submodels/IO/DataEntry/polynomial/polynomial.C
 
 LIB = $(FOAM_LIBBIN)/liblagrangianIntermediate
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/ConstantIO.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/ConstantIO.C
index 51212f9dbc..93e92a2588 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/ConstantIO.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/ConstantIO.C
@@ -32,21 +32,21 @@ template<class Type>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const Constant<Type>& de
+    const Constant<Type>& cnst
 )
 {
     if (os.format() == IOstream::ASCII)
     {
-        os  << static_cast<const DataEntry<Type>& >(de)
-            << token::SPACE << de.value_;
+        os  << static_cast<const DataEntry<Type>& >(cnst)
+            << token::SPACE << cnst.value_;
     }
     else
     {
-        os  << static_cast<const DataEntry<Type>& >(de);
+        os  << static_cast<const DataEntry<Type>& >(cnst);
         os.write
         (
-            reinterpret_cast<const char*>(&de.value_),
-            sizeof(de.value_)
+            reinterpret_cast<const char*>(&cnst.value_),
+            sizeof(cnst.value_)
         );
     }
 
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H
index f96c79a816..2bd1152bf4 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H
@@ -75,8 +75,8 @@ class Table
 {
     // Private data
 
-       //- Table data
-       List<Tuple2<scalar, Type> > table_;
+        //- Table data
+        List<Tuple2<scalar, Type> > table_;
 
 
     // Private Member Functions
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/TableIO.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/TableIO.C
index 8ee842c4c3..dda24c362a 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/TableIO.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/TableIO.C
@@ -32,21 +32,21 @@ template<class Type>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const Table<Type>& de
+    const Table<Type>& tbl
 )
 {
     if (os.format() == IOstream::ASCII)
     {
-        os  << static_cast<const DataEntry<Type>& >(de)
-            << token::SPACE << de.table_;
+        os  << static_cast<const DataEntry<Type>& >(tbl)
+            << token::SPACE << tbl.table_;
     }
     else
     {
-        os  << static_cast<const DataEntry<Type>& >(de);
+        os  << static_cast<const DataEntry<Type>& >(tbl);
         os.write
         (
-            reinterpret_cast<const char*>(&de.table_),
-            sizeof(de.table_)
+            reinterpret_cast<const char*>(&tbl.table_),
+            sizeof(tbl.table_)
         );
     }
 
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C
new file mode 100644
index 0000000000..56101256e0
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C
@@ -0,0 +1,90 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "polynomial.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::polynomial::polynomial(const word& entryName, Istream& is)
+:
+    DataEntry<scalar>(entryName),
+    coeffs_(is)
+{
+    if (!coeffs_.size())
+    {
+        FatalErrorIn("Foam::polynomial::polynomial(const word&, Istream&)")
+            << "polynomial coefficients for entry " << this->name_
+            << " is invalid (empty)" << nl << exit(FatalError);
+    }
+}
+
+
+Foam::polynomial::polynomial(const polynomial& poly)
+:
+    DataEntry<scalar>(poly),
+    coeffs_(poly.coeffs_)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::polynomial::~polynomial()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::scalar Foam::polynomial::value(const scalar x) const
+{
+    scalar y = 0.0;
+    forAll(coeffs_, i)
+    {
+        y += coeffs_[i].first()*pow(x, coeffs_[i].second());
+    }
+
+    return y;
+}
+
+
+Foam::scalar Foam::polynomial::integrate(const scalar x1, const scalar x2) const
+{
+    scalar intx = 0.0;
+
+    forAll(coeffs_, i)
+    {
+        intx +=
+            coeffs_[i].first()/(coeffs_[i].second() + 1)
+           *(
+                pow(x2, coeffs_[i].second() + 1)
+              - pow(x1, coeffs_[i].second() + 1)
+            );
+    }
+
+    return intx;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
new file mode 100644
index 0000000000..3787cf69ac
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
@@ -0,0 +1,130 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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::polynomial
+
+Description
+    Templated polynomial container data entry. Items are stored in a list of
+    Tuple2's. Data is input in the form, e.g. for an entry <entryName> that
+    describes y = x^2 + 2x^3
+
+    @verbatim
+        <entryName>   polynomial
+        (
+            (1    2)
+            (2    3)
+        );
+    @endverbatim
+
+SourceFiles
+    polynomial.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef polynomial_H
+#define polynomial_H
+
+#include "DataEntry.H"
+#include "Tuple2.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class polynomial;
+
+Ostream& operator<<
+(
+    Ostream&,
+    const polynomial&
+);
+
+/*---------------------------------------------------------------------------*\
+                        Class polynomial Declaration
+\*---------------------------------------------------------------------------*/
+
+class polynomial
+:
+    public DataEntry<scalar>
+{
+    // Private data
+
+        //- Polynomial coefficients - list of prefactor, exponent
+        List<Tuple2<scalar, scalar> > coeffs_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise assignment
+        void operator=(const polynomial&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("polynomial");
+
+
+    // Constructors
+
+        //- Construct from entry name and Istream
+        polynomial(const word& entryName, Istream& is);
+
+        //- Copy constructor
+        polynomial(const polynomial& poly);
+
+
+    //- Destructor
+    virtual ~polynomial();
+
+
+    // Member Functions
+
+        //- Return polynomial value
+        scalar value(const scalar x) const;
+
+        //- Integrate between two (scalar) values
+        scalar integrate(const scalar x1, const scalar x2) const;
+
+
+    //- Ostream Operator
+    friend Ostream& operator<<
+    (
+        Ostream&,
+        const polynomial&
+    );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C
new file mode 100644
index 0000000000..05c34b645f
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C
@@ -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
+
+\*---------------------------------------------------------------------------*/
+
+#include "polynomial.H"
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const polynomial& poly
+)
+{
+    if (os.format() == IOstream::ASCII)
+    {
+        os  << static_cast<const DataEntry<scalar>& >(poly)
+            << token::SPACE << poly.coeffs_;
+    }
+    else
+    {
+        os  << static_cast<const DataEntry<scalar>& >(poly);
+        os.write
+        (
+            reinterpret_cast<const char*>(&poly.coeffs_),
+            sizeof(poly.coeffs_)
+        );
+    }
+
+    // Check state of Ostream
+    os.check
+    (
+        "Ostream& operator<<(Ostream&, const polynomial&)"
+    );
+
+    return os;
+}
+
+
+// ************************************************************************* //

From 7677c87f1518ed3ac6c9edb12db4541c537656a6 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Thu, 5 Mar 2009 15:48:51 +0000
Subject: [PATCH 029/175] further updates en route to new evap model(s)

---
 src/lagrangian/intermediate/Make/files        |  14 +-
 .../evaporationProperties.C                   |  80 ------
 .../evaporationProperties.H                   | 117 ---------
 .../evaporationPropertiesIO.C                 | 130 ----------
 .../KinematicParcel/KinematicParcel.C         |  96 ++-----
 .../KinematicParcel/KinematicParcel.H         |  23 +-
 .../KinematicParcel/KinematicParcelI.H        |   4 +-
 .../ReactingMultiphaseParcel.C                | 170 ++-----------
 .../ReactingMultiphaseParcel.H                |  31 ++-
 .../ReactingMultiphaseParcelI.H               |  19 +-
 .../ReactingMultiphaseParcelIO.C              |  20 +-
 .../Templates/ReactingParcel/ReactingParcel.C | 235 +++++++-----------
 .../Templates/ReactingParcel/ReactingParcel.H |  40 +--
 .../ReactingParcel/ReactingParcelI.H          |  16 +-
 .../ReactingParcel/ReactingParcelIO.C         |  26 +-
 .../Templates/ThermoParcel/ThermoParcel.C     |  81 ++----
 .../Templates/ThermoParcel/ThermoParcel.H     |  21 +-
 .../Templates/ThermoParcel/ThermoParcelI.H    |   4 +-
 .../basicKinematicParcel.C                    |   4 +-
 .../basicKinematicParcel.H                    |   2 +-
 .../basicReactingMultiphaseParcel.C           |   8 +-
 .../basicReactingMultiphaseParcel.H           |   4 +-
 .../basicReactingParcel/basicReactingParcel.C |   8 +-
 .../basicReactingParcel/basicReactingParcel.H |   4 +-
 .../basicThermoParcel/basicThermoParcel.C     |   4 +-
 .../basicThermoParcel/basicThermoParcel.H     |   2 +-
 .../IO/DataEntry/polynomial/polynomial.C      |   7 +
 .../LiquidEvaporation/LiquidEvaporation.C     |  68 +++--
 .../LiquidEvaporation/LiquidEvaporation.H     |  22 +-
 .../NoPhaseChange/NoPhaseChange.C             |  12 +-
 .../NoPhaseChange/NoPhaseChange.H             |  12 +-
 .../PhaseChangeModel/PhaseChangeModel.H       |  12 +-
 32 files changed, 367 insertions(+), 929 deletions(-)
 delete mode 100644 src/lagrangian/intermediate/evaporationProperties/evaporationProperties/evaporationProperties.C
 delete mode 100644 src/lagrangian/intermediate/evaporationProperties/evaporationProperties/evaporationProperties.H
 delete mode 100644 src/lagrangian/intermediate/evaporationProperties/evaporationProperties/evaporationPropertiesIO.C

diff --git a/src/lagrangian/intermediate/Make/files b/src/lagrangian/intermediate/Make/files
index bc6b095488..93572202fc 100644
--- a/src/lagrangian/intermediate/Make/files
+++ b/src/lagrangian/intermediate/Make/files
@@ -7,18 +7,21 @@ $(DERIVEDPARCELS)/basicThermoParcel/basicThermoParcel.C
 $(DERIVEDPARCELS)/basicReactingParcel/basicReactingParcel.C
 $(DERIVEDPARCELS)/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C
 
+
 /* Cloud base classes */
 clouds/baseClasses/kinematicCloud/kinematicCloud.C
 clouds/baseClasses/thermoCloud/thermoCloud.C
 clouds/baseClasses/reactingCloud/reactingCloud.C
 clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C
 
+
 /* Cloud container/injection mechanisms */
 clouds/derived/basicKinematicCloud/basicKinematicCloud.C
 clouds/derived/basicThermoCloud/basicThermoCloud.C
 clouds/derived/basicReactingCloud/basicReactingCloud.C
 clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.C
 
+
 /* kinematic parcel sub-models */
 KINEMATICPARCEL=$(DERIVEDPARCELS)/basicKinematicParcel
 $(KINEMATICPARCEL)/defineBasicKinematicParcel.C
@@ -27,6 +30,7 @@ $(KINEMATICPARCEL)/submodels/makeBasicKinematicParcelDragModels.C
 $(KINEMATICPARCEL)/submodels/makeBasicKinematicParcelInjectionModels.C
 $(KINEMATICPARCEL)/submodels/makeBasicKinematicParcelWallInteractionModels.C
 
+
 /* thermo parcel sub-models */
 THERMOPARCEL=$(DERIVEDPARCELS)/basicThermoParcel
 $(THERMOPARCEL)/defineBasicThermoParcel.C
@@ -36,6 +40,7 @@ $(THERMOPARCEL)/submodels/makeBasicThermoParcelHeatTransferModels.C
 $(THERMOPARCEL)/submodels/makeBasicThermoParcelInjectionModels.C
 $(THERMOPARCEL)/submodels/makeBasicThermoParcelWallInteractionModels.C
 
+
 /* reacting parcel sub-models */
 REACTINGPARCEL=$(DERIVEDPARCELS)/basicReactingParcel
 $(REACTINGPARCEL)/defineBasicReactingParcel.C
@@ -47,6 +52,7 @@ $(REACTINGPARCEL)/submodels/makeBasicReactingParcelInjectionModels.C
 $(REACTINGPARCEL)/submodels/makeBasicReactingParcelPhaseChangeModels.C
 $(REACTINGPARCEL)/submodels/makeBasicReactingParcelWallInteractionModels.C
 
+
 /* reacting multiphase parcel sub-models */
 REACTINGMPPARCEL=$(DERIVEDPARCELS)/basicReactingMultiphaseParcel
 $(REACTINGMPPARCEL)/defineBasicReactingMultiphaseParcel.C
@@ -60,25 +66,25 @@ $(REACTINGMPPARCEL)/submodels/makeBasicReactingMultiphaseParcelPhaseChangeModels
 $(REACTINGMPPARCEL)/submodels/makeBasicReactingMultiphaseParcelSurfaceReactionModels.C
 $(REACTINGMPPARCEL)/submodels/makeBasicReactingMultiphaseParcelWallInteractionModels.C
 
+
 /* bolt-on models */
 submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
 submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C
 
+
 /* integration schemes */
 IntegrationScheme/makeIntegrationSchemes.C
 
+
 /* phase properties */
 phaseProperties/phaseProperties/phaseProperties.C
 phaseProperties/phaseProperties/phasePropertiesIO.C
 phaseProperties/phasePropertiesList/phasePropertiesList.C
 
-/* evaporation properties */
-evaporationProperties/evaporationProperties/evaporationProperties.C
-evaporationProperties/evaporationProperties/evaporationPropertiesIO.C
-
 
 /* data entries */
 submodels/IO/DataEntry/makeDataEntries.C
 submodels/IO/DataEntry/polynomial/polynomial.C
 
+
 LIB = $(FOAM_LIBBIN)/liblagrangianIntermediate
diff --git a/src/lagrangian/intermediate/evaporationProperties/evaporationProperties/evaporationProperties.C b/src/lagrangian/intermediate/evaporationProperties/evaporationProperties/evaporationProperties.C
deleted file mode 100644
index 49a353a18a..0000000000
--- a/src/lagrangian/intermediate/evaporationProperties/evaporationProperties/evaporationProperties.C
+++ /dev/null
@@ -1,80 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  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 "evaporationProperties.H"
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::evaporationProperties::evaporationProperties()
-:
-    name_("unknownSpecie"),
-    Dab_(0.0),
-    TvsPSat_()
-{}
-
-
-Foam::evaporationProperties::evaporationProperties
-(
-    const evaporationProperties& pp
-)
-:
-    name_(pp.name_),
-    Dab_(pp.Dab_),
-    TvsPSat_(pp.TvsPSat_)
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::evaporationProperties::~evaporationProperties()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-const Foam::word& Foam::evaporationProperties::name() const
-{
-    return name_;
-}
-
-
-Foam::scalar Foam::evaporationProperties::Dab() const
-{
-    return Dab_;
-}
-
-
-const Foam::DataEntry<Foam::scalar>&
-Foam::evaporationProperties::TvsPSat() const
-{
-    return TvsPSat_();
-}
-
-
-// ************************************************************************* //
-
diff --git a/src/lagrangian/intermediate/evaporationProperties/evaporationProperties/evaporationProperties.H b/src/lagrangian/intermediate/evaporationProperties/evaporationProperties/evaporationProperties.H
deleted file mode 100644
index 1ee2ed1c6a..0000000000
--- a/src/lagrangian/intermediate/evaporationProperties/evaporationProperties/evaporationProperties.H
+++ /dev/null
@@ -1,117 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  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::evaporationProperties
-
-Description
-    Helper class to manage evaporation properties
-
-SourceFiles
-    evaporationProperties.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef evaporationProperties_H
-#define evaporationProperties_H
-
-#include "DataEntry.H"
-#include "autoPtr.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                    Class evaporationProperties Declaration
-\*---------------------------------------------------------------------------*/
-
-class evaporationProperties
-{
-   // Private data
-
-        //- Name of specie
-        word name_;
-
-        //- Diffusion coefficient
-        scalar Dab_;
-
-        //- Data entry for saturation pressure as a function of temperature
-        autoPtr<DataEntry<scalar> > TvsPSat_;
-
-
-    // Private member functions
-
-
-
-public:
-
-    // Constructors
-
-        //- Null constructor
-        evaporationProperties();
-
-        //- Construct from Istream
-        evaporationProperties(Istream&);
-
-        //- Construct as copy
-        evaporationProperties(const evaporationProperties&);
-
-
-    //- Destructor
-    ~evaporationProperties();
-
-
-    // Public member functions
-
-        // Access
-
-            //- Return const access to the specie name
-            const word& name() const;
-
-            //- Return const access to the diffusion coefficient
-            scalar Dab() const;
-
-            //- Return const access to the saturation pressure as a function
-            //  of temperature
-            const DataEntry<scalar>& TvsPSat() const;
-
-
-    // IOstream Operators
-
-        friend Istream& operator>>(Istream&, evaporationProperties&);
-        friend Ostream& operator<<(Ostream&, const evaporationProperties&);
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/evaporationProperties/evaporationProperties/evaporationPropertiesIO.C b/src/lagrangian/intermediate/evaporationProperties/evaporationProperties/evaporationPropertiesIO.C
deleted file mode 100644
index 3eed20d37b..0000000000
--- a/src/lagrangian/intermediate/evaporationProperties/evaporationProperties/evaporationPropertiesIO.C
+++ /dev/null
@@ -1,130 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  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 "evaporationProperties.H"
-#include "dictionaryEntry.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::evaporationProperties::evaporationProperties(Istream& is)
-:
-    name_("unknown"),
-    Dab_(0.0),
-    TvsPSat_(NULL)
-{
-    is.check
-    (
-        "Foam::evaporationProperties::evaporationProperties(Istream& is)"
-    );
-
-    dictionaryEntry evapInfo(dictionary::null, is);
-
-    if (!evapInfo.isDict())
-    {
-        FatalErrorIn
-        (
-            "Foam::evaporationProperties::evaporationProperties(Istream& is)"
-        )   << "Evaporation properties should be given in dictionary entries"
-            << nl << exit(FatalError);
-    }
-
-    name_ = evapInfo.keyword();
-
-    evapInfo.lookup("Dab") >> Dab_;
-    TvsPSat_.reset(DataEntry<scalar>::New("TvsPSat", evapInfo.dict()).ptr());
-}
-
-
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-Foam::Istream& Foam::operator>>(Istream& is, evaporationProperties& ep)
-{
-    is.check
-    (
-        "Foam::Istream& Foam::operator>>"
-        "("
-            "Foam::Istream&,"
-            "Foam::evaporationProperties&"
-        ")"
-    );
-
-    dictionaryEntry evapInfo(dictionary::null, is);
-
-    if (!evapInfo.isDict())
-    {
-        FatalErrorIn
-        (
-            "Foam::Istream& Foam::operator>>"
-            "("
-                "Istream& is,"
-                "evaporationProperties& pp"
-            ")"
-        )   << "Evaporation properties should be given in dictionary entries"
-            << nl << exit(FatalError);
-    }
-
-    ep.name_ = evapInfo.keyword();
-
-    evapInfo.lookup("Dab") >> ep.Dab_;
-    ep.TvsPSat_.reset(DataEntry<scalar>::New("TvsPSat", evapInfo.dict()).ptr());
-
-    return is;
-}
-
-
-Foam::Ostream& Foam::operator<<(Ostream& os, const evaporationProperties& ep)
-{
-    os.check
-    (
-        "Foam::Ostream& Foam::operator<<"
-        "("
-            "Foam::Ostream&,"
-            "const Foam::evaporationProperties&"
-        ")"
-    );
-
-    os  << ep.name_ << nl << token::BEGIN_BLOCK << nl
-        << incrIndent;
-
-    os.writeKeyword("Dab") << ep.Dab_ << token::END_STATEMENT << nl;
-//    os  <<  ep.TvsPSat_() << nl;
-
-    os  << decrIndent << token::END_BLOCK << nl;
-
-    os.check
-    (
-        "Foam::Ostream& Foam::operator<<"
-        "("
-            "Foam::Ostream&,"
-            "const Foam::evaporationProperties&"
-        ")"
-    );
-
-    return os;
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index bec040ca83..32d40fc592 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -35,18 +35,18 @@ void Foam::KinematicParcel<ParcelType>::updateCellQuantities
 (
     TrackData& td,
     const scalar dt,
-    const label celli
+    const label cellI
 )
 {
-    rhoc_ = td.rhoInterp().interpolate(this->position(), celli);
-    Uc_ = td.UInterp().interpolate(this->position(), celli);
-    muc_ = td.muInterp().interpolate(this->position(), celli);
+    rhoc_ = td.rhoInterp().interpolate(this->position(), cellI);
+    Uc_ = td.UInterp().interpolate(this->position(), cellI);
+    muc_ = td.muInterp().interpolate(this->position(), cellI);
 
     // Apply dispersion components to carrier phase velocity
     Uc_ = td.cloud().dispersion().update
     (
         dt,
-        celli,
+        cellI,
         U_,
         Uc_,
         UTurb_,
@@ -57,44 +57,33 @@ void Foam::KinematicParcel<ParcelType>::updateCellQuantities
 
 template<class ParcelType>
 template<class TrackData>
-void Foam::KinematicParcel<ParcelType>::calcCoupled
+void Foam::KinematicParcel<ParcelType>::calc
 (
     TrackData& td,
     const scalar dt,
-    const label celli
+    const label cellI
 )
 {
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Define local properties at beginning of timestep
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//    const scalar mass0 = mass();
-//    const vector U0 = U_;
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Initialise transfer terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    // Momentum transfer from the particle to the carrier phase
-    vector dUTrans = vector::zero;
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate velocity - update U
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Calculate velocity - update U, dUTrans
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     scalar Cud = 0.0;
+    vector dUTrans = vector::zero;
     const vector U1 = calcVelocity(td, dt, Cud, dUTrans);
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~
-    // Accumulate source terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~
+    if (td.cloud().coupled())
+    {
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // Accumulate carrier phase source terms
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    // Update momentum transfer
-    td.cloud().UTrans()[celli] += nParticle_*dUTrans;
+        // Update momentum transfer
+        td.cloud().UTrans()[cellI] += nParticle_*dUTrans;
 
-    // Accumulate coefficient to be applied in carrier phase momentum coupling
-    td.cloud().UCoeff()[celli] += nParticle_*mass()*Cud;
+        // Coefficient to be applied in carrier phase momentum coupling
+        td.cloud().UCoeff()[cellI] += nParticle_*mass()*Cud;
+    }
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -106,42 +95,18 @@ void Foam::KinematicParcel<ParcelType>::calcCoupled
 
 template<class ParcelType>
 template<class TrackData>
-void Foam::KinematicParcel<ParcelType>::calcUncoupled
-(
-    TrackData& td,
-    const scalar dt,
-    const label
-)
-{
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Initialise transfer terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    // Momentum transfer from the particle to the carrier phase
-    vector dUTrans = vector::zero;
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate velocity - update U
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    scalar Cud = 0.0;
-    this->U() = calcVelocity(td, dt, Cud, dUTrans);
-}
-
-
-template<class ParcelType>
-template<class TrackData>
-Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
+const Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
 (
     TrackData& td,
     const scalar dt,
     scalar& Cud,
     vector& dUTrans
-)
+) const
 {
     // Return linearised term from drag model
     Cud = td.cloud().drag().Cu(U_ - Uc_, d_, rhoc_, rho_, muc_);
 
+
     //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Set new particle velocity
     //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -188,7 +153,7 @@ bool Foam::KinematicParcel<ParcelType>::move
 
         // Remember which cell the Parcel is in
         // since this will change if a face is hit
-        label celli = p.cell();
+        label cellI = p.cell();
 
         dt *= p.trackToFace(p.position() + dt*U_, td);
 
@@ -196,19 +161,12 @@ bool Foam::KinematicParcel<ParcelType>::move
         p.stepFraction() = 1.0 - tEnd/deltaT;
 
         // Update cell based properties
-        p.updateCellQuantities(td, dt, celli);
+        p.updateCellQuantities(td, dt, cellI);
 
         // Avoid problems with extremely small timesteps
         if (dt > ROOTVSMALL)
         {
-            if (td.cloud().coupled())
-            {
-                p.calcCoupled(td, dt, celli);
-            }
-            else
-            {
-                p.calcUncoupled(td, dt, celli);
-            }
+            p.calc(td, dt, cellI);
         }
 
         if (p.onBoundary() && td.keepParticle)
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index 39ba450cac..c60a216498 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -224,13 +224,13 @@ protected:
 
         //- Calculate new particle velocity
         template<class TrackData>
-        vector calcVelocity
+        const vector calcVelocity
         (
             TrackData& td,
             const scalar dt,
             scalar& Cud,
             vector& dUTrans
-        );
+        ) const;
 
 
 public:
@@ -249,7 +249,7 @@ public:
             KinematicCloud<ParcelType>& owner,
             const label typeId,
             const vector& position,
-            const label celli,
+            const label cellI,
             const scalar d0,
             const vector& U0,
             const scalar nParticle0,
@@ -355,25 +355,16 @@ public:
             (
                 TrackData& td,
                 const scalar dt,
-                const label celli
+                const label cellI
             );
 
-            //- Coupled calculation with the continuous phase
+            //- Update parcel properties over the time interval
             template<class TrackData>
-            void calcCoupled
+            void calc
             (
                 TrackData& td,
                 const scalar dt,
-                const label celli
-            );
-
-            //- Uncoupled calculation with the continuous phase
-            template<class TrackData>
-            void calcUncoupled
-            (
-                TrackData& td,
-                const scalar dt,
-                const label
+                const label cellI
             );
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
index 4b4ec3cce7..3e8d49b7ad 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
@@ -64,14 +64,14 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
     KinematicCloud<ParcelType>& owner,
     const label typeId,
     const vector& position,
-    const label celli,
+    const label cellI,
     const scalar d0,
     const vector& U0,
     const scalar nParticle0,
     const constantProperties& constProps
 )
 :
-    Particle<ParcelType>(owner, position, celli),
+    Particle<ParcelType>(owner, position, cellI),
     typeId_(typeId),
     d_(d0),
     U_(U0),
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index bc132bb6f3..4d96e78601 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -34,20 +34,20 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::updateCellQuantities
 (
     TrackData& td,
     const scalar dt,
-    const label celli
+    const label cellI
 )
 {
-    ReactingParcel<ParcelType>::updateCellQuantities(td, dt, celli);
+    ReactingParcel<ParcelType>::updateCellQuantities(td, dt, cellI);
 }
 
 
 template<class ParcelType>
 template<class TrackData>
-void Foam::ReactingMultiphaseParcel<ParcelType>::calcCoupled
+void Foam::ReactingMultiphaseParcel<ParcelType>::calc
 (
     TrackData& td,
     const scalar dt,
-    const label celli
+    const label cellI
 )
 {
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -58,7 +58,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcCoupled
     const scalar cp0 = this->cp_;
     const scalar np0 = this->nParticle_;
     const scalar T0 = this->T_;
-    scalarField& YMix = this->YMixture_;
+    scalarField& YMix = this->Y_;
 
     label idGas = td.cloud().composition().idGas();
     label idLiquid = td.cloud().composition().idLiquid();
@@ -94,14 +94,13 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcCoupled
     // Calculate heat transfer - update T
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     scalar htc = 0.0;
-    scalar T1 = calcHeatTransfer(td, dt, celli, htc, dhTrans);
+    scalar T1 = calcHeatTransfer(td, dt, cellI, htc, dhTrans);
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~
     // Calculate phase change
     // ~~~~~~~~~~~~~~~~~~~~~~
-    scalarField X = td.cloud().composition().X(idLiquid, YLiquid_);
-    calcPhaseChange(td, dt, T0, X, dMassMT);
+    scalar dMassPC = calcPhaseChange(td, dt, cellI, T1, dMassMT);
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -116,7 +115,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcCoupled
     // Initialise enthalpy retention to zero
     scalar dhRet = 0.0;
 
-    calcSurfaceReactions(td, dt, celli, T0, T1, dMassMT, dMassSR, dhRet);
+    calcSurfaceReactions(td, dt, cellI, T0, T1, dMassMT, dMassSR, dhRet);
 
     // New total mass
     const scalar mass1 = mass0 - sum(dMassMT) - sum(dMassSR);
@@ -128,10 +127,10 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcCoupled
        *sum(dMassMT)
        /(0.5*(mass0 + mass1)*cp0);
 
-    // Add retained enthalpy from surface reaction to particle and remove
-    // from gas
-    T1 += dhRet/(0.5*(mass0 + mass1)*cp0);
-    dhTrans -= dhRet;
+    // Enthalpy retention divided between particle and carrier phase by the
+    // fraction fh and (1 - fh)
+    T1 += td.constProps().fh()*dhRet/(0.5*(mass0 + mass1)*cp0);
+    dhTrans -= (1.0 - td.constProps().fh())*dhRet;
 
     // Correct dhTrans to account for enthalpy of evolved volatiles
     dhTrans +=
@@ -151,21 +150,21 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcCoupled
     // Transfer mass lost from particle to carrier mass source
     forAll(dMassMT, i)
     {
-        td.cloud().rhoTrans(i)[celli] += np0*(dMassMT[i] + dMassSR[i]);
+        td.cloud().rhoTrans(i)[cellI] += np0*(dMassMT[i] + dMassSR[i]);
     }
 
     // Update momentum transfer
-    td.cloud().UTrans()[celli] += np0*dUTrans;
+    td.cloud().UTrans()[cellI] += np0*dUTrans;
 
     // Accumulate coefficient to be applied in carrier phase momentum coupling
-    td.cloud().UCoeff()[celli] += np0*mass0*Cud;
+    td.cloud().UCoeff()[cellI] += np0*mass0*Cud;
 
     // Update enthalpy transfer
     // - enthalpy of lost solids already accounted for
-    td.cloud().hTrans()[celli] += np0*dhTrans;
+    td.cloud().hTrans()[cellI] += np0*dhTrans;
 
     // Accumulate coefficient to be applied in carrier phase enthalpy coupling
-    td.cloud().hCoeff()[celli] += np0*htc*this->areaS();
+    td.cloud().hCoeff()[cellI] += np0*htc*this->areaS();
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -178,9 +177,9 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcCoupled
         // Absorb particle(s) into carrier phase
         forAll(dMassMT, i)
         {
-            td.cloud().rhoTrans(i)[celli] += np0*dMassMT[i];
+            td.cloud().rhoTrans(i)[cellI] += np0*dMassMT[i];
         }
-        td.cloud().hTrans()[celli] +=
+        td.cloud().hTrans()[cellI] +=
             np0*mass1
            *(
                 YMix[0]
@@ -188,7 +187,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcCoupled
               + YMix[2]
                *td.cloud().composition().H(idSolid, YSolid_, this->pc_, T1)
             );
-        td.cloud().UTrans()[celli] += np0*mass1*U1;
+        td.cloud().UTrans()[cellI] += np0*mass1*U1;
     }
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Set new particle properties
@@ -215,123 +214,6 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcCoupled
 }
 
 
-template<class ParcelType>
-template<class TrackData>
-void Foam::ReactingMultiphaseParcel<ParcelType>::calcUncoupled
-(
-    TrackData& td,
-    const scalar dt,
-    const label celli
-)
-{
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Define local properties at beginning of timestep
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    const scalar T0 = this->T_;
-    const scalar mass0 = this->mass();
-    const scalar cp0 = this->cp_;
-    scalarField& YMix = this->YMixture_;
-
-    label idGas = td.cloud().composition().idGas();
-    label idLiquid = td.cloud().composition().idLiquid();
-    label idSolid = td.cloud().composition().idSolid();
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Initialise transfer terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    // Momentum transfer from the particle to the carrier phase
-    vector dUTrans = vector::zero;
-
-    // Enthalpy transfer from the particle to the carrier phase
-    scalar dhTrans = 0.0;
-
-    // Mass transfer from particle to carrier phase
-    // - components exist in particle already
-    scalarList dMassMT(td.cloud().gases().size(), 0.0);
-
-    // Mass transfer due to surface reactions from particle to carrier phase
-    // - components do not necessarily exist in particle already
-    scalarList dMassSR(td.cloud().gases().size(), 0.0);
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate velocity - update U
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    scalar Cud = 0.0;
-    const vector U1 = calcVelocity(td, dt, Cud, dUTrans);
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate heat transfer - update T
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    scalar htc = 0.0;
-    scalar T1 = calcHeatTransfer(td, dt, celli, htc, dhTrans);
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate phase change
-    // ~~~~~~~~~~~~~~~~~~~~~~
-    scalarField X = td.cloud().composition().X(idLiquid, YLiquid_);
-    calcPhaseChange(td, dt, T0, YLiquid_, dMassMT);
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate Devolatilisation
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
-    calcDevolatilisation(td, dt, T0, T1, dMassMT);
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate surface reactions
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    // Initialise enthalpy retention to zero
-    scalar dhRet = 0.0;
-
-    calcSurfaceReactions(td, dt, celli, T0, T1, dMassMT, dMassSR, dhRet);
-
-    // New total mass
-    const scalar mass1 = mass0 - sum(dMassMT) - sum(dMassSR);
-
-    // New specific heat capacity
-    const scalar cp1 =
-        YMix[0]*td.cloud().composition().cp(idGas, YGas_, this->pc_, T1)
-      + YMix[1]*td.cloud().composition().cp(idLiquid, YLiquid_, this->pc_, T1)
-      + YMix[2]*td.cloud().composition().cp(idSolid, YSolid_, this->pc_, T1);
-
-    // Add retained enthalpy to particle
-    T1 += dhRet/(mass0*0.5*(cp0 + cp1));
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Remove the particle when mass falls below minimum threshold
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    if (mass1 < td.constProps().minParticleMass())
-    {
-        td.keepParticle = false;
-    }
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Set new particle properties
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    else
-    {
-        this->U_ = U1;
-        this->T_ = T1;
-        this->cp_ = cp1;
-
-        // Update particle density or diameter
-        if (td.constProps().constantVolume())
-        {
-            this->rho_ = mass1/this->volume();
-        }
-        else
-        {
-            this->d_ = cbrt(mass1/this->rho_*6.0/mathematicalConstant::pi);
-        }
-    }
-}
-
-
 template<class ParcelType>
 template<class TrackData>
 void Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
@@ -358,7 +240,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
             ")\n"
             "no treatment currently available for particles containing "
             "liquid species"
-        )
+        );
     }
 
     // Check that model is active, and that the parcel temperature is
@@ -375,7 +257,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
 
     // Determine mass to add to carrier phase
     const scalar mass = this->mass();
-    scalarField& YMix = this->YMixture_;
+    scalarField& YMix = this->Y_;
     const scalar dMassTot = td.cloud().devolatilisation().calculate
     (
         dt,
@@ -413,7 +295,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
 (
     TrackData& td,
     const scalar dt,
-    const label celli,
+    const label cellI,
     const scalar T0,
     const scalar T1,
     const scalarList& dMassMT,
@@ -432,7 +314,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
     td.cloud().surfaceReaction().calculate
     (
         dt,
-        celli,
+        cellI,
         this->d_,
         T0,
         T1,
@@ -444,12 +326,12 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
         YGas_,
         YLiquid_,
         YSolid_,
-        this->YMixture_,
+        this->Y_,
         dMassSR,
         dhRet
     );
 
-    // TODO: td.cloud().addToMassDevolatilisation(sum(dMassSR));
+    // TODO: td.cloud().addToMassSurfaceReaction(sum(dMassSR));
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
index a0d9ea528f..d53fc2a6d0 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -79,6 +79,10 @@ public:
             //- Latent heat of devolatilisation [J/kg]
             const scalar Ldevol_;
 
+            //- Fraction of enthalpy retained by parcel due to surface
+            //  reactions
+            const scalar fh_;
+
 
     public:
 
@@ -89,6 +93,10 @@ public:
 
             //- Return const access to the latent heat of devolatilisation
             inline scalar Ldevol() const;
+
+            //- Return const access to the fraction of enthalpy retained by
+            // parcel due to surface reactions
+            inline scalar fh() const;
     };
 
 
@@ -174,7 +182,7 @@ protected:
         (
             TrackData& td,
             const scalar dt,
-            const label celli,
+            const label cellI,
             const scalar T0,
             const scalar T1,
             const scalarList& dMassMT,
@@ -199,14 +207,14 @@ public:
             ReactingMultiphaseCloud<ParcelType>& owner,
             const label typeId,
             const vector& position,
-            const label celli,
+            const label cellI,
             const scalar d0,
             const vector& U0,
             const scalar nParticle0,
             const scalarField& YGas0,
             const scalarField& YLiquid0,
             const scalarField& YSolid0,
-            const scalarField& YMixture0,
+            const scalarField& Y0,
             const constantProperties& constProps
         );
 
@@ -262,25 +270,16 @@ public:
             (
                 TrackData& td,
                 const scalar dt,
-                const label celli
+                const label cellI
             );
 
-            //- Coupled calculation with the continuous phase
+            //- Update parcel properties over the time interval
             template<class TrackData>
-            void calcCoupled
+            void calc
             (
                 TrackData& td,
                 const scalar dt,
-                const label celli
-            );
-
-            //- Uncoupled calculation with the continuous phase
-            template<class TrackData>
-            void calcUncoupled
-            (
-                TrackData& td,
-                const scalar dt,
-                const label
+                const label cellI
             );
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
index a87ad6032b..1018f1e3f2 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
@@ -34,7 +34,8 @@ constantProperties
 )
 :
     ReactingParcel<ParcelType>::constantProperties(dict),
-    Ldevol_(dimensionedScalar(dict.lookup("Ldevol")).value())
+    Ldevol_(dimensionedScalar(dict.lookup("Ldevol")).value()),
+    fh_(dimensionedScalar(dict.lookup("fh")).value())
 {}
 
 
@@ -75,14 +76,14 @@ inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
     ReactingMultiphaseCloud<ParcelType>& owner,
     const label typeId,
     const vector& position,
-    const label celli,
+    const label cellI,
     const scalar d0,
     const vector& U0,
     const scalar nParticle0,
     const scalarField& YGas0,
     const scalarField& YLiquid0,
     const scalarField& YSolid0,
-    const scalarField& YMixture0,
+    const scalarField& Y0,
     const constantProperties& constProps
 )
 :
@@ -91,11 +92,11 @@ inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
         owner,
         typeId,
         position,
-        celli,
+        cellI,
         d0,
         U0,
         nParticle0,
-        YMixture0,
+        Y0,
         constProps
     ),
     YGas_(YGas0),
@@ -114,6 +115,14 @@ Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::Ldevol() const
 }
 
 
+template<class ParcelType>
+inline Foam::scalar
+Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::fh() const
+{
+    return fh_;
+}
+
+
 // * * * * * * * * * * * trackData Member Functions  * * * * * * * * * * * * //
 
 template<class ParcelType>
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
index bb53f10a20..e94d3b9177 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
@@ -68,7 +68,7 @@ Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
         }
 
         // scale the mass fractions
-        const scalarField& YMix = this->YMixture_;
+        const scalarField& YMix = this->Y_;
         YGas_ /= YMix[0] + ROOTVSMALL;
         YLiquid_ /= YMix[1] + ROOTVSMALL;
         YSolid_ /= YMix[2] + ROOTVSMALL;
@@ -129,7 +129,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
         forAllIter(typename Cloud<ParcelType>, c, iter)
         {
             ReactingMultiphaseParcel<ParcelType>& p = iter();
-            p.YGas_[j] = YGas[i++]/(p.YMixture()[0] + ROOTVSMALL);
+            p.YGas_[j] = YGas[i++]/(p.Y()[0] + ROOTVSMALL);
         }
     }
     // Populate YLiquid for each parcel
@@ -144,7 +144,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
         forAllIter(typename Cloud<ParcelType>, c, iter)
         {
             ReactingMultiphaseParcel<ParcelType>& p = iter();
-            p.YLiquid_[j] = YLiquid[i++]/(p.YMixture()[1] + ROOTVSMALL);
+            p.YLiquid_[j] = YLiquid[i++]/(p.Y()[1] + ROOTVSMALL);
         }
     }
     // Populate YSolid for each parcel
@@ -159,7 +159,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
         forAllIter(typename Cloud<ParcelType>, c, iter)
         {
             ReactingMultiphaseParcel<ParcelType>& p = iter();
-            p.YSolid_[j] = YSolid[i++]/(p.YMixture()[2] + ROOTVSMALL);
+            p.YSolid_[j] = YSolid[i++]/(p.Y()[2] + ROOTVSMALL);
         }
     }
 }
@@ -192,7 +192,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
             forAllConstIter(typename Cloud<ParcelType>, c, iter)
             {
                 const ReactingMultiphaseParcel<ParcelType>& p0 = iter();
-                YGas[i++] = p0.YGas()[j]*p0.YMixture()[0];
+                YGas[i++] = p0.YGas()[j]*p0.Y()[0];
             }
 
             YGas.write();
@@ -211,7 +211,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
             forAllConstIter(typename Cloud<ParcelType>, c, iter)
             {
                 const ReactingMultiphaseParcel<ParcelType>& p0 = iter();
-                YLiquid[i++] = p0.YLiquid()[j]*p0.YMixture()[1];
+                YLiquid[i++] = p0.YLiquid()[j]*p0.Y()[1];
             }
 
             YLiquid.write();
@@ -230,7 +230,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
             forAllConstIter(typename Cloud<ParcelType>, c, iter)
             {
                 const ReactingMultiphaseParcel<ParcelType>& p0 = iter();
-                YSolid[i++] = p0.YSolid()[j]*p0.YMixture()[2];
+                YSolid[i++] = p0.YSolid()[j]*p0.Y()[2];
             }
 
             YSolid.write();
@@ -248,9 +248,9 @@ Foam::Ostream& Foam::operator<<
     const ReactingMultiphaseParcel<ParcelType>& p
 )
 {
-    scalarField YGasLoc = p.YGas()*p.YMixture()[0];
-    scalarField YLiquidLoc = p.YLiquid()*p.YMixture()[1];
-    scalarField YSolidLoc = p.YSolid()*p.YMixture()[2];
+    scalarField YGasLoc = p.YGas()*p.Y()[0];
+    scalarField YLiquidLoc = p.YLiquid()*p.Y()[1];
+    scalarField YSolidLoc = p.YSolid()*p.Y()[2];
     if (os.format() == IOstream::ASCII)
     {
         os  << static_cast<const ReactingMultiphaseParcel<ParcelType>& >(p)
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index 01fa099a92..6240d503ba 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -34,22 +34,38 @@ void Foam::ReactingParcel<ParcelType>::updateCellQuantities
 (
     TrackData& td,
     const scalar dt,
-    const label celli
+    const label cellI
 )
 {
-    ThermoParcel<ParcelType>::updateCellQuantities(td, dt, celli);
+    ThermoParcel<ParcelType>::updateCellQuantities(td, dt, cellI);
 
-    pc_ = td.pInterp().interpolate(this->position(), celli);
+    pc_ = td.pInterp().interpolate(this->position(), cellI);
+}
+
+
+template<class ParcelType>
+void Foam::ReactingParcel<ParcelType>::updateMassFraction
+(
+    const scalar mass0,
+    const scalar mass1,
+    const scalarList& dMass,
+    scalarField& Y
+)
+{
+    forAll(Y, i)
+    {
+        Y[i] = (Y[i]*mass0 - dMass[i])/mass1;
+    }
 }
 
 
 template<class ParcelType>
 template<class TrackData>
-void Foam::ReactingParcel<ParcelType>::calcCoupled
+void Foam::ReactingParcel<ParcelType>::calc
 (
     TrackData& td,
     const scalar dt,
-    const label celli
+    const label cellI
 )
 {
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -61,7 +77,6 @@ void Foam::ReactingParcel<ParcelType>::calcCoupled
     const scalar np0 = this->nParticle_;
     const scalar T0 = this->T_;
 
-
     // ~~~~~~~~~~~~~~~~~~~~~~~~~
     // Initialise transfer terms
     // ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -73,7 +88,6 @@ void Foam::ReactingParcel<ParcelType>::calcCoupled
     scalar dhTrans = 0.0;
 
     // Mass transfer from particle to carrier phase
-    // - components exist in particle already
     scalarList dMassMT(td.cloud().gases().size(), 0.0);
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -87,147 +101,58 @@ void Foam::ReactingParcel<ParcelType>::calcCoupled
     // Calculate heat transfer - update T
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     scalar htc = 0.0;
-    scalar T1 = calcHeatTransfer(td, dt, celli, htc, dhTrans);
+    scalar T1 = calcHeatTransfer(td, dt, cellI, htc, dhTrans);
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate phase change
-    // ~~~~~~~~~~~~~~~~~~~~~~
-    scalarField X = td.cliud().composition().X(0, YMixture_);
-    calcPhaseChange(td, dt, T, X, dMassMT);
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Calculate phase change - update mass, Y, cp, T, dhTrans
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    const scalar dMassPC = calcPhaseChange(td, dt, cellI, T1, dMassMT);
 
-    // New total mass
-    const scalar mass1 = mass0 - sum(dMassMT);
+    // Update particle mass
+    scalar mass1 = mass0 - dMassPC;
+
+    // Update particle component mass fractions
+    updateMassFraction(mass0, mass1, dMassMT, Y_);
+
+    // New specific heat capacity of
+    scalar cp1 = td.cloud().composition().cp(0, Y_, pc_, T1);
+
+    // Correct temperature due to evaporated components
+    // TODO: use hl function in liquidMixture???
+    T1 -= td.constProps().Lvap()*dMassPC/(0.5*(mass0 + mass1)*cp1);
+
+    // Correct dhTrans to account for the change in enthalpy due to the
+    // phase change
+    scalar HMix = td.cloud().composition().H(0, Y_, pc, 0.5*(T0 + T1));
+    dhTrans += dMassPC*HMix;
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~
-    // Accumulate source terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~
-
-    // Transfer mass lost from particle to carrier mass source
-    forAll(dMassMT, i)
+    if (td.cloud().coupled())
     {
-        td.cloud().rhoTrans(i)[celli] += np0*dMassMT[i];
-    }
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // Accumulate carrier phase source terms
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    // Update momentum transfer
-    td.cloud().UTrans()[celli] += np0*dUTrans;
-
-    // Accumulate coefficient to be applied in carrier phase momentum coupling
-    td.cloud().UCoeff()[celli] += np0*mass0*Cud;
-
-    // Update enthalpy transfer
-    td.cloud().hTrans()[celli] += np0*dhTrans;
-
-    // Accumulate coefficient to be applied in carrier phase enthalpy coupling
-    td.cloud().hCoeff()[celli] += np0*htc*this->areaS();
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Remove the particle when mass falls below minimum threshold
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    if (mass1 < td.constProps().minParticleMass())
-    {
-        td.keepParticle = false;
-
-        // Absorb particle(s) into carrier phase
+        // Transfer mass lost from particle to carrier mass source
         forAll(dMassMT, i)
         {
-            td.cloud().rhoTrans(i)[celli] += np0*dMassMT[i];
+            td.cloud().rhoTrans(i)[cellI] += np0*dMassMT[i];
         }
-        td.cloud().UTrans()[celli] += np0*mass1*U1;
+
+        // Update momentum transfer
+        td.cloud().UTrans()[cellI] += np0*dUTrans;
+
+        // Coefficient to be applied in carrier phase momentum coupling
+        td.cloud().UCoeff()[cellI] += np0*mass0*Cud;
+
+        // Update enthalpy transfer
+        td.cloud().hTrans()[cellI] += np0*dhTrans;
+
+        // Coefficient to be applied in carrier phase enthalpy coupling
+        td.cloud().hCoeff()[cellI] += np0*htc*this->areaS();
     }
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Set new particle properties
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    else
-    {
-        this->U_ = U1;
-        this->T_ = T1;
-        //        this->cp_ = ??? // TODO:
 
-        // Update particle density or diameter
-        if (td.constProps().constantVolume())
-        {
-            this->rho_ = mass1/this->volume();
-        }
-        else
-        {
-            this->d_ = cbrt(mass1/this->rho_*6.0/mathematicalConstant::pi);
-        }
-    }
-}
-
-
-template<class ParcelType>
-template<class TrackData>
-void Foam::ReactingParcel<ParcelType>::calcUncoupled
-(
-    TrackData& td,
-    const scalar dt,
-    const label celli
-)
-{
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Define local properties at beginning of timestep
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    const scalar T0 = this->T_;
-    const scalar mass0 = this->mass();
-    const scalar cp0 = this->cp_;
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Initialise transfer terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    // Momentum transfer from the particle to the carrier phase
-    vector dUTrans = vector::zero;
-
-    // Enthalpy transfer from the particle to the carrier phase
-    scalar dhTrans = 0.0;
-
-    // Mass transfer from particle to carrier phase
-    // - components exist in particle already
-    scalarList dMassMT(td.cloud().gases().size(), 0.0);
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate velocity - update U
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    scalar Cud = 0.0;
-    const vector U1 = calcVelocity(td, dt, Cud, dUTrans);
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate heat transfer - update T
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    scalar htc = 0.0;
-    scalar T1 = calcHeatTransfer(td, dt, celli, htc, dhTrans);
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate phase change
-    // ~~~~~~~~~~~~~~~~~~~~~~
-    scalarField X = td.cloud().composition().X(0, YMixture_);
-    scalar dMassPC = calcPhaseChange(td, dt, T, X, dMassMT);
-    T1 -= td.constProps().Lvap()*dMassPC/(0.5*mass0*cp0);
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate surface reactions
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    // Initialise enthalpy retention to zero
-    scalar dhRet = 0.0;
-
-    // New total mass
-    const scalar mass1 = mass0 - sum(dMassMT);
-
-    // New specific heat capacity
-    const scalar cp1 = cp0; // TODO: new cp1
-
-    // Add retained enthalpy to particle
-    T1 += dhRet/(mass0*0.5*(cp0 + cp1));
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Remove the particle when mass falls below minimum threshold
@@ -235,6 +160,17 @@ void Foam::ReactingParcel<ParcelType>::calcUncoupled
     if (mass1 < td.constProps().minParticleMass())
     {
         td.keepParticle = false;
+
+        if (td.cloud().coupled())
+        {
+            // Absorb particle(s) into carrier phase
+            forAll(dMassMT, i)
+            {
+                td.cloud().rhoTrans(i)[cellI] += np0*mass1*Y_[i];
+            }
+            td.cloud().UTrans()[cellI] += np0*mass1*U1;
+            td.cloud().hTrans()[cellI] += np0*mass1*HMix;
+        }
     }
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Set new particle properties
@@ -260,39 +196,36 @@ void Foam::ReactingParcel<ParcelType>::calcUncoupled
 
 template<class ParcelType>
 template<class TrackData>
-void Foam::ReactingParcel<ParcelType>::calcPhaseChange
+Foam::scalar Foam::ReactingParcel<ParcelType>::calcPhaseChange
 (
     TrackData& td,
     const scalar dt,
+    const label cellI,
     const scalar T,
-    scalarField& X,
     scalarList& dMassMT
 )
 {
     if (!td.cloud().phaseChange().active())
     {
-        return;
+        return 0.0;
     }
 
-    // TODO: separate treatment for boiling
-
-    scalar dMassTot = td.cloud().phaseChange().calculate
+    scalar dMass = td.cloud().phaseChange().calculate
     (
+        dt,
+        cellI,
         T,
-        this->d_,
-        X,
-        dMassMT,
-        this->U_ - this->Uc_,
-        this->Tc_,
         pc_,
+        this->d_,
+        this->Tc_,
         this->muc_/this->rhoc_,
-        dt
+        this->U_ - this->Uc_,
+        dMassMT
     );
 
-    td.cloud().addToMassPhaseChange(dMassTot);
-    // TODO: Re-calculate mass fractions
-
+    td.cloud().addToMassPhaseChange(dMass);
 
+    return dMass;
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index a4e19fbbae..6848a58d24 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -175,7 +175,7 @@ protected:
             scalar mass0_;
 
             //- Mass fractions of mixture []
-            scalarField YMixture_;
+            scalarField Y_;
 
 
         // Cell-based quantities
@@ -188,15 +188,24 @@ protected:
 
         //- Calculate Phase change
         template<class TrackData>
-        void calcPhaseChange
+        scalar calcPhaseChange
         (
             TrackData& td,
             const scalar dt,
+            const label cellI,
             const scalar T,
-            scalarField& X,
             scalarList& dMassMT
         );
 
+        //- Update mass fraction
+        void updateMassFraction
+        (
+            const scalar mass0,
+            const scalar mass1,
+            const scalarList& dMass,
+            scalarField& Y
+        );
+
 
 public:
 
@@ -214,11 +223,11 @@ public:
             ReactingCloud<ParcelType>& owner,
             const label typeId,
             const vector& position,
-            const label celli,
+            const label cellI,
             const scalar d0,
             const vector& U0,
             const scalar nParticle0,
-            const scalarField& YMixture0,
+            const scalarField& Y0,
             const constantProperties& constProps
         );
 
@@ -245,7 +254,7 @@ public:
             inline scalar mass0() const;
 
             //- Return const access to mass fractions of mixture
-            inline const scalarField& YMixture() const;
+            inline const scalarField& Y() const;
 
             //- Return the owner cell pressure
             inline scalar pc() const;
@@ -257,7 +266,7 @@ public:
             inline scalar& mass0();
 
             //- Return access to mass fractions of mixture
-            inline scalarField& YMixture();
+            inline scalarField& Y();
 
 
         // Main calculation loop
@@ -268,25 +277,16 @@ public:
             (
                 TrackData& td,
                 const scalar dt,
-                const label celli
+                const label cellI
             );
 
-            //- Coupled calculation with the continuous phase
+            //- Update parcel properties over the time interval
             template<class TrackData>
-            void calcCoupled
+            void calc
             (
                 TrackData& td,
                 const scalar dt,
-                const label celli
-            );
-
-            //- Uncoupled calculation with the continuous phase
-            template<class TrackData>
-            void calcUncoupled
-            (
-                TrackData& td,
-                const scalar dt,
-                const label
+                const label cellI
             );
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
index 5e8c48025e..b3d6fd0b4a 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
@@ -77,11 +77,11 @@ inline Foam::ReactingParcel<ParcelType>::ReactingParcel
     ReactingCloud<ParcelType>& owner,
     const label typeId,
     const vector& position,
-    const label celli,
+    const label cellI,
     const scalar d0,
     const vector& U0,
     const scalar nParticle0,
-    const scalarField& YMixture0,
+    const scalarField& Y0,
     const constantProperties& constProps
 )
 :
@@ -90,14 +90,14 @@ inline Foam::ReactingParcel<ParcelType>::ReactingParcel
         owner,
         typeId,
         position,
-        celli,
+        cellI,
         d0,
         U0,
         nParticle0,
         constProps
     ),
     mass0_(0.0),
-    YMixture_(YMixture0),
+    Y_(Y0),
     pc_(0.0)
 {
     // Set initial parcel mass
@@ -176,9 +176,9 @@ inline Foam::scalar Foam::ReactingParcel<ParcelType>::mass0() const
 
 template<class ParcelType>
 inline const Foam::scalarField& Foam::ReactingParcel<ParcelType>::
-YMixture() const
+Y() const
 {
-    return YMixture_;
+    return Y_;
 }
 
 
@@ -197,9 +197,9 @@ inline Foam::scalar& Foam::ReactingParcel<ParcelType>::mass0()
 
 
 template<class ParcelType>
-inline Foam::scalarField& Foam::ReactingParcel<ParcelType>::YMixture()
+inline Foam::scalarField& Foam::ReactingParcel<ParcelType>::Y()
 {
-    return YMixture_;
+    return Y_;
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
index 98076d4b27..585f688eef 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
@@ -39,7 +39,7 @@ Foam::ReactingParcel<ParcelType>::ReactingParcel
 :
     ThermoParcel<ParcelType>(cloud, is, readFields),
     mass0_(0.0),
-    YMixture_(0),
+    Y_(0),
     pc_(0.0)
 {
     if (readFields)
@@ -48,11 +48,11 @@ Foam::ReactingParcel<ParcelType>::ReactingParcel
             dynamic_cast<const ReactingCloud<ParcelType>& >(cloud);
 
         const label nMixture = cR.composition().phaseTypes().size();
-        YMixture_.setSize(nMixture);
+        Y_.setSize(nMixture);
 
         if (is.format() == IOstream::ASCII)
         {
-            is >> mass0_ >> YMixture_;
+            is >> mass0_ >> Y_;
         }
         else
         {
@@ -61,7 +61,7 @@ Foam::ReactingParcel<ParcelType>::ReactingParcel
                 reinterpret_cast<char*>(&mass0_),
               + sizeof(mass0_)
             );
-            is >> YMixture_;
+            is >> Y_;
         }
     }
 
@@ -109,13 +109,13 @@ void Foam::ReactingParcel<ParcelType>::readFields
     forAllIter(typename Cloud<ParcelType>, c, iter)
     {
         ReactingParcel<ParcelType>& p = iter();
-        p.YMixture_.setSize(nPhases, 0.0);
+        p.Y_.setSize(nPhases, 0.0);
     }
 
-    // Populate YMixture for each parcel
+    // Populate Y for each parcel
     forAll(phaseTypes, j)
     {
-        IOField<scalar> YMixture
+        IOField<scalar> Y
         (
             c.fieldIOobject("Y" + phaseTypes[j], IOobject::MUST_READ)
         );
@@ -124,7 +124,7 @@ void Foam::ReactingParcel<ParcelType>::readFields
         forAllIter(typename Cloud<ParcelType>, c, iter)
         {
             ReactingParcel<ParcelType>& p = iter();
-            p.YMixture_[j] = YMixture[i++];
+            p.Y_[j] = Y[i++];
         }
     }
 }
@@ -157,7 +157,7 @@ void Foam::ReactingParcel<ParcelType>::writeFields
         const wordList phaseTypes = c.composition().phaseTypes();
         forAll(phaseTypes, j)
         {
-            IOField<scalar> YMixture
+            IOField<scalar> Y
             (
                 c.fieldIOobject("Y" + phaseTypes[j], IOobject::NO_READ),
                 np
@@ -167,10 +167,10 @@ void Foam::ReactingParcel<ParcelType>::writeFields
             forAllConstIter(typename Cloud<ParcelType>, c, iter)
             {
                 const ReactingParcel<ParcelType>& p0 = iter();
-                YMixture[i++] = p0.YMixture()[j];
+                Y[i++] = p0.Y()[j];
             }
 
-            YMixture.write();
+            Y.write();
         }
     }
 }
@@ -189,7 +189,7 @@ Foam::Ostream& Foam::operator<<
     {
         os  << static_cast<const ThermoParcel<ParcelType>& >(p)
             << token::SPACE << p.mass0()
-            << token::SPACE << p.YMixture();
+            << token::SPACE << p.Y();
     }
     else
     {
@@ -200,7 +200,7 @@ Foam::Ostream& Foam::operator<<
             reinterpret_cast<const char*>(&p.mass0_),
             sizeof(p.mass0())
         );
-        os << p.YMixture();
+        os << p.Y();
     }
 
     // Check state of Ostream
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
index 16854519d0..99bf172920 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -34,23 +34,23 @@ void Foam::ThermoParcel<ParcelType>::updateCellQuantities
 (
     TrackData& td,
     const scalar dt,
-    const label celli
+    const label cellI
 )
 {
-    KinematicParcel<ParcelType>::updateCellQuantities(td, dt, celli);
+    KinematicParcel<ParcelType>::updateCellQuantities(td, dt, cellI);
 
-    Tc_ = td.TInterp().interpolate(this->position(), celli);
-    cpc_ = td.cpInterp().interpolate(this->position(), celli);
+    Tc_ = td.TInterp().interpolate(this->position(), cellI);
+    cpc_ = td.cpInterp().interpolate(this->position(), cellI);
 }
 
 
 template<class ParcelType>
 template<class TrackData>
-void Foam::ThermoParcel<ParcelType>::calcCoupled
+void Foam::ThermoParcel<ParcelType>::calc
 (
     TrackData& td,
     const scalar dt,
-    const label celli
+    const label cellI
 )
 {
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -59,8 +59,6 @@ void Foam::ThermoParcel<ParcelType>::calcCoupled
     const vector U0 = this->U_;
     const scalar mass0 = this->mass();
     const scalar np0 = this->nParticle_;
-//    const scalar T0 = T_;
-//    const scalar cp0 = cp_;
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -85,25 +83,27 @@ void Foam::ThermoParcel<ParcelType>::calcCoupled
     // Calculate heat transfer - update T
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     scalar htc = 0.0;
-    const scalar T1 = calcHeatTransfer(td, dt, celli, htc, dhTrans);
+    const scalar T1 = calcHeatTransfer(td, dt, cellI, htc, dhTrans);
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~
-    // Accumulate source terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~
+    if (td.cloud().coupled())
+    {
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // Accumulate carrier phase source terms
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    // Update momentum transfer
-    td.cloud().UTrans()[celli] += np0*dUTrans;
+        // Update momentum transfer
+        td.cloud().UTrans()[cellI] += np0*dUTrans;
 
-    // Accumulate coefficient to be applied in carrier phase momentum coupling
-    td.cloud().UCoeff()[celli] += np0*mass0*Cud;
+        // Coefficient to be applied in carrier phase momentum coupling
+        td.cloud().UCoeff()[cellI] += np0*mass0*Cud;
 
-    // Update enthalpy transfer
-    td.cloud().hTrans()[celli] += np0*dhTrans;
-
-    // Accumulate coefficient to be applied in carrier phase enthalpy coupling
-    td.cloud().hCoeff()[celli] += np0*htc*this->areaS();
+        // Update enthalpy transfer
+        td.cloud().hTrans()[cellI] += np0*dhTrans;
 
+        // Coefficient to be applied in carrier phase enthalpy coupling
+        td.cloud().hCoeff()[cellI] += np0*htc*this->areaS();
+    }
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Set new particle properties
@@ -113,48 +113,13 @@ void Foam::ThermoParcel<ParcelType>::calcCoupled
 }
 
 
-template<class ParcelType>
-template<class TrackData>
-void Foam::ThermoParcel<ParcelType>::calcUncoupled
-(
-    TrackData& td,
-    const scalar dt,
-    const label celli
-)
-{
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Initialise transfer terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    // Momentum transfer from the particle to the carrier phase
-    vector dUTrans = vector::zero;
-
-    // Enthalpy transfer from the particle to the carrier phase
-    scalar dhTrans = 0.0;
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate velocity - update U
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    scalar Cud = 0.0;
-    this->U_ = calcVelocity(td, dt, Cud, dUTrans);
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate heat transfer - update T
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    scalar htc = 0.0;
-    T_ = calcHeatTransfer(td, dt, celli, htc, dhTrans);
-}
-
-
 template<class ParcelType>
 template <class TrackData>
 Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
 (
     TrackData& td,
     const scalar dt,
-    const label celli,
+    const label cellI,
     scalar& htc,
     scalar& dhTrans
 )
@@ -193,7 +158,7 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
         const scalar sigma = radiation::sigmaSB.value();
         const scalar epsilon = td.constProps().epsilon0();
         const scalar epsilonSigmaT3 = epsilon*sigma*pow3(T_);
-        ap = (htc*Tc_ + 0.25*epsilon*G[celli])/(htc + epsilonSigmaT3);
+        ap = (htc*Tc_ + 0.25*epsilon*G[cellI])/(htc + epsilonSigmaT3);
         bp += epsilonSigmaT3;
     }
     bp *= 6.0/(this->rho_*this->d_*cp_);
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
index 0f2b48416d..bc66a2a7d2 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
@@ -209,7 +209,7 @@ protected:
         (
             TrackData& td,
             const scalar dt,
-            const label celli,
+            const label cellI,
             scalar& htc,
             scalar& dhTrans
         );
@@ -231,7 +231,7 @@ public:
             ThermoCloud<ParcelType>& owner,
             const label typeId,
             const vector& position,
-            const label celli,
+            const label cellI,
             const scalar d0,
             const vector& U0,
             const scalar nParticle0,
@@ -281,25 +281,16 @@ public:
             (
                 TrackData& td,
                 const scalar dt,
-                const label celli
+                const label cellI
             );
 
-            //- Coupled calculation with the continuous phase
+            //- Update parcel properties over the time interval
             template<class TrackData>
-            void calcCoupled
+            void calc
             (
                 TrackData& td,
                 const scalar dt,
-                const label celli
-            );
-
-            //- Uncoupled calculation with the continuous phase
-            template<class TrackData>
-            void calcUncoupled
-            (
-                TrackData& td,
-                const scalar dt,
-                const label
+                const label cellI
             );
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
index f1f6e1d8fd..c6f0f2b816 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
@@ -75,7 +75,7 @@ inline Foam::ThermoParcel<ParcelType>::ThermoParcel
     ThermoCloud<ParcelType>& owner,
     const label typeId,
     const vector& position,
-    const label celli,
+    const label cellI,
     const scalar d0,
     const vector& U0,
     const scalar nParticle0,
@@ -87,7 +87,7 @@ inline Foam::ThermoParcel<ParcelType>::ThermoParcel
         owner,
         typeId,
         position,
-        celli,
+        cellI,
         d0,
         U0,
         nParticle0,
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C
index 244f49ad90..c0d438df24 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C
@@ -43,7 +43,7 @@ Foam::basicKinematicParcel::basicKinematicParcel
     KinematicCloud<basicKinematicParcel>& owner,
     const label typeId,
     const vector& position,
-    const label celli,
+    const label cellI,
     const scalar d0,
     const vector& U0,
     const scalar nParticle0,
@@ -55,7 +55,7 @@ Foam::basicKinematicParcel::basicKinematicParcel
         owner,
         typeId,
         position,
-        celli,
+        cellI,
         d0,
         U0,
         nParticle0,
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H
index decc0b57e8..b5da2267e7 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H
@@ -66,7 +66,7 @@ public:
             KinematicCloud<basicKinematicParcel>& owner,
             const label typeId,
             const vector& position,
-            const label celli,
+            const label cellI,
             const scalar d0,
             const vector& U0,
             const scalar nParticle0,
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C
index 99d4ec05b0..0f7ce9173f 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C
@@ -43,14 +43,14 @@ Foam::basicReactingMultiphaseParcel::basicReactingMultiphaseParcel
     ReactingMultiphaseCloud<basicReactingMultiphaseParcel>& owner,
     const label typeId,
     const vector& position,
-    const label celli,
+    const label cellI,
     const scalar d0,
     const vector& U0,
     const scalar nParticle0,
     const scalarField& YGas0,
     const scalarField& YLiquid0,
     const scalarField& YSolid0,
-    const scalarField& YMixture0,
+    const scalarField& Y0,
     const constantProperties& constProps
 )
 :
@@ -59,14 +59,14 @@ Foam::basicReactingMultiphaseParcel::basicReactingMultiphaseParcel
         owner,
         typeId,
         position,
-        celli,
+        cellI,
         d0,
         U0,
         nParticle0,
         YGas0,
         YLiquid0,
         YSolid0,
-        YMixture0,
+        Y0,
         constProps
     )
 {}
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H
index c39fae262e..bb5053ff74 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H
@@ -66,14 +66,14 @@ public:
              ReactingMultiphaseCloud<basicReactingMultiphaseParcel>& owner,
              const label typeId,
              const vector& position,
-             const label celli,
+             const label cellI,
              const scalar d0,
              const vector& U0,
              const scalar nParticle0,
              const scalarField& YGas0,
              const scalarField& YLiquid0,
              const scalarField& YSolid0,
-             const scalarField& YMixture0,
+             const scalarField& Y0,
              const constantProperties& constProps
         );
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.C
index bb3a5e5da6..722c572e43 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.C
@@ -43,11 +43,11 @@ Foam::basicReactingParcel::basicReactingParcel
     ReactingCloud<basicReactingParcel>& owner,
     const label typeId,
     const vector& position,
-    const label celli,
+    const label cellI,
     const scalar d0,
     const vector& U0,
     const scalar nParticle0,
-    const scalarField& YMixture0,
+    const scalarField& Y0,
     const constantProperties& constProps
 )
 :
@@ -56,11 +56,11 @@ Foam::basicReactingParcel::basicReactingParcel
         owner,
         typeId,
         position,
-        celli,
+        cellI,
         d0,
         U0,
         nParticle0,
-        YMixture0,
+        Y0,
         constProps
     )
 {}
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H
index 5deef5d729..008a33b25b 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H
@@ -66,11 +66,11 @@ public:
             ReactingCloud<basicReactingParcel>& owner,
             const label typeId,
             const vector& position,
-            const label celli,
+            const label cellI,
             const scalar d0,
             const vector& U0,
             const scalar nParticle0,
-            const scalarField& YMixture0,
+            const scalarField& Y0,
             const constantProperties& constProps
         );
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C
index edbeef83b3..76a575d1de 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C
@@ -43,7 +43,7 @@ Foam::basicThermoParcel::basicThermoParcel
     ThermoCloud<basicThermoParcel>& owner,
     const label typeId,
     const vector position,
-    const label celli,
+    const label cellI,
     const scalar d0,
     const vector U0,
     const scalar nParticle0,
@@ -55,7 +55,7 @@ Foam::basicThermoParcel::basicThermoParcel
         owner,
         typeId,
         position,
-        celli,
+        cellI,
         d0,
         U0,
         nParticle0,
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
index 0eb00002df..c55471d3d1 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
@@ -65,7 +65,7 @@ public:
             ThermoCloud<basicThermoParcel>& owner,
             const label typeId,
             const vector position,
-            const label celli,
+            const label cellI,
             const scalar d0,
             const vector U0,
             const scalar nParticle0,
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C
index 56101256e0..276d54146b 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C
@@ -26,6 +26,13 @@ License
 
 #include "polynomial.H"
 
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(polynomial, 0);
+}
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::polynomial::polynomial(const word& entryName, Istream& is)
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
index b72c34f9bc..e3b9383ecd 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
@@ -67,6 +67,26 @@ Foam::label Foam::LiquidEvaporation<CloudType>::carrierSpecieId
 }
 
 
+template<class CloudType>
+Foam::scalarField Foam::LiquidEvaporation<CloudType>::calcXc
+(
+    const label cellI
+) const
+{
+    scalarField Xc(this->owner().carrierThermo().composition().Y().size());
+
+    scalar Winv = 0.0;
+    forAll(Xc, i)
+    {
+        scalar Y = this->owner().carrierThermo().composition().Y()[i][cellI];
+        Winv += Y/this->owner().gases()[i].W();
+        Xc[i] = Y/this->owner().gases()[i].W();
+    }
+
+    return Xc/Winv;
+}
+
+
 template <class CloudType>
 Foam::scalar Foam::LiquidEvaporation<CloudType>::Sh
 (
@@ -99,10 +119,10 @@ Foam::LiquidEvaporation<CloudType>::LiquidEvaporation
         )
     ),
     Tvap_(readScalar(this->coeffDict().lookup("Tvap"))),
-    evapProps_(this->coeffDict().lookup("activeLiquids")),
-    liqToGasMap_(evapProps_.size())
+    activeLiquids_(this->coeffDict().lookup("activeLiquids")),
+    liqToGasMap_(activeLiquids_.size())
 {
-    if (evapProps_.size() == 0)
+    if (activeLiquids_.size() == 0)
     {
         WarningIn
         (
@@ -116,9 +136,9 @@ Foam::LiquidEvaporation<CloudType>::LiquidEvaporation
     }
 
     // Calculate mapping between liquid and carrier phase species
-    forAll(evapProps_, i)
+    forAll(activeLiquids_, i)
     {
-        liqToGasMap_[i] = carrierSpecieId(evapProps_[i].name());
+        liqToGasMap_[i] = carrierSpecieId(activeLiquids_[i]);
     }
 }
 
@@ -142,15 +162,15 @@ bool Foam::LiquidEvaporation<CloudType>::active() const
 template<class CloudType>
 Foam::scalar Foam::LiquidEvaporation<CloudType>::calculate
 (
+    const scalar dt,
+    const label cellI,
     const scalar T,
-    const scalar d,
-    const scalarField& Xc,
-    scalarList& dMassMT,
-    const vector& Ur,
-    const scalar Tc,
     const scalar pc,
+    const scalar d,
+    const scalar Tc,
     const scalar nuc,
-    const scalar dt
+    const vector& Ur,
+    scalarList& dMassMT
 ) const
 {
     scalar dMassTot = 0.0;
@@ -162,20 +182,25 @@ Foam::scalar Foam::LiquidEvaporation<CloudType>::calculate
     }
     else
     {
-        // droplet area
+        // Construct carrier phase species volume fractions
+        scalarField Xc = calcXc(cellI);
+
+        // droplet surface area
         scalar A = mathematicalConstant::pi*sqr(d);
 
         // Reynolds number
         scalar Re = mag(Ur)*d/(nuc + ROOTVSMALL);
 
         // Calculate mass transfer of each specie in liquid
-        forAll(evapProps_, i)
+        forAll(activeLiquids_, i)
         {
-            // Diffusion coefficient for species i
-            scalar Dab = evapProps_[i].Dab();
+            label gid = liqToGasMap_[i];
 
-            // Saturation pressure for species i at temperature T
-            scalar pSat = evapProps_[i].TvsPSat().value(T);
+            // Vapour diffusivity [m2/s]
+            scalar Dab = liquids_->properties()[gid].D(pc, T);
+
+            // Saturation pressure for species i [pa]
+            scalar pSat = liquids_->properties()[gid].pv(pc, T);
 
             // Schmidt number
             scalar Sc = nuc/(Dab + ROOTVSMALL);
@@ -190,15 +215,14 @@ Foam::scalar Foam::LiquidEvaporation<CloudType>::calculate
             scalar Cs = pSat/(specie::RR*T);
 
             // vapour concentration in bulk gas [kgmol/m3]
-            scalar Cinf = Xc[i]*pc/(specie::RR*Tc);
+            scalar Cinf = Xc[gid]*pc/(specie::RR*Tc);
 
             // molar flux of vapour [kgmol/m2/s]
             scalar Ni = max(kc*(Cs - Cinf), 0.0);
 
-            // mass transfer
-            label globalLiqId = liqToGasMap_[i];
-            scalar dm = Ni*A*liquids_->properties()[globalLiqId].W()*dt;
-            dMassMT[globalLiqId] -= dm;
+            // mass transfer [kg]
+            scalar dm = Ni*A*liquids_->properties()[gid].W()*dt;
+            dMassMT[gid] -= dm;
             dMassTot += dm;
         }
     }
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
index 0224b1bd5d..85d3714df3 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
@@ -35,9 +35,6 @@ Description
 
 #include "PhaseChangeModel.H"
 #include "liquidMixture.H"
-#include "Tuple2.H"
-
-#include "evaporationProperties.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -64,8 +61,8 @@ protected:
         //  allowed
         scalar Tvap_;
 
-        //- List of evaporation properties
-        List<evaporationProperties> evapProps_;
+        //- List of active liquid names
+        List<word> activeLiquids_;
 
         //- Mapping between liquid and carrier gas species
         List<label> liqToGasMap_;
@@ -79,6 +76,9 @@ protected:
         //- Sherwood number as a function of Reynolds and Schmidt numbers
         scalar Sh(const scalar Re, const scalar Sc) const;
 
+        //- Calculate the carrier phase comonent volume fractions at cellI
+        scalarField calcXc(const label cellI) const;
+
 
 public:
 
@@ -108,15 +108,15 @@ public:
         //- Update model
         scalar calculate
         (
+            const scalar dt,
+            const label cellI,
             const scalar T,
-            const scalar d,
-            const scalarField& Xc,
-            scalarList& dMassMT,
-            const vector& Ur,
-            const scalar Tc,
             const scalar pc,
+            const scalar d,
+            const scalar Tc,
             const scalar nuc,
-            const scalar dt
+            const vector& Ur,
+            scalarList& dMassMT
         ) const;
 };
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
index 360f0b3926..aa4fbc4cee 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
@@ -58,15 +58,15 @@ bool Foam::NoPhaseChange<CloudType>::active() const
 template<class CloudType>
 Foam::scalar Foam::NoPhaseChange<CloudType>::calculate
 (
+    const scalar,
+    const label,
+    const scalar,
+    const scalar,
+    const scalar,
     const scalar,
     const scalar,
-    const scalarField&,
-    scalarList&,
     const vector&,
-    const scalar,
-    const scalar,
-    const scalar,
-    const scalar
+    scalarList&
 ) const
 {
     // Nothing to do...
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
index d360e36d09..1a58a5141f 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
@@ -72,15 +72,15 @@ public:
         //- Update model
         scalar calculate
         (
+            const scalar dt,
+            const label cellI,
             const scalar T,
-            const scalar d,
-            const scalarField& Xc,
-            scalarList& dMassMT,
-            const vector& Ur,
-            const scalar Tc,
             const scalar pc,
+            const scalar d,
+            const scalar Tc,
             const scalar nuc,
-            const scalar dt
+            const vector& Ur,
+            scalarList& dMassMT
         ) const;
 };
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
index d0d40badc4..ff9a77e9b6 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
@@ -138,15 +138,15 @@ public:
         //- Update model
         virtual scalar calculate
         (
+            const scalar dt,
+            const label cellI,
             const scalar T,
-            const scalar d,
-            const scalarField& Xc,
-            scalarList& dMassMT,
-            const vector& Ur,
-            const scalar Tc,
             const scalar pc,
+            const scalar d,
+            const scalar Tc,
             const scalar nuc,
-            const scalar dt
+            const vector& Ur,
+            scalarList& dMassMT
         ) const = 0;
 };
 

From 0e2b526cfdabb9230c9eef142c204d67c6cbacc2 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 6 Mar 2009 13:50:17 +0000
Subject: [PATCH 030/175] more updates

---
 .../Templates/KinematicCloud/KinematicCloud.H |   5 +
 .../KinematicCloud/KinematicCloudI.H          |   8 +
 .../Templates/ReactingCloud/ReactingCloud.H   |   4 +
 .../Templates/ReactingCloud/ReactingCloudI.H  |   8 +
 .../ReactingMultiphaseCloud.H                 |   5 +
 .../ReactingMultiphaseCloudI.H                |   8 +
 .../Templates/ThermoCloud/ThermoCloud.H       |   4 +
 .../Templates/ThermoCloud/ThermoCloudI.H      |   8 +
 .../KinematicParcel/KinematicParcel.C         |  19 +-
 .../ReactingMultiphaseParcel.C                | 202 +++++++++++-------
 .../ReactingMultiphaseParcel.H                |  18 +-
 .../ReactingMultiphaseParcelIO.C              |  71 ++++--
 .../Templates/ReactingParcel/ReactingParcel.C | 123 ++++++-----
 .../Templates/ReactingParcel/ReactingParcel.H |   8 +-
 .../ReactingParcel/ReactingParcelI.H          |  14 +-
 .../ReactingParcel/ReactingParcelIO.C         |  65 ++++--
 .../Templates/ThermoParcel/ThermoParcel.C     |  41 ++--
 .../phaseProperties/phaseProperties.C         |  63 +++++-
 .../phaseProperties/phaseProperties.H         |   9 +
 .../phaseProperties/phasePropertiesIO.C       |  15 +-
 .../phasePropertiesList/phasePropertiesList.C |  13 +-
 .../phasePropertiesList/phasePropertiesList.H |   6 +
 .../IO/DataEntry/DataEntry/NewDataEntry.C     |   2 +-
 .../DispersionModel/NewDispersionModel.C      |  12 +-
 .../DragModel/DragModel/NewDragModel.C        |  15 +-
 .../InjectionModel/InjectionModel.C           |  32 +--
 .../InjectionModel/NewInjectionModel.C        |  12 +-
 .../NewWallInteractionModel.C                 |  15 +-
 .../CompositionModel/CompositionModel.C       | 127 ++++++++---
 .../CompositionModel/CompositionModel.H       |  14 +-
 .../CompositionModel/NewCompositionModel.C    |  13 +-
 .../SingleMixtureFraction.C                   |  20 +-
 .../LiquidEvaporation/LiquidEvaporation.C     | 106 +++++----
 .../LiquidEvaporation/LiquidEvaporation.H     |   8 +-
 .../PhaseChangeModel/NewPhaseChangeModel.C    |  13 +-
 .../NewDevolatilisationModel.C                |  15 +-
 .../NoSurfaceReaction/NoSurfaceReaction.C     |   4 +-
 .../NewSurfaceReactionModel.C                 |  15 +-
 .../HeatTransferModel/NewHeatTransferModel.C  |  15 +-
 39 files changed, 740 insertions(+), 415 deletions(-)

diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index 7d05141fca..8a03a73cd7 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -216,6 +216,11 @@ public:
                 //- Return particle properties dictionary
                 inline const IOdictionary& particleProperties() const;
 
+                //- Return the constant properties
+                inline const typename ParcelType::constantProperties&
+                    constProps() const;
+
+
             //- Return coupled flag
             inline const Switch coupled() const;
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index 948a6b5dff..f129df9bdb 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -55,6 +55,14 @@ Foam::KinematicCloud<ParcelType>::particleProperties() const
 }
 
 
+template<class ParcelType>
+inline const typename ParcelType::constantProperties&
+Foam::KinematicCloud<ParcelType>::constProps() const
+{
+    return constProps_;
+}
+
+
 template<class ParcelType>
 inline const Foam::Switch Foam::KinematicCloud<ParcelType>::coupled() const
 {
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
index 3af70b1904..6fe5bf68a6 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
@@ -143,6 +143,10 @@ public:
 
         // Access
 
+            //- Return the constant properties
+            inline const typename ParcelType::constantProperties&
+                constProps() const;
+
             //- Return const access to carrier phase thermo package
             inline const hCombustionThermo& carrierThermo() const;
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
index 4bf20a37a9..1414b6b16d 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
@@ -26,6 +26,14 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class ParcelType>
+inline const typename ParcelType::constantProperties&
+Foam::ReactingCloud<ParcelType>::constProps() const
+{
+    return constProps_;
+}
+
+
 template<class ParcelType>
 inline const Foam::hCombustionThermo&
 Foam::ReactingCloud<ParcelType>::carrierThermo() const
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
index b78a5c0242..ea3f585313 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
@@ -137,6 +137,11 @@ public:
 
         // Access
 
+            //- Return the constant properties
+            inline const typename ParcelType::constantProperties&
+                constProps() const;
+
+
             // Sub-models
 
                 //- Return reference to devolatilisation model
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H
index 752f2b8ca3..cbf042f688 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H
@@ -26,6 +26,14 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class ParcelType>
+inline const typename ParcelType::constantProperties&
+Foam::ReactingMultiphaseCloud<ParcelType>::constProps() const
+{
+    return constProps_;
+}
+
+
 template<class ParcelType>
 inline const Foam::DevolatilisationModel
 <
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
index d845b725b1..9789bd0f5f 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
@@ -142,6 +142,10 @@ public:
 
         // Access
 
+            //- Return the constant properties
+            inline const typename ParcelType::constantProperties&
+                constProps() const;
+
             //- Return const access to thermo package
             inline const basicThermo& carrierThermo() const;
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
index 94f12b85a2..2f3df96f41 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
@@ -28,6 +28,14 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class ParcelType>
+inline const typename ParcelType::constantProperties&
+Foam::ThermoCloud<ParcelType>::constProps() const
+{
+    return constProps_;
+}
+
+
 template<class ParcelType>
 inline const Foam::basicThermo&
 Foam::ThermoCloud<ParcelType>::carrierThermo() const
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index 32d40fc592..96a777b193 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -64,20 +64,19 @@ void Foam::KinematicParcel<ParcelType>::calc
     const label cellI
 )
 {
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate velocity - update U, dUTrans
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // 1. Calculate velocity - update U, dUTrans
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     scalar Cud = 0.0;
     vector dUTrans = vector::zero;
     const vector U1 = calcVelocity(td, dt, Cud, dUTrans);
 
 
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // 2. Accumulate carrier phase source terms
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     if (td.cloud().coupled())
     {
-        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        // Accumulate carrier phase source terms
-        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
         // Update momentum transfer
         td.cloud().UTrans()[cellI] += nParticle_*dUTrans;
 
@@ -86,9 +85,9 @@ void Foam::KinematicParcel<ParcelType>::calc
     }
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Set new particle properties
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // 3. Set new particle properties
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     this->U() = U1;
 }
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 4d96e78601..6bb568409c 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -26,6 +26,40 @@ License
 
 #include "ReactingMultiphaseParcel.H"
 
+// * * * * * * * * * * * *  Private Member Functions * * * * * * * * * * * * //
+
+template<class ParcelType>
+template<class TrackData>
+Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::cpEff
+(
+    TrackData& td,
+    const scalar p,
+    const scalar T
+) const
+{
+    return
+        this->Y_[0]*td.cloud().composition().cp(0, YGas_, p, T)
+      + this->Y_[1]*td.cloud().composition().cp(0, YLiquid_, p, T)
+      + this->Y_[2]*td.cloud().composition().cp(0, YSolid_, p, T);
+}
+
+
+template<class ParcelType>
+template<class TrackData>
+Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::HEff
+(
+    TrackData& td,
+    const scalar p,
+    const scalar T
+) const
+{
+    return
+        this->Y_[0]*td.cloud().composition().H(0, YGas_, p, T)
+      + this->Y_[1]*td.cloud().composition().H(0, YLiquid_, p, T)
+      + this->Y_[2]*td.cloud().composition().H(0, YSolid_, p, T);
+}
+
+
 // * * * * * * * * * * *  Protected Member Functions * * * * * * * * * * * * //
 
 template<class ParcelType>
@@ -57,8 +91,10 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     const scalar mass0 = this->mass();
     const scalar cp0 = this->cp_;
     const scalar np0 = this->nParticle_;
-    const scalar T0 = this->T_;
-    scalarField& YMix = this->Y_;
+    scalar T0 = this->T_;
+    const scalar pc = this->pc_;
+    scalarField& Y = this->Y_;
+    scalar mass1 = mass0;
 
     label idGas = td.cloud().composition().idGas();
     label idLiquid = td.cloud().composition().idLiquid();
@@ -97,16 +133,60 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     scalar T1 = calcHeatTransfer(td, dt, cellI, htc, dhTrans);
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate phase change
-    // ~~~~~~~~~~~~~~~~~~~~~~
-    scalar dMassPC = calcPhaseChange(td, dt, cellI, T1, dMassMT);
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Calculate phase change - update mass, Y, cp, T, dhTrans
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    const scalar dMassPC = calcPhaseChange(td, dt, cellI, T1, Y[idLiquid], dMassMT);
+
+    // Update particle mass
+    mass1 -= dMassPC;
+
+    // Update particle liquid component mass fractions
+    this->updateMassFraction(mass0, dMassMT, YLiquid_);
+
+    // New specific heat capacity of mixture
+    scalar cp1 = cpEff(td, pc, T1);
+
+    // Correct temperature due to evaporated components
+    // TODO: use hl function in liquidMixture???
+//    scalar dhPC = -dMassPCTot*td.cloud().composition().L(0, Y_, pc, T0);
+    scalar Lvap = td.cloud().composition().L(idLiquid, this->YLiquid_, pc, T0);
+    T1 -= Lvap*dMassPC/(0.5*(mass0 + mass1)*cp1);
+
+    // Correct dhTrans to account for the change in enthalpy due to the
+    // liquid phase change
+    dhTrans +=
+        dMassPC
+       *td.cloud().composition().H(idLiquid, YLiquid_, pc, 0.5*(T0 + T1));
+
+//????????????????????????????????????????????????????????????????????????????????
+    // Store temperature for the start of the next process
+    T0 = T1;
+//????????????????????????????????????????????????????????????????????????????????
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Calculate Devolatilisation
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~
-    calcDevolatilisation(td, dt, T0, T1, dMassMT);
+    const scalar dMassD = calcDevolatilisation(td, dt, T0, dMassMT);
+
+    // Update particle mass
+    mass1 -= dMassD;
+
+    // New specific heat capacity of mixture
+    cp1 = cpEff(td, pc, T1);
+
+    // Update gas and solid component mass fractions
+//    updateMassFraction(mass0, mass1, dMassMT, YGas_);
+//    updateMassFraction(mass0, mass1, dMassMT, YSolid_);
+
+    // Correct particle temperature to account for latent heat of
+    // devolatilisation
+    T1 -=
+        td.constProps().Ldevol()
+       *sum(dMassMT)
+       /(0.5*(mass0 + mass1)*cp1);
+
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Calculate surface reactions
@@ -118,14 +198,8 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     calcSurfaceReactions(td, dt, cellI, T0, T1, dMassMT, dMassSR, dhRet);
 
     // New total mass
-    const scalar mass1 = mass0 - sum(dMassMT) - sum(dMassSR);
+    mass1 -= sum(dMassSR);
 
-    // Correct particle temperature to account for latent heat of
-    // devolatilisation
-    T1 -=
-        td.constProps().Ldevol()
-       *sum(dMassMT)
-       /(0.5*(mass0 + mass1)*cp0);
 
     // Enthalpy retention divided between particle and carrier phase by the
     // fraction fh and (1 - fh)
@@ -135,37 +209,40 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     // Correct dhTrans to account for enthalpy of evolved volatiles
     dhTrans +=
         sum(dMassMT)
-       *td.cloud().composition().H(idGas, YGas_, this->pc_, 0.5*(T0 + T1));
+       *td.cloud().composition().H(idGas, YGas_, pc, 0.5*(T0 + T1));
 
     // Correct dhTrans to account for enthalpy of consumed solids
     dhTrans +=
         sum(dMassSR)
-       *td.cloud().composition().H(idSolid, YSolid_, this->pc_, 0.5*(T0 + T1));
+       *td.cloud().composition().H(idSolid, YSolid_, pc, 0.5*(T0 + T1));
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~
-    // Accumulate source terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~
-
-    // Transfer mass lost from particle to carrier mass source
-    forAll(dMassMT, i)
+    if (td.cloud().coupled())
     {
-        td.cloud().rhoTrans(i)[cellI] += np0*(dMassMT[i] + dMassSR[i]);
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // Accumulate carrier phase source terms
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        // Transfer mass lost from particle to carrier mass source
+        forAll(dMassMT, i)
+        {
+            td.cloud().rhoTrans(i)[cellI] += np0*(dMassMT[i] + dMassSR[i]);
+        }
+
+        // Update momentum transfer
+        td.cloud().UTrans()[cellI] += np0*dUTrans;
+
+        // Coefficient to be applied in carrier phase momentum coupling
+        td.cloud().UCoeff()[cellI] += np0*mass0*Cud;
+
+        // Update enthalpy transfer
+        // - enthalpy of lost solids already accounted for
+        td.cloud().hTrans()[cellI] += np0*dhTrans;
+
+        // Coefficient to be applied in carrier phase enthalpy coupling
+        td.cloud().hCoeff()[cellI] += np0*htc*this->areaS();
     }
 
-    // Update momentum transfer
-    td.cloud().UTrans()[cellI] += np0*dUTrans;
-
-    // Accumulate coefficient to be applied in carrier phase momentum coupling
-    td.cloud().UCoeff()[cellI] += np0*mass0*Cud;
-
-    // Update enthalpy transfer
-    // - enthalpy of lost solids already accounted for
-    td.cloud().hTrans()[cellI] += np0*dhTrans;
-
-    // Accumulate coefficient to be applied in carrier phase enthalpy coupling
-    td.cloud().hCoeff()[cellI] += np0*htc*this->areaS();
-
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Remove the particle when mass falls below minimum threshold
@@ -179,14 +256,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
         {
             td.cloud().rhoTrans(i)[cellI] += np0*dMassMT[i];
         }
-        td.cloud().hTrans()[cellI] +=
-            np0*mass1
-           *(
-                YMix[0]
-               *td.cloud().composition().H(idGas, YGas_, this->pc_, T1)
-              + YMix[2]
-               *td.cloud().composition().H(idSolid, YSolid_, this->pc_, T1)
-            );
+        td.cloud().hTrans()[cellI] += np0*mass1*HEff(td, pc, T1);
         td.cloud().UTrans()[cellI] += np0*mass1*U1;
     }
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -196,10 +266,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     {
         this->U_ = U1;
         this->T_ = T1;
-        this->cp_ =
-            YMix[0]*td.cloud().composition().cp(idGas, YGas_, this->pc_, T1)
-          + YMix[1]*td.cloud().composition().cp(idLiquid, YLiquid_, this->pc_, T1)
-          + YMix[2]*td.cloud().composition().cp(idSolid, YSolid_, this->pc_, T1);
+        this->cp_ = cpEff(td, pc, T1);
 
         // Update particle density or diameter
         if (td.constProps().constantVolume())
@@ -216,33 +283,14 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
 
 template<class ParcelType>
 template<class TrackData>
-void Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
+Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
 (
     TrackData& td,
     const scalar dt,
-    const scalar T0,
-    const scalar T1,
+    const scalar T,
     scalarList& dMassMT
 )
 {
-    if (td.cloud().composition().YMixture0()[1]>SMALL)
-    {
-        notImplemented
-        (
-            "void Foam::ReactingMultiphaseParcel<ParcelType>::"
-            "calcDevolatilisation \n"
-            "(\n"
-            "    TrackData&,\n"
-            "    const scalar,\n"
-            "    const scalar,\n"
-            "    const scalar,\n"
-            "    scalarList&\n"
-            ")\n"
-            "no treatment currently available for particles containing "
-            "liquid species"
-        );
-    }
-
     // Check that model is active, and that the parcel temperature is
     // within necessary limits for devolatilisation to occur
     if
@@ -252,27 +300,27 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
      || this->T_<td.constProps().Tbp()
     )
     {
-        return;
+        return 0.0;
     }
 
     // Determine mass to add to carrier phase
     const scalar mass = this->mass();
-    scalarField& YMix = this->Y_;
+    scalarField& Y = this->Y_;
     const scalar dMassTot = td.cloud().devolatilisation().calculate
     (
         dt,
         this->mass0_,
         mass,
         td.cloud().composition().YMixture0(),
-        YMix,
-        T0,
+        Y,
+        T,
         canCombust_
     );
 
     // Update (total) mass fractions
-    YMix[0] = (YMix[0]*mass - dMassTot)/(mass - dMassTot);
-    YMix[1] = YMix[1]*mass/(mass - dMassTot);
-    YMix[2] = 1.0 - YMix[0] - YMix[1];
+    Y[0] = (Y[0]*mass - dMassTot)/(mass - dMassTot);
+    Y[1] = Y[1]*mass/(mass - dMassTot);
+    Y[2] = 1.0 - Y[0] - Y[1];
 
     // Add to cummulative mass transfer
     label idGas = td.cloud().composition().idGas();
@@ -286,6 +334,8 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
     }
 
     td.cloud().addToMassDevolatilisation(dMassTot);
+
+    return dMassTot;
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
index d53fc2a6d0..e70f0ae5c3 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -143,6 +143,19 @@ public:
     };
 
 
+private:
+
+    // Private member functions
+
+        //- Return the mixture effective specific heat capacity
+        template<class TrackData>
+        scalar cpEff(TrackData& td, const scalar p, const scalar T) const;
+
+        //- Return the mixture effective enthalpy
+        template<class TrackData>
+        scalar HEff(TrackData& td, const scalar p, const scalar T) const;
+
+
 protected:
 
     // Protected data
@@ -167,12 +180,11 @@ protected:
 
         //- Calculate Devolatilisation
         template<class TrackData>
-        void calcDevolatilisation
+        scalar calcDevolatilisation
         (
             TrackData& td,
             const scalar dt,
-            const scalar T0,
-            const scalar T1,
+            const scalar T,
             scalarList& dMassMT
         );
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
index e94d3b9177..61513ae783 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
@@ -77,11 +77,11 @@ Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
     // Check state of Istream
     is.check
     (
-        "ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel\n"
-        "(\n"
-        "    const Cloud<ParcelType>&,\n"
-        "    Istream&,\n"
-        "    bool\n"
+        "ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel"
+        "("
+            "const Cloud<ParcelType>&, "
+            "Istream&, "
+            "bool"
         ")"
     );
 }
@@ -102,11 +102,12 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
 
     // Get names and sizes for each Y...
     const label idGas = c.composition().idGas();
-    const wordList gasNames = c.composition().componentNames(idGas);
+    const wordList& gasNames = c.composition().componentNames(idGas);
     const label idLiquid = c.composition().idLiquid();
-    const wordList liquidNames = c.composition().componentNames(idLiquid);
+    const wordList& liquidNames = c.composition().componentNames(idLiquid);
     const label idSolid = c.composition().idSolid();
-    const wordList solidNames = c.composition().componentNames(idSolid);
+    const wordList& solidNames = c.composition().componentNames(idSolid);
+    const wordList& stateLabels = c.composition().stateLabels();
 
     // Set storage for each Y... for each parcel
     forAllIter(typename Cloud<ParcelType>, c, iter)
@@ -122,7 +123,11 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
     {
         IOField<scalar> YGas
         (
-            c.fieldIOobject("Y" + gasNames[j], IOobject::MUST_READ)
+            c.fieldIOobject
+            (
+                "Y" + gasNames[j] + stateLabels[idGas],
+                IOobject::MUST_READ
+            )
         );
 
         label i = 0;
@@ -137,7 +142,11 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
     {
         IOField<scalar> YLiquid
         (
-            c.fieldIOobject("Y" + liquidNames[j], IOobject::MUST_READ)
+            c.fieldIOobject
+            (
+                "Y" + liquidNames[j] + stateLabels[idLiquid],
+                 IOobject::MUST_READ
+            )
         );
 
         label i = 0;
@@ -152,7 +161,11 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
     {
         IOField<scalar> YSolid
         (
-            c.fieldIOobject("Y" + solidNames[j], IOobject::MUST_READ)
+            c.fieldIOobject
+            (
+                "Y" + solidNames[j] + stateLabels[idSolid],
+                IOobject::MUST_READ
+            )
         );
 
         label i = 0;
@@ -178,13 +191,19 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
     // Write the composition fractions
     if (np > 0)
     {
+        const wordList& stateLabels = c.composition().stateLabels();
+
         const label idGas = c.composition().idGas();
-        const wordList gasNames = c.composition().componentNames(idGas);
+        const wordList& gasNames = c.composition().componentNames(idGas);
         forAll(gasNames, j)
         {
             IOField<scalar> YGas
             (
-                c.fieldIOobject("Y" + gasNames[j], IOobject::NO_READ),
+                c.fieldIOobject
+                (
+                    "Y" + gasNames[j] + stateLabels[idGas],
+                    IOobject::NO_READ
+                ),
                 np
             );
 
@@ -197,13 +216,18 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
 
             YGas.write();
         }
+
         const label idLiquid = c.composition().idLiquid();
-        const wordList liquidNames = c.composition().componentNames(idLiquid);
+        const wordList& liquidNames = c.composition().componentNames(idLiquid);
         forAll(liquidNames, j)
         {
             IOField<scalar> YLiquid
             (
-                c.fieldIOobject("Y" + liquidNames[j], IOobject::NO_READ),
+                c.fieldIOobject
+                (
+                    "Y" + liquidNames[j] + stateLabels[idLiquid],
+                    IOobject::NO_READ
+                ),
                 np
             );
 
@@ -216,13 +240,18 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
 
             YLiquid.write();
         }
+
         const label idSolid = c.composition().idSolid();
-        const wordList solidNames = c.composition().componentNames(idSolid);
+        const wordList& solidNames = c.composition().componentNames(idSolid);
         forAll(solidNames, j)
         {
             IOField<scalar> YSolid
             (
-                c.fieldIOobject("Y" + solidNames[j], IOobject::NO_READ),
+                c.fieldIOobject
+                (
+                    "Y" + solidNames[j] + stateLabels[idSolid],
+                    IOobject::NO_READ
+                ),
                 np
             );
 
@@ -267,10 +296,10 @@ Foam::Ostream& Foam::operator<<
     // Check state of Ostream
     os.check
     (
-        "Ostream& operator<<\n"
-        "(\n"
-        "    Ostream&,\n"
-        "    const ReactingMultiphaseParcel<ParcelType>&\n"
+        "Ostream& operator<<"
+        "("
+            "Ostream&, "
+            "const ReactingMultiphaseParcel<ParcelType>&"
         ")"
     );
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index 6240d503ba..d605841d40 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -47,11 +47,12 @@ template<class ParcelType>
 void Foam::ReactingParcel<ParcelType>::updateMassFraction
 (
     const scalar mass0,
-    const scalar mass1,
     const scalarList& dMass,
     scalarField& Y
 )
 {
+    scalar mass1 = mass0 + sum(dMass);
+
     forAll(Y, i)
     {
         Y[i] = (Y[i]*mass0 - dMass[i])/mass1;
@@ -68,76 +69,76 @@ void Foam::ReactingParcel<ParcelType>::calc
     const label cellI
 )
 {
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Define local properties at beginning of timestep
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    const vector U0 = this->U_;
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Define local properties at beginning of time step
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     const scalar mass0 = this->mass();
-    const scalar cp0 = this->cp_;
     const scalar np0 = this->nParticle_;
     const scalar T0 = this->T_;
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Initialise transfer terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
+    // ~~~~~~~~~~~~~~~~~~~~~
+    // 1. Calculate velocity
+    // ~~~~~~~~~~~~~~~~~~~~~
 
-    // Momentum transfer from the particle to the carrier phase
-    vector dUTrans = vector::zero;
-
-    // Enthalpy transfer from the particle to the carrier phase
-    scalar dhTrans = 0.0;
-
-    // Mass transfer from particle to carrier phase
-    scalarList dMassMT(td.cloud().gases().size(), 0.0);
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate velocity - update U
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     scalar Cud = 0.0;
+    vector dUTrans = vector::zero;
     const vector U1 = calcVelocity(td, dt, Cud, dUTrans);
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate heat transfer - update T
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // 2. Calculate heat transfer
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
     scalar htc = 0.0;
-    scalar T1 = calcHeatTransfer(td, dt, cellI, htc, dhTrans);
+    scalar dhHT = 0.0;
+//    TODO: T1 no longer used - return dhHT instead??????????????????????????????
+//    scalar T1 = calcHeatTransfer(td, dt, cellI, htc, dhHT);
+    calcHeatTransfer(td, dt, cellI, htc, dhHT);
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate phase change - update mass, Y, cp, T, dhTrans
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    const scalar dMassPC = calcPhaseChange(td, dt, cellI, T1, dMassMT);
-
-    // Update particle mass
-    scalar mass1 = mass0 - dMassPC;
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~
+    // 3. Calculate phase change
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Mass transfer from particle to carrier phase
+    scalarList dMassPC(td.cloud().gases().size(), 0.0);
+    const scalar dMassPCTot = calcPhaseChange(td, dt, cellI, T0, 1.0, dMassPC);
 
     // Update particle component mass fractions
-    updateMassFraction(mass0, mass1, dMassMT, Y_);
+    updateMassFraction(mass0, dMassPC, Y_);
 
-    // New specific heat capacity of
-    scalar cp1 = td.cloud().composition().cp(0, Y_, pc_, T1);
+    // Enthalpy change due to change in particle composition (sink)
+    scalar dhPC = -dMassPCTot*td.cloud().composition().L(0, Y_, pc, T0);
 
-    // Correct temperature due to evaporated components
-    // TODO: use hl function in liquidMixture???
-    T1 -= td.constProps().Lvap()*dMassPC/(0.5*(mass0 + mass1)*cp1);
-
-    // Correct dhTrans to account for the change in enthalpy due to the
-    // phase change
-    scalar HMix = td.cloud().composition().H(0, Y_, pc, 0.5*(T0 + T1));
-    dhTrans += dMassPC*HMix;
+    // Enthalpy change due to species released into the carrier (source)
+    scalar HEff = td.cloud().composition().H(0, Y_, pc, T0);
+    dhPC += dMassPCTot*HEff;
 
 
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // 4. Collect contributions to determine new particle thermo properties
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // New mass
+    scalar mass1 = mass0 - dMassPCTot;
+
+    // Total enthalpy transfer from the particle to the carrier phase
+    scalar dhTrans = dhHT + dhPC;
+
+    // New specific heat capacity of mixture - using old temperature
+    scalar cp1 = td.cloud().composition().cp(0, Y_, pc_, T0);
+
+    // New particle temperature - using average mass over the time interval
+    scalar T1 = T0 + dhTrans/(0.5*(mass0 + mass1)*cp1);
+
+
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // 5. Accumulate carrier phase source terms
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     if (td.cloud().coupled())
     {
-        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        // Accumulate carrier phase source terms
-        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
         // Transfer mass lost from particle to carrier mass source
-        forAll(dMassMT, i)
+        forAll(dMassPC, i)
         {
-            td.cloud().rhoTrans(i)[cellI] += np0*dMassMT[i];
+            td.cloud().rhoTrans(i)[cellI] += np0*dMassPC[i];
         }
 
         // Update momentum transfer
@@ -154,9 +155,9 @@ void Foam::ReactingParcel<ParcelType>::calc
     }
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Remove the particle when mass falls below minimum threshold
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // 6a. Remove the particle when mass falls below minimum threshold
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     if (mass1 < td.constProps().minParticleMass())
     {
         td.keepParticle = false;
@@ -164,17 +165,17 @@ void Foam::ReactingParcel<ParcelType>::calc
         if (td.cloud().coupled())
         {
             // Absorb particle(s) into carrier phase
-            forAll(dMassMT, i)
+            forAll(Y_, i)
             {
                 td.cloud().rhoTrans(i)[cellI] += np0*mass1*Y_[i];
             }
             td.cloud().UTrans()[cellI] += np0*mass1*U1;
-            td.cloud().hTrans()[cellI] += np0*mass1*HMix;
+            td.cloud().hTrans()[cellI] += np0*mass1*HEff;
         }
     }
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Set new particle properties
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // 6b. Set new particle properties
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     else
     {
         this->U_ = U1;
@@ -202,10 +203,16 @@ Foam::scalar Foam::ReactingParcel<ParcelType>::calcPhaseChange
     const scalar dt,
     const label cellI,
     const scalar T,
+    const scalar YPhase,
     scalarList& dMassMT
 )
 {
-    if (!td.cloud().phaseChange().active())
+    if
+    (
+        !td.cloud().phaseChange().active()
+     || T < td.constProps().Tvap()
+     || YPhase > SMALL
+    )
     {
         return 0.0;
     }
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index 6848a58d24..d1c41acc40 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -89,9 +89,6 @@ public:
             //- Vapourisation temperature [K]
             const scalar Tvap_;
 
-            //- Latent heat of vaporisation [J/kg]
-            const scalar Lvap_;
-
 
     public:
 
@@ -108,9 +105,6 @@ public:
 
             //- Return const access to the vapourisation temperature
             inline scalar Tvap() const;
-
-            //- Return const access to the latent heat of vaporisation
-            inline scalar Lvap() const;
     };
 
 
@@ -194,6 +188,7 @@ protected:
             const scalar dt,
             const label cellI,
             const scalar T,
+            const scalar YPhase,
             scalarList& dMassMT
         );
 
@@ -201,7 +196,6 @@ protected:
         void updateMassFraction
         (
             const scalar mass0,
-            const scalar mass1,
             const scalarList& dMass,
             scalarField& Y
         );
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
index b3d6fd0b4a..8c0d09e757 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
@@ -35,8 +35,7 @@ inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties
     ThermoParcel<ParcelType>::constantProperties(dict),
     constantVolume_(dict.lookup("constantVolume")),
     Tbp_(dimensionedScalar(dict.lookup("Tbp")).value()),
-    Tvap_(dimensionedScalar(dict.lookup("Tvap")).value()),
-    Lvap_(dimensionedScalar(dict.lookup("Lvap")).value())
+    Tvap_(dimensionedScalar(dict.lookup("Tvap")).value())
 {}
 
 
@@ -131,14 +130,6 @@ Foam::ReactingParcel<ParcelType>::constantProperties::Tvap() const
 }
 
 
-template<class ParcelType>
-inline Foam::scalar
-Foam::ReactingParcel<ParcelType>::constantProperties::Lvap() const
-{
-    return Lvap_;
-}
-
-
 // * * * * * * * * * * * trackData Member Functions  * * * * * * * * * * * * //
 
 template<class ParcelType>
@@ -175,8 +166,7 @@ inline Foam::scalar Foam::ReactingParcel<ParcelType>::mass0() const
 
 
 template<class ParcelType>
-inline const Foam::scalarField& Foam::ReactingParcel<ParcelType>::
-Y() const
+inline const Foam::scalarField& Foam::ReactingParcel<ParcelType>::Y() const
 {
     return Y_;
 }
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
index 585f688eef..eacf49b112 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
@@ -68,12 +68,12 @@ Foam::ReactingParcel<ParcelType>::ReactingParcel
     // Check state of Istream
     is.check
     (
-        "ReactingParcel<ParcelType>::ReactingParcel\n"
-        "(\n"
-        "    const Cloud<ParcelType>&,\n"
-        "    Istream&,\n"
-        "    bool\n"
-        ")\n"
+        "ReactingParcel<ParcelType>::ReactingParcel"
+        "("
+            "const Cloud<ParcelType>&, "
+            "Istream&, "
+            "bool"
+        ")"
     );
 }
 
@@ -102,8 +102,14 @@ void Foam::ReactingParcel<ParcelType>::readFields
     }
 
     // Get names and sizes for each Y...
-    const wordList phaseTypes = c.composition().phaseTypes();
+    const wordList& phaseTypes = c.composition().phaseTypes();
     const label nPhases = phaseTypes.size();
+    wordList stateLabels(nPhases, "");
+    if (c.composition().nPhase() == 1)
+    {
+        stateLabels = c.composition().stateLabels();
+    }
+
 
     // Set storage for each Y... for each parcel
     forAllIter(typename Cloud<ParcelType>, c, iter)
@@ -117,7 +123,11 @@ void Foam::ReactingParcel<ParcelType>::readFields
     {
         IOField<scalar> Y
         (
-            c.fieldIOobject("Y" + phaseTypes[j], IOobject::MUST_READ)
+            c.fieldIOobject
+            (
+                "Y" + phaseTypes[j] + stateLabels[j],
+                 IOobject::MUST_READ
+            )
         );
 
         label i = 0;
@@ -138,28 +148,37 @@ void Foam::ReactingParcel<ParcelType>::writeFields
 {
     ThermoParcel<ParcelType>::writeFields(c);
 
-    label np =  c.size();
+    const label np =  c.size();
 
-    IOField<scalar> mass0(c.fieldIOobject("mass0", IOobject::NO_READ), np);
-
-    label i = 0;
-    forAllConstIter(typename Cloud<ParcelType>, c, iter)
-    {
-        const ReactingParcel<ParcelType>& p = iter();
-        mass0[i++] = p.mass0_;
-    }
-
-    mass0.write();
-
-    // Write the composition fractions
     if (np > 0)
     {
-        const wordList phaseTypes = c.composition().phaseTypes();
+        IOField<scalar> mass0(c.fieldIOobject("mass0", IOobject::NO_READ), np);
+
+        label i = 0;
+        forAllConstIter(typename Cloud<ParcelType>, c, iter)
+        {
+            const ReactingParcel<ParcelType>& p = iter();
+            mass0[i++] = p.mass0_;
+        }
+        mass0.write();
+
+        // Write the composition fractions
+        const wordList& phaseTypes = c.composition().phaseTypes();
+        wordList stateLabels(phaseTypes.size(), "");
+        if (c.composition().nPhase() == 1)
+        {
+            stateLabels = c.composition().stateLabels();
+        }
+
         forAll(phaseTypes, j)
         {
             IOField<scalar> Y
             (
-                c.fieldIOobject("Y" + phaseTypes[j], IOobject::NO_READ),
+                c.fieldIOobject
+                (
+                    "Y" + phaseTypes[j] + stateLabels[j],
+                    IOobject::NO_READ
+                ),
                 np
             );
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
index 99bf172920..a158fc8e52 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -53,17 +53,17 @@ void Foam::ThermoParcel<ParcelType>::calc
     const label cellI
 )
 {
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Define local properties at beginning of timestep
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Define local properties at beginning of time step
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     const vector U0 = this->U_;
     const scalar mass0 = this->mass();
     const scalar np0 = this->nParticle_;
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Initialise transfer terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // 1. Initialise transfer terms
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     // Momentum transfer from the particle to the carrier phase
     vector dUTrans = vector::zero;
@@ -72,26 +72,25 @@ void Foam::ThermoParcel<ParcelType>::calc
     scalar dhTrans = 0.0;
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate velocity - update U
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // 2. Calculate velocity - update U
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     scalar Cud = 0.0;
     const vector U1 = calcVelocity(td, dt, Cud, dUTrans);
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate heat transfer - update T
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // 3. Calculate heat transfer - update T
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     scalar htc = 0.0;
     const scalar T1 = calcHeatTransfer(td, dt, cellI, htc, dhTrans);
 
 
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // 4. Accumulate carrier phase source terms
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     if (td.cloud().coupled())
     {
-        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        // Accumulate carrier phase source terms
-        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
         // Update momentum transfer
         td.cloud().UTrans()[cellI] += np0*dUTrans;
 
@@ -105,9 +104,9 @@ void Foam::ThermoParcel<ParcelType>::calc
         td.cloud().hCoeff()[cellI] += np0*htc*this->areaS();
     }
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Set new particle properties
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // 5. Set new particle properties
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     this->U() = U1;
     this->T() = T1;
 }
@@ -164,10 +163,6 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
     bp *= 6.0/(this->rho_*this->d_*cp_);
 
 
-    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Set new particle temperature
-    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
     // Integrate to find the new parcel temperature
     IntegrationScheme<scalar>::integrationResult Tres =
         td.cloud().TIntegrator().integrate(T_, dt, ap, bp);
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
index afec996210..9df83bbbaf 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
@@ -72,9 +72,9 @@ void Foam::phaseProperties::setGlobalGasIds
 
             FatalErrorIn
             (
-                "void phaseProperties::setGlobalGasIds\n"
-                "(\n"
-                "    const PtrList<volScalarField>&\n"
+                "void phaseProperties::setGlobalGasIds"
+                "("
+                    "const PtrList<volScalarField>&"
                 ")"
             )   << "Could not find gas species " << names_[i]
                 << " in species list" <<  nl
@@ -131,11 +131,47 @@ void Foam::phaseProperties::checkTotalMassFraction() const
 }
 
 
+Foam::word Foam::phaseProperties::phaseToStateLabel(phaseType pt)
+{
+    word state = "(unknown)";
+    switch (pt)
+    {
+        case GAS:
+        {
+            state = "(g)";
+            break;
+        }
+        case LIQUID:
+        {
+            state = "(l)";
+            break;
+        }
+        case SOLID:
+        {
+            state = "(s)";
+            break;
+        }
+        default:
+        {
+            FatalErrorIn
+            (
+                "Foam::phaseProperties::phaseToStateLabel(phaseType pt)"
+            )   << "Invalid phase: " << phaseTypeNames_[pt] << nl
+                << "    phase must be gas, liquid or solid" << nl
+                << exit(FatalError);
+        }
+    }
+
+    return state;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::phaseProperties::phaseProperties()
 :
     phase_(UNKNOWN),
+    stateLabel_("(unknown)"),
     names_(0),
     Y_(0),
     globalIds_(0)
@@ -145,6 +181,7 @@ Foam::phaseProperties::phaseProperties()
 Foam::phaseProperties::phaseProperties(const phaseProperties& pp)
 :
     phase_(pp.phase_),
+    stateLabel_(pp.stateLabel_),
     names_(pp.names_),
     Y_(pp.Y_),
     globalIds_(pp.globalIds_)
@@ -189,11 +226,11 @@ void Foam::phaseProperties::initialiseGlobalIds
         {
             FatalErrorIn
             (
-                "Foam::phaseProperties::setGlobalIds\n"
-                "(\n"
-                "    const PtrList<volScalarField>&,\n"
-                "    const wordList&,\n"
-                "    const wordList&\n"
+                "Foam::phaseProperties::setGlobalIds"
+                "("
+                    "const PtrList<volScalarField>&, "
+                    "const wordList&, "
+                    "const wordList&"
                 ")"
             )   << "Invalid phase: " << phaseTypeNames_[phase_] << nl
                 << "    phase must be gas, liquid or solid" << nl
@@ -209,6 +246,12 @@ Foam::phaseProperties::phaseType Foam::phaseProperties::phase() const
 }
 
 
+const Foam::word& Foam::phaseProperties::stateLabel() const
+{
+    return stateLabel_;
+}
+
+
 Foam::word Foam::phaseProperties::phaseTypeName() const
 {
     return phaseTypeNames_[phase_];
@@ -229,7 +272,7 @@ const Foam::word& Foam::phaseProperties::name(const label cmptI) const
         (
             "const Foam::word& Foam::phaseProperties::name"
             "("
-                "const label cmptI"
+                "const label"
             ") const"
         )   << "Requested component " << cmptI << "out of range" << nl
             << "Available phase components:" << nl << names_ << nl
@@ -254,7 +297,7 @@ Foam::scalar& Foam::phaseProperties::Y(const label cmptI)
         (
             "const Foam::scalar& Foam::phaseProperties::Y"
             "("
-                "const label cmptI"
+                "const label"
             ") const"
         )   << "Requested component " << cmptI << "out of range" << nl
             << "Available phase components:" << nl << names_ << nl
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
index 258d0069ae..2998a9831a 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
@@ -76,6 +76,9 @@ private:
         //- Phase type
         phaseType phase_;
 
+        //- State label (s), (l), (g) etc.
+        word stateLabel_;
+
         //- List of component names
         List<word> names_;
 
@@ -97,6 +100,9 @@ private:
         //- Check the total mass fraction
         void checkTotalMassFraction() const;
 
+        //- Set the state label
+        word phaseToStateLabel(phaseType pt);
+
 
 public:
 
@@ -132,6 +138,9 @@ public:
             //- Return const access to the phase type
             phaseType phase() const;
 
+            //- Return const access to the phase state label
+            const word& stateLabel() const;
+
             //- Return word representation of the phase type
             word phaseTypeName() const;
 
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
index 192136ed8d..b0c3937ea4 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
@@ -32,6 +32,7 @@ License
 Foam::phaseProperties::phaseProperties(Istream& is)
 :
     phase_(UNKNOWN),
+    stateLabel_("(unknown)"),
     names_(0),
     Y_(0),
     globalIds_(0)
@@ -53,6 +54,8 @@ Foam::phaseProperties::phaseProperties(Istream& is)
 
     phase_ = phaseTypeNames_[phaseInfo.keyword()];
 
+    stateLabel_ = phaseToStateLabel(phase_);
+
     label cmptI = 0;
     forAllConstIter(IDLList<entry>, phaseInfo, iter)
     {
@@ -95,6 +98,8 @@ Foam::Istream& Foam::operator>>(Istream& is, phaseProperties& pp)
 
     pp.phase_ = pp.phaseTypeNames_[phaseInfo.keyword()];
 
+    pp.stateLabel_ = pp.phaseToStateLabel(pp.phase_);
+
     label cmptI = 0;
     forAllConstIter(IDLList<entry>, phaseInfo, iter)
     {
@@ -117,7 +122,10 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const phaseProperties& pp)
     os.check
     (
         "Foam::Ostream& Foam::operator<<"
-        "(Foam::Ostream&, const Foam::phaseProperties&)"
+        "("
+            "Foam::Ostream&, "
+            "const Foam::phaseProperties&"
+        ")"
     );
 
     os  << pp.phaseTypeNames_[pp.phase_] << nl << token::BEGIN_BLOCK << nl
@@ -134,7 +142,10 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const phaseProperties& pp)
     os.check
     (
         "Foam::Ostream& Foam::operator<<"
-        "(Foam::Ostream&, const Foam::phaseProperties&)"
+        "("
+            "Foam::Ostream&, "
+            "const Foam::phaseProperties&"
+        ")"
     );
 
     return os;
diff --git a/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.C b/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.C
index 9e5aeb69c3..f1146e0245 100644
--- a/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.C
+++ b/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.C
@@ -37,7 +37,8 @@ Foam::phasePropertiesList::phasePropertiesList
 )
 :
     props_(is),
-    phaseTypeNames_()
+    phaseTypeNames_(),
+    stateLabels_()
 {
     forAll(props_, i)
     {
@@ -45,9 +46,11 @@ Foam::phasePropertiesList::phasePropertiesList
     }
 
     phaseTypeNames_.setSize(props_.size());
-    forAll(phaseTypeNames_, i)
+    stateLabels_.setSize(props_.size());
+    forAll(props_, i)
     {
         phaseTypeNames_[i] = props_[i].phaseTypeName();
+        stateLabels_[i] = props_[i].stateLabel();
     }
 }
 
@@ -73,6 +76,12 @@ const Foam::wordList& Foam::phasePropertiesList::phaseTypes() const
 }
 
 
+const Foam::wordList& Foam::phasePropertiesList::stateLabels() const
+{
+    return stateLabels_;
+}
+
+
 Foam::label Foam::phasePropertiesList::size() const
 {
     return props_.size();
diff --git a/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.H b/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.H
index 80e8f5c859..4247f2c4ba 100644
--- a/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.H
+++ b/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.H
@@ -60,6 +60,9 @@ class phasePropertiesList
         //- List of word representation of phase types
         wordList phaseTypeNames_;
 
+        //- List of state labels
+        wordList stateLabels_;
+
 
 public:
 
@@ -84,6 +87,9 @@ public:
         //- Return the list of word representation of phase types
         const wordList& phaseTypes() const;
 
+        //- Return the list of state labels
+        const wordList& stateLabels() const;
+
         //- Return the size (number of phases)
         label size() const;
 
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C
index 425dcfe6f7..3bed47c540 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C
@@ -47,7 +47,7 @@ Foam::autoPtr<Foam::DataEntry<Type> > Foam::DataEntry<Type>::New
         FatalErrorIn("DataEntry<Type>::New(Istream&)")
             << "Unknown DataEntry type " << DataEntryType << " for DataEntry "
             << entryName << ". Constructor not in hash table" << nl << nl
-            << "    Valid DataEntry types are :" << nl
+            << "    Valid DataEntry types are:" << nl
             << dictionaryConstructorTablePtr_->toc() << nl
             << exit(FatalError);
     }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C
index 4db4d79194..09717b8e86 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C
@@ -38,10 +38,7 @@ Foam::DispersionModel<CloudType>::New
     CloudType& owner
 )
 {
-    word DispersionModelType
-    (
-        dict.lookup("DispersionModel")
-    );
+    word DispersionModelType(dict.lookup("DispersionModel"));
 
     Info<< "Selecting DispersionModel " << DispersionModelType << endl;
 
@@ -53,11 +50,14 @@ Foam::DispersionModel<CloudType>::New
         FatalErrorIn
         (
             "DispersionModel<CloudType>::New"
-            "(const dictionary&, CloudType&)"
+            "("
+                "const dictionary&, "
+                "CloudType&"
+            ")"
         )   << "Unknown DispersionModelType type "
             << DispersionModelType
             << ", constructor not in hash table" << nl << nl
-            << "    Valid DispersionModel types are :" << nl
+            << "    Valid DispersionModel types are:" << nl
             << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/NewDragModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/NewDragModel.C
index 3cee2ec548..6e1e80d3cd 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/NewDragModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/NewDragModel.C
@@ -35,10 +35,7 @@ Foam::autoPtr<Foam::DragModel<CloudType> > Foam::DragModel<CloudType>::New
     CloudType& owner
 )
 {
-    word DragModelType
-    (
-        dict.lookup("DragModel")
-    );
+    word DragModelType(dict.lookup("DragModel"));
 
     Info<< "Selecting DragModel " << DragModelType << endl;
 
@@ -50,12 +47,14 @@ Foam::autoPtr<Foam::DragModel<CloudType> > Foam::DragModel<CloudType>::New
         FatalErrorIn
         (
             "DragModel<CloudType>::New"
-            "(const dictionary&, CloudType&)"
-        )
-            << "Unknown DragModelType type "
+            "("
+                "const dictionary&,"
+                "CloudType&"
+            ")"
+        )   << "Unknown DragModelType type "
             << DragModelType
             << ", constructor not in hash table" << nl << nl
-            << "    Valid DragModel types are :" << nl
+            << "    Valid DragModel types are:" << nl
             << dictionaryConstructorTablePtr_->toc()
             << exit(FatalError);
     }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index a21580845e..adf2559e98 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -170,10 +170,10 @@ void Foam::InjectionModel<CloudType>::findCellAtPosition
     {
         FatalErrorIn
         (
-            "Foam::InjectionModel<CloudType>::findCellAtPosition\n"
-            "(\n"
-            "    label&,\n"
-            "    vector&\n"
+            "Foam::InjectionModel<CloudType>::findCellAtPosition"
+            "("
+                "label&, "
+                "vector&"
             ")"
         )<< "Cannot find parcel injection cell. "
          << "Parcel position = " << p0 << nl
@@ -212,13 +212,13 @@ Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
             FatalErrorIn
             (
                 "Foam::scalar "
-                "Foam::InjectionModel<CloudType>::setNumberOfParticles\n"
-                "(\n"
-                "    const label,\n"
-                "    const scalar,\n"
-                "    const scalar,\n"
-                "    const scalar,\n"
-                "    const scalar\n"
+                "Foam::InjectionModel<CloudType>::setNumberOfParticles"
+                "("
+                "    const label, "
+                "    const scalar, "
+                "    const scalar, "
+                "    const scalar, "
+                "    const scalar"
                 ")"
             )<< "Unknown parcelBasis type" << nl
              << exit(FatalError);
@@ -314,11 +314,11 @@ Foam::InjectionModel<CloudType>::InjectionModel
     {
         FatalErrorIn
         (
-            "Foam::InjectionModel<CloudType>::InjectionModel\n"
-            "(\n"
-            "    const dictionary&,\n"
-            "    CloudType&,\n"
-            "    const word&\n"
+            "Foam::InjectionModel<CloudType>::InjectionModel"
+            "("
+                "const dictionary&, "
+                "CloudType&, "
+                "const word&"
             ")"
         )<< "parcelBasisType must be either 'number' or 'mass'" << nl
          << exit(FatalError);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/NewInjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/NewInjectionModel.C
index 3501e367aa..c0926272c6 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/NewInjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/NewInjectionModel.C
@@ -36,10 +36,7 @@ Foam::InjectionModel<CloudType>::New
     CloudType& owner
 )
 {
-    word InjectionModelType
-    (
-        dict.lookup("InjectionModel")
-    );
+    word InjectionModelType(dict.lookup("InjectionModel"));
 
     Info<< "Selecting InjectionModel " << InjectionModelType << endl;
 
@@ -51,11 +48,14 @@ Foam::InjectionModel<CloudType>::New
         FatalErrorIn
         (
             "InjectionModel<CloudType>::New"
-            "(const dictionary&, CloudType&)"
+            "("
+                "const dictionary&, "
+                "CloudType&"
+            ")"
         )   << "Unknown InjectionModelType type "
             << InjectionModelType
             << ", constructor not in hash table" << nl << nl
-            << "    Valid InjectionModel types are :" << nl
+            << "    Valid InjectionModel types are:" << nl
             << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C
index ee1fd8a169..522432191a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C
@@ -36,10 +36,7 @@ Foam::WallInteractionModel<CloudType>::New
     CloudType& owner
 )
 {
-    word WallInteractionModelType
-    (
-        dict.lookup("WallInteractionModel")
-    );
+    word WallInteractionModelType(dict.lookup("WallInteractionModel"));
 
     Info<< "Selecting WallInteractionModel " << WallInteractionModelType
         << endl;
@@ -52,12 +49,14 @@ Foam::WallInteractionModel<CloudType>::New
         FatalErrorIn
         (
             "WallInteractionModel<CloudType>::New"
-            "(const dictionary&, CloudType&)"
-        )
-            << "Unknown WallInteractionModelType type "
+            "("
+                "const dictionary&, "
+                "CloudType&"
+            ")"
+        )   << "Unknown WallInteractionModelType type "
             << WallInteractionModelType
             << ", constructor not in hash table" << nl << nl
-            << "    Valid WallInteractionModel types are :" << nl
+            << "    Valid WallInteractionModel types are:" << nl
             << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
index df898464fd..5408ad656e 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
@@ -161,6 +161,14 @@ Foam::CompositionModel<CloudType>::phaseTypes() const
 }
 
 
+template<class CloudType>
+const Foam::wordList&
+Foam::CompositionModel<CloudType>::stateLabels() const
+{
+    return phaseProps_.stateLabels();
+}
+
+
 template<class CloudType>
 const Foam::wordList&
 Foam::CompositionModel<CloudType>::componentNames(const label phaseI) const
@@ -182,10 +190,10 @@ Foam::label Foam::CompositionModel<CloudType>::globalId
     {
         FatalErrorIn
         (
-            "Foam::label Foam::CompositionModel<CloudType>::globalId\n"
-            "(\n"
-            "    const label phaseI,\n"
-            "    const word& cmptName\n"
+            "Foam::label Foam::CompositionModel<CloudType>::globalId"
+            "("
+                "const label, "
+                "const word&"
             ") const"
         )   << "Unable to determine global id for requested component "
             << cmptName << nl << abort(FatalError);
@@ -218,10 +226,10 @@ Foam::label Foam::CompositionModel<CloudType>::localId
     {
         FatalErrorIn
         (
-            "Foam::label Foam::CompositionModel<CloudType>::localId\n"
-            "(\n"
-            "    const label phaseI,\n"
-            "    const word& cmptName\n"
+            "Foam::label Foam::CompositionModel<CloudType>::localId"
+            "("
+                "const label, "
+                "const word&"
             ") const"
         )   << "Unable to determine local id for component " << cmptName
             << nl << abort(FatalError);
@@ -277,10 +285,10 @@ Foam::scalarField Foam::CompositionModel<CloudType>::X
         {
             FatalErrorIn
             (
-                "Foam::scalarField Foam::CompositionModel<CloudType>::X\n"
-                "(\n"
-                "    const label phaseI,\n"
-                "    const scalarField Y\n"
+                "Foam::scalarField Foam::CompositionModel<CloudType>::X"
+                "("
+                    "const label, "
+                    "const scalarField&"
                 ") const"
             )   << "Only possible to convert gas and liquid mass fractions"
                 << nl << abort(FatalError);
@@ -340,12 +348,12 @@ Foam::scalar Foam::CompositionModel<CloudType>::H
         {
             FatalErrorIn
             (
-                "Foam::scalar Foam::CompositionModel<CloudType>::H\n"
-                "(\n"
-                "    const label phaseI,\n"
-                "    const scalarField& Y,"
-                "    const scalar p,\n"
-                "    const scalar T\n"
+                "Foam::scalar Foam::CompositionModel<CloudType>::H"
+                "("
+                "    const label, "
+                "    const scalarField&, "
+                "    const scalar, "
+                "    const scalar"
                 ") const"
             )   << "Unknown phase enumeration" << nl << abort(FatalError);
         }
@@ -399,12 +407,12 @@ Foam::scalar Foam::CompositionModel<CloudType>::cp
         {
             FatalErrorIn
             (
-                "Foam::scalar Foam::CompositionModel<CloudType>::cp\n"
-                "(\n"
-                "    const label phaseI,\n"
-                "    const scalarField& Y,"
-                "    const scalar p,\n"
-                "    const scalar T\n"
+                "Foam::scalar Foam::CompositionModel<CloudType>::cp"
+                "("
+                    "const label, "
+                    "const scalarField&, "
+                    "const scalar, "
+                    "const scalar"
                 ") const"
             )   << "Unknown phase enumeration" << nl << abort(FatalError);
         }
@@ -414,6 +422,77 @@ Foam::scalar Foam::CompositionModel<CloudType>::cp
 }
 
 
+template<class CloudType>
+Foam::scalar Foam::CompositionModel<CloudType>::L
+(
+    const label phaseI,
+    const scalarField& Y,
+    const scalar p,
+    const scalar T
+) const
+{
+    const phaseProperties& props = phaseProps_[phaseI];
+    scalar LMixture = 0.0;
+    switch (props.phase())
+    {
+        case phaseProperties::GAS:
+        {
+            notImplemented
+            (
+                "Foam::scalar Foam::CompositionModel<CloudType>::L"
+                "("
+                    "const label, "
+                    "const scalarField&, "
+                    "const scalar, "
+                    "const scalar"
+                ") const\n"
+                "*** No support for gaseous components"
+            );
+            break;
+        }
+        case phaseProperties::LIQUID:
+        {
+            forAll(Y, i)
+            {
+                label gid = props.globalIds()[i];
+                LMixture += Y[i]*this->liquids().properties()[gid].hl(p, T);
+            }
+            break;
+        }
+        case phaseProperties::SOLID:
+        {
+            notImplemented
+            (
+                "Foam::scalar Foam::CompositionModel<CloudType>::L"
+                "("
+                    "const label, "
+                    "const scalarField&, "
+                    "const scalar, "
+                    "const scalar"
+                ") const\n"
+                "*** No support for solid components"
+            );
+            break;
+        }
+        default:
+        {
+            FatalErrorIn
+            (
+                "Foam::scalar Foam::CompositionModel<CloudType>::L"
+                "("
+                    "const label, "
+                    "const scalarField&, "
+                    "const scalar, "
+                    "const scalar"
+                ") const"
+            )   << "Unknown phase enumeration" << nl << abort(FatalError);
+        }
+    }
+
+    return LMixture;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #include "NewCompositionModel.C"
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
index 5be0e2c1b9..c5382a4f9f 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
@@ -172,6 +172,9 @@ public:
                 //  If only 1 phase, return the component names of that phase
                 const wordList& phaseTypes() const;
 
+                //- Return the list of state labels (s), (l), (g) etc.
+                const wordList& stateLabels() const;
+
                 //- Return the list of component names for phaseI
                 const wordList& componentNames(const label phaseI) const;
 
@@ -226,7 +229,7 @@ public:
                 const scalar T
             ) const;
 
-            //- Return cp for the phase phaseI
+            //- Return specific heat caoacity for the phase phaseI
             virtual scalar cp
             (
                 const label phaseI,
@@ -234,6 +237,15 @@ public:
                 const scalar p,
                 const scalar T
             ) const;
+
+            //- Return latent heat for the phase phaseI
+            virtual scalar L
+            (
+                const label phaseI,
+                const scalarField& Y,
+                const scalar p,
+                const scalar T
+            ) const;
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C
index 707c158cc6..4a9f8d7b74 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C
@@ -47,16 +47,15 @@ Foam::CompositionModel<CloudType>::New
     {
         FatalErrorIn
         (
-            "CompositionModel<CloudType>::New\n"
-            "(\n"
-            "    const dictionary&,\n"
-            "    CloudType&\n"
+            "CompositionModel<CloudType>::New"
+            "("
+                "const dictionary&, "
+                "CloudType&"
             ")"
-        )
-            << "Unknown CompositionModelType type "
+        )   << "Unknown CompositionModelType type "
             << CompositionModelType
             << ", constructor not in hash table" << nl << nl
-            << "    Valid CompositionModel types are :" << nl
+            << "    Valid CompositionModel types are:" << nl
             << dictionaryConstructorTablePtr_->toc() << nl
             << exit(FatalError);
     }
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C
index 9f5eed2c7c..fb00ddc763 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C
@@ -106,11 +106,11 @@ Foam::SingleMixtureFraction<CloudType>::SingleMixtureFraction
         FatalErrorIn
         (
             "Foam::SingleMixtureFraction<CloudType>::"
-            "SingleMixtureFraction\n"
-            "(\n"
-            "    const dictionary&,\n"
-            "    CloudType&\n"
-            ")\n"
+            "SingleMixtureFraction"
+            "("
+                "const dictionary&, "
+                "CloudType&"
+            ")"
         )   << "Incorrect numebr of phases: " << nl
             << "    Please specify 1 gas, 1 liquid and 1 solid" << nl
             << exit(FatalError);
@@ -125,11 +125,11 @@ Foam::SingleMixtureFraction<CloudType>::SingleMixtureFraction
         FatalErrorIn
         (
             "Foam::SingleMixtureFraction<CloudType>::"
-            "SingleMixtureFraction\n"
-            "(\n"
-            "    const dictionary&,\n"
-            "    CloudType&\n"
-            ")\n"
+            "SingleMixtureFraction"
+            "("
+                "const dictionary&, "
+                "CloudType&"
+            ")"
         )   << "Sum of phases should be 1. Phase fractions:" << nl
             << YMixture0_ << nl << exit(FatalError);
     }
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
index e3b9383ecd..a3fde009a1 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
@@ -118,9 +118,9 @@ Foam::LiquidEvaporation<CloudType>::LiquidEvaporation
             )
         )
     ),
-    Tvap_(readScalar(this->coeffDict().lookup("Tvap"))),
     activeLiquids_(this->coeffDict().lookup("activeLiquids")),
-    liqToGasMap_(activeLiquids_.size())
+    liqToGasMap_(activeLiquids_.size(), -1),
+    liqToLiqMap_(activeLiquids_.size(), -1)
 {
     if (activeLiquids_.size() == 0)
     {
@@ -135,11 +135,37 @@ Foam::LiquidEvaporation<CloudType>::LiquidEvaporation
             << nl << endl;
     }
 
-    // Calculate mapping between liquid and carrier phase species
+    // Determine mapping between liquid and carrier phase species
     forAll(activeLiquids_, i)
     {
         liqToGasMap_[i] = carrierSpecieId(activeLiquids_[i]);
     }
+
+    // Determine mapping between local and global liquids
+    forAll(activeLiquids_, i)
+    {
+        forAll(liquids_->components(), j)
+        {
+            if (liquids_->components()[j] == activeLiquids_[i])
+            {
+                liqToLiqMap_[i] = j;
+            }
+        }
+
+        if (liqToLiqMap_[i] < 0)
+        {
+            FatalErrorIn
+            (
+                "Foam::LiquidEvaporation<CloudType>::LiquidEvaporation"
+                "("
+                    "const dictionary& dict, "
+                    "CloudType& owner"
+                ")"
+            )   << "Unable to find liquid species " << activeLiquids_[i]
+                << " in global liquids list. Avaliable liquids:" << nl
+                << liquids_->components() << nl << exit(FatalError);
+        }
+    }
 }
 
 
@@ -173,58 +199,52 @@ Foam::scalar Foam::LiquidEvaporation<CloudType>::calculate
     scalarList& dMassMT
 ) const
 {
+    // initialise total mass transferred from the particle to carrier phase
     scalar dMassTot = 0.0;
 
-    if (T < Tvap_)
+    // construct carrier phase species volume fractions for cell, cellI
+    scalarField Xc = calcXc(cellI);
+
+    // droplet surface area
+    scalar A = mathematicalConstant::pi*sqr(d);
+
+    // Reynolds number
+    scalar Re = mag(Ur)*d/(nuc + ROOTVSMALL);
+
+    // calculate mass transfer of each specie in liquid
+    forAll(activeLiquids_, i)
     {
-        // not reached model activation temperature
-        return dMassTot;
-    }
-    else
-    {
-        // Construct carrier phase species volume fractions
-        scalarField Xc = calcXc(cellI);
+        label gid = liqToGasMap_[i];
+        label lid = liqToLiqMap_[i];
 
-        // droplet surface area
-        scalar A = mathematicalConstant::pi*sqr(d);
+        // vapour diffusivity [m2/s]
+        scalar Dab = liquids_->properties()[lid].D(pc, T);
 
-        // Reynolds number
-        scalar Re = mag(Ur)*d/(nuc + ROOTVSMALL);
+        // saturation pressure for species i [pa]
+        scalar pSat = liquids_->properties()[lid].pv(pc, T);
 
-        // Calculate mass transfer of each specie in liquid
-        forAll(activeLiquids_, i)
-        {
-            label gid = liqToGasMap_[i];
+        // Schmidt number
+        scalar Sc = nuc/(Dab + ROOTVSMALL);
 
-            // Vapour diffusivity [m2/s]
-            scalar Dab = liquids_->properties()[gid].D(pc, T);
+        // Sherwood number
+        scalar Sh = this->Sh(Re, Sc);
 
-            // Saturation pressure for species i [pa]
-            scalar pSat = liquids_->properties()[gid].pv(pc, T);
+        // mass transfer coefficient [m/s]
+        scalar kc = Sh*Dab/(d + ROOTVSMALL);
 
-            // Schmidt number
-            scalar Sc = nuc/(Dab + ROOTVSMALL);
+        // vapour concentration at droplet surface [kgmol/m3]
+        scalar Cs = pSat/(specie::RR*T);
 
-            // Sherwood number
-            scalar Sh = this->Sh(Re, Sc);
+        // vapour concentration in bulk gas [kgmol/m3]
+        scalar Cinf = Xc[gid]*pc/(specie::RR*Tc);
 
-            // mass transfer coefficient [m/s]
-            scalar kc = Sh*Dab/(d + ROOTVSMALL);
+        // molar flux of vapour [kgmol/m2/s]
+        scalar Ni = max(kc*(Cs - Cinf), 0.0);
 
-            // vapour concentration at droplet surface [kgmol/m3]
-            scalar Cs = pSat/(specie::RR*T);
-
-            // vapour concentration in bulk gas [kgmol/m3]
-            scalar Cinf = Xc[gid]*pc/(specie::RR*Tc);
-
-            // molar flux of vapour [kgmol/m2/s]
-            scalar Ni = max(kc*(Cs - Cinf), 0.0);
-
-            // mass transfer [kg]
-            scalar dm = Ni*A*liquids_->properties()[gid].W()*dt;
-            dMassMT[gid] -= dm;
-            dMassTot += dm;
-        }
+        // mass transfer [kg]
+        scalar dm = Ni*A*liquids_->properties()[lid].W()*dt;
+        dMassMT[gid] += dm;
+        dMassTot += dm;
     }
 
     return dMassTot;
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
index 85d3714df3..a9321af4a9 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
@@ -56,17 +56,15 @@ protected:
         //- Global liquid properties data
         autoPtr<liquidMixture> liquids_;
 
-        //- Vaporisation temperature [K]
-        //  Local droplet temperature must exceed Tvap before evaporation is
-        //  allowed
-        scalar Tvap_;
-
         //- List of active liquid names
         List<word> activeLiquids_;
 
         //- Mapping between liquid and carrier gas species
         List<label> liqToGasMap_;
 
+        //- Mapping between local and global liquid species
+        List<label> liqToLiqMap_;
+
 
     // Protected member functions
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C
index 091fd8b810..efb611522a 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C
@@ -47,16 +47,15 @@ Foam::PhaseChangeModel<CloudType>::New
     {
         FatalErrorIn
         (
-            "PhaseChangeModel<CloudType>::New\n"
-            "(\n"
-            "    const dictionary&,\n"
-            "    CloudType&\n"
+            "PhaseChangeModel<CloudType>::New"
+            "("
+                "const dictionary&, "
+                "CloudType&"
             ")"
-        )
-            << "Unknown PhaseChangeModelType type "
+        )   << "Unknown PhaseChangeModelType type "
             << PhaseChangeModelType
             << ", constructor not in hash table" << nl << nl
-            << "    Valid PhaseChangeModel types are :" << nl
+            << "    Valid PhaseChangeModel types are:" << nl
             << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C
index f51c4568c0..838bdf75e2 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C
@@ -36,10 +36,7 @@ Foam::DevolatilisationModel<CloudType>::New
     CloudType& owner
 )
 {
-    word DevolatilisationModelType
-    (
-        dict.lookup("DevolatilisationModel")
-    );
+    word DevolatilisationModelType(dict.lookup("DevolatilisationModel"));
 
     Info<< "Selecting DevolatilisationModel " << DevolatilisationModelType
         << endl;
@@ -52,12 +49,14 @@ Foam::DevolatilisationModel<CloudType>::New
         FatalErrorIn
         (
             "DevolatilisationModel<CloudType>::New"
-            "(const dictionary&, CloudType&)"
-        )
-            << "Unknown DevolatilisationModelType type "
+            "("
+                "const dictionary&, "
+                "CloudType&"
+            ")"
+        )   << "Unknown DevolatilisationModelType type "
             << DevolatilisationModelType
             << ", constructor not in hash table" << nl << nl
-            << "    Valid DevolatilisationModel types are :" << nl
+            << "    Valid DevolatilisationModel types are:" << nl
             << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C
index 3923455a92..8556282b9d 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C
@@ -31,11 +31,11 @@ License
 template <class CloudType>
 Foam::NoSurfaceReaction<CloudType>::NoSurfaceReaction
 (
-    const dictionary& dict,
+    const dictionary&,
     CloudType& owner
 )
 :
-    SurfaceReactionModel<CloudType>(dict, owner, typeName)
+    SurfaceReactionModel<CloudType>(owner)
 {}
 
 
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C
index 2303e58f21..348bfa8a8c 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C
@@ -36,10 +36,7 @@ Foam::SurfaceReactionModel<CloudType>::New
     CloudType& owner
 )
 {
-    word SurfaceReactionModelType
-    (
-        dict.lookup("SurfaceReactionModel")
-    );
+    word SurfaceReactionModelType(dict.lookup("SurfaceReactionModel"));
 
     Info<< "Selecting SurfaceReactionModel " << SurfaceReactionModelType
         << endl;
@@ -52,12 +49,14 @@ Foam::SurfaceReactionModel<CloudType>::New
         FatalErrorIn
         (
             "SurfaceReactionModel<CloudType>::New"
-            "(const dictionary&, CloudType&)"
-        )
-            << "Unknown SurfaceReactionModelType type "
+            "("
+                "const dictionary&, "
+                "CloudType&"
+            ")"
+        )   << "Unknown SurfaceReactionModelType type "
             << SurfaceReactionModelType
             << ", constructor not in hash table" << nl << nl
-            << "    Valid SurfaceReactionModel types are :" << nl
+            << "    Valid SurfaceReactionModel types are:" << nl
             << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/NewHeatTransferModel.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/NewHeatTransferModel.C
index fb0362bbc3..d5d4748c4d 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/NewHeatTransferModel.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/NewHeatTransferModel.C
@@ -36,10 +36,7 @@ Foam::HeatTransferModel<CloudType>::New
     CloudType& owner
 )
 {
-    word HeatTransferModelType
-    (
-        dict.lookup("HeatTransferModel")
-    );
+    word HeatTransferModelType(dict.lookup("HeatTransferModel"));
 
     Info<< "Selecting HeatTransferModel " << HeatTransferModelType << endl;
 
@@ -51,12 +48,14 @@ Foam::HeatTransferModel<CloudType>::New
         FatalErrorIn
         (
             "HeatTransferModel<CloudType>::New"
-            "(const dictionary&, CloudType&)"
-        )
-            << "Unknown HeatTransferModelType type "
+            "("
+                "const dictionary&, "
+                "CloudType&"
+            ")"
+        )   << "Unknown HeatTransferModelType type "
             << HeatTransferModelType
             << ", constructor not in hash table" << nl << nl
-            << "    Valid HeatTransferModel types are :" << nl
+            << "    Valid HeatTransferModel types are:" << nl
             << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
     }
 

From 0505dbee3eb98a7b51bc4da44117d6811319101e Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 6 Mar 2009 15:53:58 +0000
Subject: [PATCH 031/175] tidy-up and added CaCO3 - put solids in their own
 namespace?

---
 .../KinematicParcel/KinematicParcel.C         |   2 +-
 .../ReactingMultiphaseParcel.C                |   2 +-
 .../Templates/ReactingParcel/ReactingParcel.C |   2 +-
 .../Templates/ThermoParcel/ThermoParcel.C     |   2 +-
 src/thermophysicalModels/solids/C/C.C         |  86 +++++++++++++++
 src/thermophysicalModels/solids/C/C.H         | 100 ++++++++++++++++++
 src/thermophysicalModels/solids/CaCO3/CaCO3.C |  86 +++++++++++++++
 .../solids/{Cs/Cs.H => CaCO3/CaCO3.H}         |  61 +++++------
 src/thermophysicalModels/solids/Make/files    |   5 +-
 src/thermophysicalModels/solids/ash/ash.C     |  41 +++++++
 src/thermophysicalModels/solids/ash/ash.H     |  48 ++++-----
 .../solids/solid/newSolid.C                   |  89 ++++++++++++++++
 src/thermophysicalModels/solids/solid/solid.C |  92 +++++++---------
 src/thermophysicalModels/solids/solid/solid.H |  73 ++++---------
 .../solids/{Cs/Cs.C => solid/solidI.H}        |  34 ++++--
 15 files changed, 541 insertions(+), 182 deletions(-)
 create mode 100644 src/thermophysicalModels/solids/C/C.C
 create mode 100644 src/thermophysicalModels/solids/C/C.H
 create mode 100644 src/thermophysicalModels/solids/CaCO3/CaCO3.C
 rename src/thermophysicalModels/solids/{Cs/Cs.H => CaCO3/CaCO3.H} (73%)
 create mode 100644 src/thermophysicalModels/solids/solid/newSolid.C
 rename src/thermophysicalModels/solids/{Cs/Cs.C => solid/solidI.H} (78%)

diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index 96a777b193..7fc3a62b79 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -268,7 +268,7 @@ void Foam::KinematicParcel<ParcelType>::transformProperties
 }
 
 
-// * * * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * //
+// * * * * * * * * * * * * * * IOStream operators  * * * * * * * * * * * * * //
 
 #include "KinematicParcelIO.C"
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 6bb568409c..2b67498fd2 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -385,7 +385,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
 }
 
 
-// * * * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * //
+// * * * * * * * * * * * * * * IOStream operators  * * * * * * * * * * * * * //
 
 #include "ReactingMultiphaseParcelIO.C"
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index d605841d40..8e8b9f9d68 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -236,7 +236,7 @@ Foam::scalar Foam::ReactingParcel<ParcelType>::calcPhaseChange
 }
 
 
-// * * * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * //
+// * * * * * * * * * * * * * * IOStream operators  * * * * * * * * * * * * * //
 
 #include "ReactingParcelIO.C"
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
index a158fc8e52..61cbdf9535 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -174,7 +174,7 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
 }
 
 
-// * * * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * //
+// * * * * * * * * * * * * * * IOStream operators  * * * * * * * * * * * * * //
 
 #include "ThermoParcelIO.C"
 
diff --git a/src/thermophysicalModels/solids/C/C.C b/src/thermophysicalModels/solids/C/C.C
new file mode 100644
index 0000000000..bc701872b7
--- /dev/null
+++ b/src/thermophysicalModels/solids/C/C.C
@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "C.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(C, 0);
+addToRunTimeSelectionTable(solid, C,);
+addToRunTimeSelectionTable(solid, C, Istream);
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::C::C()
+:
+    solid(2010, 710, 0.04, 0.0, 1.0)
+{
+    WarningIn("C::C()")
+        << "Properties of graphite need to be checked!!!"
+        << endl;
+}
+
+
+Foam::C::C(const solid& s)
+:
+    solid(s)
+{}
+
+
+Foam::C::C(Istream& is)
+:
+    solid(is)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::C::writeData(Ostream& os) const
+{
+    solid::writeData(os);
+}
+
+
+// * * * * * * * * * * * * * * IOStream operators  * * * * * * * * * * * * * //
+
+Foam::Ostream& operator<<(Ostream& os, const C& s)
+{
+    s.writeData(os);
+    return os;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/solids/C/C.H b/src/thermophysicalModels/solids/C/C.H
new file mode 100644
index 0000000000..0a3110b55d
--- /dev/null
+++ b/src/thermophysicalModels/solids/C/C.H
@@ -0,0 +1,100 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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::C
+
+Description
+    Graphite
+
+SourceFiles
+    C.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef solid_C_H
+#define solid_C_H
+
+#include "solid.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class C;
+
+Ostream& operator<<
+(
+     Ostream&,
+     const C&
+);
+
+
+/*---------------------------------------------------------------------------*\
+                            Class C Declaration
+\*---------------------------------------------------------------------------*/
+
+class C
+:
+    public solid
+{
+public:
+
+    //- Runtime type information
+    TypeName("C");
+
+
+    // Constructors
+
+        //- Construct null
+        C();
+
+        //- Construct from solid
+        C(const solid& s);
+
+        //- Construct from Istream
+        C(Istream& is);
+
+
+    // I-O
+
+        //- Write the function coefficients
+        void writeData(Ostream& os) const;
+
+
+    //- Ostream Operator
+    friend Ostream& operator<<(Ostream& os, const C& s);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/solids/CaCO3/CaCO3.C b/src/thermophysicalModels/solids/CaCO3/CaCO3.C
new file mode 100644
index 0000000000..36dcdd3d5c
--- /dev/null
+++ b/src/thermophysicalModels/solids/CaCO3/CaCO3.C
@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "CaCO3.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(CaCO3, 0);
+addToRunTimeSelectionTable(solid, CaCO3,);
+addToRunTimeSelectionTable(solid, CaCO3, Istream);
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::CaCO3::CaCO3()
+:
+    solid(2710, 850, 1.3, 0.0, 1.0)
+{
+    WarningIn("CaCO3::CaCO3()")
+        << "Properties of CaCO3 need to be checked!!!"
+        << endl;
+}
+
+
+Foam::CaCO3::CaCO3(const solid& s)
+:
+    solid(s)
+{}
+
+
+Foam::CaCO3::CaCO3(Istream& is)
+:
+    solid(is)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::CaCO3::writeData(Ostream& os) const
+{
+    solid::writeData(os);
+}
+
+
+// * * * * * * * * * * * * * * IOStream operators  * * * * * * * * * * * * * //
+
+Foam::Ostream& operator<<(Ostream& os, const CaCO3& s)
+{
+    s.writeData(os);
+    return os;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/solids/Cs/Cs.H b/src/thermophysicalModels/solids/CaCO3/CaCO3.H
similarity index 73%
rename from src/thermophysicalModels/solids/Cs/Cs.H
rename to src/thermophysicalModels/solids/CaCO3/CaCO3.H
index 648c5bf910..a3336f2f77 100644
--- a/src/thermophysicalModels/solids/Cs/Cs.H
+++ b/src/thermophysicalModels/solids/CaCO3/CaCO3.H
@@ -23,18 +23,18 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::Cs
+    Foam::CaCO3
 
 Description
-    Graphite
+    Calcium carbonate (limestone)
 
 SourceFiles
-    Cs.C
+    CaCO3.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef solid_Cs_H
-#define solid_Cs_H
+#ifndef solid_CaCO3_H
+#define solid_CaCO3_H
 
 #include "solid.H"
 
@@ -43,11 +43,20 @@ SourceFiles
 namespace Foam
 {
 
+class CaCO3;
+
+Ostream& operator<<
+(
+     Ostream&,
+     const CaCO3&
+);
+
+
 /*---------------------------------------------------------------------------*\
-                            Class Cs Declaration
+                              Class CaCO3 Declaration
 \*---------------------------------------------------------------------------*/
 
-class Cs
+class CaCO3
 :
     public solid
 {
@@ -55,50 +64,30 @@ class Cs
 public:
 
     //- Runtime type information
-    TypeName("Cs");
+    TypeName("CaCO3");
 
 
     // Constructors
 
         //- Construct null
-        Cs()
-        :
-            solid(2010, 710, 0.04, 0.0, 1.0)
-        {
-            WarningIn("Cs::Cs()")
-                << "Properties of graphite need to be checked!!!"
-                << endl;
-        }
+        CaCO3();
 
         //- Construct from solid
-        Cs
-        (
-            const solid& s
-        )
-        :
-            solid(s)
-        {}
+        CaCO3(const solid& s);
 
         //- Construct from Istream
-        Cs(Istream& is)
-        :
-            solid(is)
-        {}
+        CaCO3(Istream& is);
+
+
+    // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            solid::writeData(os);
-        }
+        void writeData(Ostream& os) const;
 
 
     // Ostream Operator
 
-        friend Ostream& operator<<(Ostream& os, const Cs& s)
-        {
-            s.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const CaCO3& s);
 };
 
 
diff --git a/src/thermophysicalModels/solids/Make/files b/src/thermophysicalModels/solids/Make/files
index 407737ead1..5da964b97f 100644
--- a/src/thermophysicalModels/solids/Make/files
+++ b/src/thermophysicalModels/solids/Make/files
@@ -1,5 +1,8 @@
 solid/solid.C
+solid/newSolid.C
+
 ash/ash.C
-Cs/Cs.C
+C/C.C
+CaCO3/CaCO3.C
 
 LIB = $(FOAM_LIBBIN)/libsolids
diff --git a/src/thermophysicalModels/solids/ash/ash.C b/src/thermophysicalModels/solids/ash/ash.C
index c63318e399..42da228d2c 100644
--- a/src/thermophysicalModels/solids/ash/ash.C
+++ b/src/thermophysicalModels/solids/ash/ash.C
@@ -38,6 +38,47 @@ defineTypeNameAndDebug(ash, 0);
 addToRunTimeSelectionTable(solid, ash,);
 addToRunTimeSelectionTable(solid, ash, Istream);
 
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::ash::ash()
+:
+    solid(2010, 710, 0.04, 0.0, 1.0)
+{
+    WarningIn("ash::ash()")
+        << "Properties of ash need to be checked!!!"
+        << endl;
+}
+
+
+Foam::ash::ash(const solid& s)
+:
+    solid(s)
+{}
+
+
+Foam::ash::ash(Istream& is)
+:
+    solid(is)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::ash::writeData(Ostream& os) const
+{
+    solid::writeData(os);
+}
+
+
+// * * * * * * * * * * * * * * IOStream operators  * * * * * * * * * * * * * //
+
+Foam::Ostream& operator<<(Ostream& os, const ash& s)
+{
+    s.writeData(os);
+    return os;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/solids/ash/ash.H b/src/thermophysicalModels/solids/ash/ash.H
index e9de1e74db..f4bab78fdc 100644
--- a/src/thermophysicalModels/solids/ash/ash.H
+++ b/src/thermophysicalModels/solids/ash/ash.H
@@ -43,6 +43,15 @@ SourceFiles
 namespace Foam
 {
 
+class ash;
+
+Ostream& operator<<
+(
+     Ostream&,
+     const ash&
+);
+
+
 /*---------------------------------------------------------------------------*\
                               Class ash Declaration
 \*---------------------------------------------------------------------------*/
@@ -61,45 +70,24 @@ public:
     // Constructors
 
         //- Construct null
-        ash()
-        :
-//   rho       Cp          K        Hf      e
-// [kg/m3] [J/(kg.K)] [W/(m.K)]   [J/kg]   [-]
-            solid(2010, 710, 0.04, 0.0, 1.0) // TODO
-        {
-            WarningIn("ash::ash()")
-                << "Properties of ash need to be checked!!!"
-                << endl;
-        }
+        ash();
 
-        ash
-        (
-            const solid& s
-        )
-        :
-            solid(s)
-        {}
+        //- Construct from solid
+        ash(const solid& s);
 
         //- Construct from Istream
-        ash(Istream& is)
-        :
-            solid(is)
-        {}
+        ash(Istream& is);
+
+
+    // I-O
 
         //- Write the function coefficients
-        void writeData(Ostream& os) const
-        {
-            solid::writeData(os);
-        }
+        void writeData(Ostream& os) const;
 
 
     // Ostream Operator
 
-        friend Ostream& operator<<(Ostream& os, const ash& s)
-        {
-            s.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const ash& s);
 };
 
 
diff --git a/src/thermophysicalModels/solids/solid/newSolid.C b/src/thermophysicalModels/solids/solid/newSolid.C
new file mode 100644
index 0000000000..445a98a00d
--- /dev/null
+++ b/src/thermophysicalModels/solids/solid/newSolid.C
@@ -0,0 +1,89 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "solid.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::solid> Foam::solid::New(Istream& is)
+{
+    if (debug)
+    {
+        Info<< "solid::New(Istream&): "
+            << "constructing solid"
+            << endl;
+    }
+
+    word solidType(is);
+
+    word coeffs(is);
+
+    if (coeffs == "defaultCoeffs")
+    {
+        ConstructorTable::iterator cstrIter =
+            ConstructorTablePtr_->find(solidType);
+
+        if (cstrIter == ConstructorTablePtr_->end())
+        {
+            FatalErrorIn("solid::New(Istream&)")
+                << "Unknown solid type " << solidType << nl << nl
+                << "Valid solid types are:" << endl
+                << ConstructorTablePtr_->toc()
+                << exit(FatalError);
+        }
+
+        return autoPtr<solid>(cstrIter()());
+    }
+    else if (coeffs == "coeffs")
+    {
+        IstreamConstructorTable::iterator cstrIter =
+            IstreamConstructorTablePtr_->find(solidType);
+
+        if (cstrIter == IstreamConstructorTablePtr_->end())
+        {
+            FatalErrorIn("solid::New(Istream&)")
+                << "Unknown solid type " << solidType << nl << nl
+                << "Valid solid types are:" << endl
+                << IstreamConstructorTablePtr_->toc()
+                << exit(FatalError);
+        }
+
+        return autoPtr<solid>(cstrIter()(is));
+    }
+    else
+    {
+        FatalErrorIn("solid::New(Istream&)")
+            << "solid type " << solidType
+            << ", option " << coeffs << " given"
+            << ", should be coeffs or defaultCoeffs"
+            << exit(FatalError);
+
+        return autoPtr<solid>(NULL);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/solids/solid/solid.C b/src/thermophysicalModels/solids/solid/solid.C
index 02a0fdde46..8d61715465 100644
--- a/src/thermophysicalModels/solids/solid/solid.C
+++ b/src/thermophysicalModels/solids/solid/solid.C
@@ -39,61 +39,51 @@ defineRunTimeSelectionTable(solid, Istream);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-autoPtr<solid> solid::New(Istream& is)
+Foam::solid::solid
+(
+    scalar rho,
+    scalar cp,
+    scalar K,
+    scalar Hf,
+    scalar emissivity
+)
+:
+    rho_(rho),
+    cp_(cp),
+    K_(K),
+    Hf_(Hf),
+    emissivity_(emissivity)
+{}
+
+
+Foam::solid::solid(Istream& is)
+:
+    rho_(readScalar(is)),
+    cp_(readScalar(is)),
+    K_(readScalar(is)),
+    Hf_(readScalar(is)),
+    emissivity_(readScalar(is))
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::solid::writeData(Ostream& os) const
 {
-    if (debug)
-    {
-        Info<< "solid::New(Istream&): "
-            << "constructing solid"
-            << endl;
-    }
+    os  << rho_ << token::SPACE
+        << cp_ << token::SPACE
+        << K_ << token::SPACE
+        << Hf_ << token::SPACE
+        << emissivity_;
+}
 
-    word solidType(is);
 
-    word coeffs(is);
+// * * * * * * * * * * * * * * IOStream operators  * * * * * * * * * * * * * //
 
-    if (coeffs == "defaultCoeffs")
-    {
-        ConstructorTable::iterator cstrIter =
-            ConstructorTablePtr_->find(solidType);
-
-        if (cstrIter == ConstructorTablePtr_->end())
-        {
-            FatalErrorIn("solid::New(Istream&)")
-                << "Unknown solid type " << solidType << nl << nl
-                << "Valid solid types are :" << endl
-                << ConstructorTablePtr_->toc()
-                << exit(FatalError);
-        }
-
-        return autoPtr<solid>(cstrIter()());
-    }
-    else if (coeffs == "coeffs")
-    {
-        IstreamConstructorTable::iterator cstrIter =
-            IstreamConstructorTablePtr_->find(solidType);
-
-        if (cstrIter == IstreamConstructorTablePtr_->end())
-        {
-            FatalErrorIn("solid::New(Istream&)")
-                << "Unknown solid type " << solidType << nl << nl
-                << "Valid solid types are :" << endl
-                << IstreamConstructorTablePtr_->toc()
-                << exit(FatalError);
-        }
-
-        return autoPtr<solid>(cstrIter()(is));
-    }
-    else
-    {
-        FatalErrorIn("solid::New(Istream&)")
-            << "solid type " << solidType
-            << ", option " << coeffs << " given"
-            << ", should be coeffs or defaultCoeffs"
-            << exit(FatalError);
-
-        return autoPtr<solid>(NULL);
-    }
+Foam::Ostream& operator<<(Ostream& os, const solid& s)
+{
+    s.writeData(os);
+    return os;
 }
 
 
diff --git a/src/thermophysicalModels/solids/solid/solid.H b/src/thermophysicalModels/solids/solid/solid.H
index 7ad30e79a2..3a7c8e2710 100644
--- a/src/thermophysicalModels/solids/solid/solid.H
+++ b/src/thermophysicalModels/solids/solid/solid.H
@@ -45,6 +45,15 @@ SourceFiles
 namespace Foam
 {
 
+class solid;
+
+Ostream& operator<<
+(
+     Ostream&,
+     const solid&
+);
+
+
 /*---------------------------------------------------------------------------*\
                             Class solid Declaration
 \*---------------------------------------------------------------------------*/
@@ -107,24 +116,10 @@ public:
             scalar K,
             scalar Hf,
             scalar emissivity
-        )
-        :
-            rho_(rho),
-            cp_(cp),
-            K_(K),
-            Hf_(Hf),
-            emissivity_(emissivity)
-        {}
+        );
 
         //- Construct from Istream
-        solid(Istream& is)
-        :
-            rho_(readScalar(is)),
-            cp_(readScalar(is)),
-            K_(readScalar(is)),
-            Hf_(readScalar(is)),
-            emissivity_(readScalar(is))
-        {}
+        solid(Istream& is);
 
         //- Return a pointer to a new solid created from input
         static autoPtr<solid> New(Istream& is);
@@ -141,59 +136,37 @@ public:
         // Phisical constants which define the solid
 
             //- Density [kg/m3]
-            scalar rho() const
-            {
-                return rho_;
-            }
+            inline scalar rho() const;
 
             //- Specific heat capacity [J/(kg.K)]
-            scalar cp() const
-            {
-                return cp_;
-            }
+            inline scalar cp() const;
 
             //- Thermal conductivity [W/(m.K)]
-            scalar K() const
-            {
-                return K_;
-            }
+            inline scalar K() const;
 
             //- Heat of formation [J/kg]
-            scalar Hf() const
-            {
-                return Hf_;
-            }
+            inline scalar Hf() const;
 
-            //- emissivity
-            scalar emissivity() const
-            {
-                return emissivity_;
-            }
+            //- Emissivity []
+            inline scalar emissivity() const;
 
 
         // I-O
 
             //- Write the solid properties
-            virtual void writeData(Ostream& os) const
-            {
-                os<< rho_ << token::SPACE
-                  << cp_ << token::SPACE
-                  << K_ << token::SPACE
-                  << Hf_ << token::SPACE
-                  << emissivity_;
-            }
+            virtual void writeData(Ostream& os) const;
 
 
         // Ostream Operator
 
-        friend Ostream& operator<<(Ostream& os, const solid& s)
-        {
-            s.writeData(os);
-            return os;
-        }
+        friend Ostream& operator<<(Ostream& os, const solid& s);
 };
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "solidI.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/solids/Cs/Cs.C b/src/thermophysicalModels/solids/solid/solidI.H
similarity index 78%
rename from src/thermophysicalModels/solids/Cs/Cs.C
rename to src/thermophysicalModels/solids/solid/solidI.H
index 5b15f12274..1921b1da3c 100644
--- a/src/thermophysicalModels/solids/Cs/Cs.C
+++ b/src/thermophysicalModels/solids/solid/solidI.H
@@ -24,22 +24,36 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "Cs.H"
-#include "addToRunTimeSelectionTable.H"
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
+inline Foam::scalar Foam::solid::rho() const
 {
+    return rho_;
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Cs, 0);
-addToRunTimeSelectionTable(solid, Cs,);
-addToRunTimeSelectionTable(solid, Cs, Istream);
+inline Foam::scalar Foam::solid::cp() const
+{
+    return cp_;
+}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace Foam
+inline Foam::scalar Foam::solid::K() const
+{
+    return K_;
+}
+
+
+inline Foam::scalar Foam::solid::Hf() const
+{
+    return Hf_;
+}
+
+
+inline Foam::scalar Foam::solid::emissivity() const
+{
+    return emissivity_;
+}
+
 
 // ************************************************************************* //

From 5e76511069dd218eb1693064cef7bf4ab6297159 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Thu, 12 Mar 2009 18:28:39 +0000
Subject: [PATCH 032/175] minor formatting changes

---
 .../IntegrationScheme/Analytical/Analytical.H          | 10 ++--------
 .../intermediate/IntegrationScheme/Euler/Euler.H       | 10 ++--------
 .../IntegrationScheme/IntegrationScheme.H              | 10 +++-------
 .../derived/basicReactingCloud/basicReactingCloud.H    |  1 +
 .../phaseProperties/phaseProperties/phaseProperties.C  |  2 +-
 .../phaseProperties/phaseProperties/phaseProperties.H  |  2 +-
 .../StochasticDispersionRAS/StochasticDispersionRAS.C  |  3 ++-
 .../Kinematic/DragModel/DragModel/DragModel.C          |  7 ++++---
 .../Kinematic/WallInteractionModel/Rebound/Rebound.C   |  1 -
 .../WallInteractionModel/WallInteractionModel.C        |  3 ++-
 .../CompositionModel/CompositionModel.C                |  3 ++-
 .../PhaseChangeModel/PhaseChangeModel.C                |  6 ++++--
 .../HeatTransferModel/HeatTransferModel.C              |  3 ++-
 .../cloudAbsorptionEmission/cloudAbsorptionEmission.H  | 10 ++--------
 .../radiation/scatter/cloudScatter/cloudScatter.H      | 10 ++--------
 15 files changed, 30 insertions(+), 51 deletions(-)

diff --git a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H
index 51c4aa5614..aefef71c0b 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H
+++ b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H
@@ -49,7 +49,6 @@ class Analytical
 :
     public IntegrationScheme<Type>
 {
-
 public:
 
     //- Runtime type information
@@ -59,16 +58,11 @@ public:
     // Constructors
 
         //- Construct from components
-        Analytical
-        (
-            const word& phiName,
-            const dictionary& dict
-        );
+        Analytical(const word& phiName, const dictionary& dict);
 
 
     //- Destructor
-
-        virtual ~Analytical();
+    virtual ~Analytical();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H b/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H
index 1062351c4c..279a80d8a7 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H
+++ b/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H
@@ -49,7 +49,6 @@ class Euler
 :
     public IntegrationScheme<Type>
 {
-
 public:
 
     //- Runtime type information
@@ -59,16 +58,11 @@ public:
     // Constructors
 
         //- Construct from components
-        Euler
-        (
-            const word& phiName,
-            const dictionary& dict
-        );
+        Euler(const word& phiName, const dictionary& dict);
 
 
     //- Destructor
-
-        virtual ~Euler();
+    virtual ~Euler();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
index 1ecc8c5934..78b1dec715 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
+++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
@@ -110,6 +110,7 @@ public:
 
 
 private:
+
     // Private data
 
         //- Name of the Integration variable
@@ -152,11 +153,7 @@ public:
     // Constructors
 
         //- Construct from components
-        IntegrationScheme
-        (
-            const word& phiName,
-            const dictionary& dict
-        );
+        IntegrationScheme(const word& phiName, const dictionary& dict);
 
 
     // Selectors
@@ -170,8 +167,7 @@ public:
 
 
     //- Destructor
-
-        virtual ~IntegrationScheme();
+    virtual ~IntegrationScheme();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H b/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H
index eb9d86e506..42f36fddcb 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H
@@ -26,6 +26,7 @@ Class
     Foam::basicReactingCloud
 
 Description
+    Reacting cloud templated on the reacting parcel
 
 SourceFiles
     basicReactingCloud.C
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
index 9df83bbbaf..df2b1d9f6d 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
@@ -131,7 +131,7 @@ void Foam::phaseProperties::checkTotalMassFraction() const
 }
 
 
-Foam::word Foam::phaseProperties::phaseToStateLabel(phaseType pt)
+Foam::word Foam::phaseProperties::phaseToStateLabel(phaseType pt) const
 {
     word state = "(unknown)";
     switch (pt)
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
index 2998a9831a..139d2acc19 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
@@ -101,7 +101,7 @@ private:
         void checkTotalMassFraction() const;
 
         //- Set the state label
-        word phaseToStateLabel(phaseType pt);
+        word phaseToStateLabel(phaseType pt) const;
 
 
 public:
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
index 6887244a98..f9a51f050e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
@@ -95,7 +95,8 @@ Foam::vector Foam::StochasticDispersionRAS<CloudType>::update
             dir /= mag(dir) + SMALL;
 
             // Numerical Recipes... Ch. 7. Random Numbers...
-            scalar x1, x2;
+            scalar x1 = 0.0;
+            scalar x2 = 0.0;
             scalar rsq = 10.0;
             while ((rsq > 1.0) || (rsq == 0.0))
             {
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C
index 7494f397e6..273e93b0e1 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C
@@ -34,7 +34,8 @@ Foam::DragModel<CloudType>::DragModel
     const dictionary& dict,
     CloudType& owner
 )
-:   dict_(dict),
+:
+    dict_(dict),
     owner_(owner)
 {}
 
@@ -76,9 +77,9 @@ Foam::scalar Foam::DragModel<CloudType>::Cu
 
     const scalar Re = rhoc*magUr*d/(mu + SMALL);
 
-    const scalar cd = Cd(Re);
+    const scalar Cd = this->Cd(Re);
 
-    return 3.0*cd*rhoc*magUr/(4.0*d*rhop);
+    return 3.0*Cd*rhoc*magUr/(4.0*d*rhop);
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/Rebound/Rebound.C b/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/Rebound/Rebound.C
index 7210f71e8a..a437c67edb 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/Rebound/Rebound.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/Rebound/Rebound.C
@@ -76,7 +76,6 @@ void Foam::Rebound<CloudType>::correct
     }
 
     U -= Ut;
-
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/WallInteractionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/WallInteractionModel.C
index a99831988f..5ee04a0a1c 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/WallInteractionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/WallInteractionModel.C
@@ -35,7 +35,8 @@ Foam::WallInteractionModel<CloudType>::WallInteractionModel
     CloudType& owner,
     const word& type
 )
-:   dict_(dict),
+:
+    dict_(dict),
     owner_(owner),
     coeffDict_(dict.subDict(type + "Coeffs"))
 {}
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
index 5408ad656e..36fd93c451 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
@@ -35,7 +35,8 @@ Foam::CompositionModel<CloudType>::CompositionModel
     CloudType& owner,
     const word& type
 )
-:   dict_(dict),
+:
+    dict_(dict),
     owner_(owner),
     coeffDict_(dict.subDict(type + "Coeffs")),
     carrierThermo_(owner.carrierThermo()),
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
index 724da1e762..b9fbdb2011 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
@@ -33,7 +33,8 @@ Foam::PhaseChangeModel<CloudType>::PhaseChangeModel
 (
     CloudType& owner
 )
-:   dict_(dictionary::null),
+:
+    dict_(dictionary::null),
     owner_(owner),
     coeffDict_(dictionary::null)
 {}
@@ -46,7 +47,8 @@ Foam::PhaseChangeModel<CloudType>::PhaseChangeModel
     CloudType& owner,
     const word& type
 )
-:   dict_(dict),
+:
+    dict_(dict),
     owner_(owner),
     coeffDict_(dict.subDict(type + "Coeffs"))
 {}
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
index f294d382a7..93a621d098 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
@@ -44,7 +44,8 @@ Foam::HeatTransferModel<CloudType>::HeatTransferModel
     CloudType& owner,
     const word& type
 )
-:   dict_(dict),
+:
+    dict_(dict),
     owner_(owner),
     coeffDict_(dict.subDict(type + "Coeffs"))
 {}
diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H
index eeb8ce7cb2..033ed351d5 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H
@@ -53,7 +53,6 @@ class cloudAbsorptionEmission
 :
     public absorptionEmissionModel
 {
-
     // Private data
 
         //- Coefficients dictionary
@@ -72,16 +71,11 @@ public:
     // Constructors
 
         //- Construct from components
-        cloudAbsorptionEmission
-        (
-            const dictionary& dict,
-            const fvMesh& mesh
-        );
+        cloudAbsorptionEmission(const dictionary& dict, const fvMesh& mesh);
 
 
     // Destructor
-
-        ~cloudAbsorptionEmission();
+    virtual ~cloudAbsorptionEmission();
 
 
     // Member Operators
diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H
index 288edd8391..2d36e281f4 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H
@@ -46,16 +46,13 @@ namespace radiation
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class cloudScatter Declaration
+                         Class cloudScatter Declaration
 \*---------------------------------------------------------------------------*/
 
 class cloudScatter
 :
     public scatterModel
 {
-
-private:
-
     // Private data
 
         //- Absorption model dictionary
@@ -82,14 +79,11 @@ public:
 
 
     // Destructor
-
-        ~cloudScatter();
+    virtual ~cloudScatter();
 
 
     // Member Operators
 
-        // Edit
-
         // Access
 
             //- Return scatter coefficient

From 55da1f976a3ec5168081de206a01353163fdfb5f Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 13 Mar 2009 19:17:25 +0000
Subject: [PATCH 033/175] updates for parcel calc routined

---
 .../Templates/KinematicCloud/KinematicCloud.C |  4 ++
 .../Templates/KinematicCloud/KinematicCloud.H | 27 ++++++++++++
 .../KinematicCloud/KinematicCloudI.H          | 22 ++++++++++
 .../KinematicParcel/KinematicParcel.C         | 36 +++++++++++++---
 .../KinematicParcel/KinematicParcel.H         |  8 ++++
 .../KinematicParcel/KinematicParcelI.H        | 11 ++++-
 .../Templates/ReactingParcel/ReactingParcel.C | 43 ++++++++-----------
 .../Templates/ThermoParcel/ThermoParcel.C     | 39 +++++++++--------
 .../Templates/ThermoParcel/ThermoParcel.H     |  1 +
 .../Kinematic/DragModel/DragModel/DragModel.C |  2 +-
 10 files changed, 144 insertions(+), 49 deletions(-)

diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index 6584495b63..6df424c523 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -102,6 +102,10 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
     mu_(mu),
     g_(g),
     interpolationSchemes_(particleProperties_.subDict("interpolationSchemes")),
+    forcesDict_(particleProperties_.subDict("forces")),
+    forceGravity_(forcesDict_.lookup("gravity")),
+    forceVirtualMass_(forcesDict_.lookup("virtualMass")),
+    forcePressureGradient_(forcesDict_.lookup("pressureGradient")),
     dispersionModel_
     (
         DispersionModel<KinematicCloud<ParcelType> >::New
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index 8a03a73cd7..77a61b02d2 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -133,6 +133,21 @@ class KinematicCloud
         dictionary interpolationSchemes_;
 
 
+        // Forces to include in particle motion evaluation
+
+            //- Dictionary of forces
+            dictionary forcesDict_;
+
+            //- Gravity
+            Switch forceGravity_;
+
+            //- Virtual mass
+            Switch forceVirtualMass_;
+
+            //- Pressure gradient
+            Switch forcePressureGradient_;
+
+
         // References to the cloud sub-models
 
             //- Dispersion model
@@ -252,6 +267,18 @@ 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 reference to dispersion model
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index f129df9bdb..adae027b87 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -108,6 +108,28 @@ Foam::KinematicCloud<ParcelType>::interpolationSchemes() const
 }
 
 
+template<class ParcelType>
+inline Foam::Switch Foam::KinematicCloud<ParcelType>::forceGravity() const
+{
+    return forceGravity_;
+}
+
+
+template<class ParcelType>
+inline Foam::Switch Foam::KinematicCloud<ParcelType>::forceVirtualMass() const
+{
+    return forceVirtualMass_;
+}
+
+
+template<class ParcelType>
+inline Foam::Switch Foam::KinematicCloud<ParcelType>::
+forcePressureGradient() const
+{
+    return forcePressureGradient_;
+}
+
+
 template<class ParcelType>
 inline const Foam::DispersionModel<Foam::KinematicCloud<ParcelType> >&
 Foam::KinematicCloud<ParcelType>::dispersion() const
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index 7fc3a62b79..c9df5a5776 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -27,6 +27,8 @@ License
 #include "KinematicParcel.H"
 #include "dimensionedConstants.H"
 
+#include "fvcGrad.H"
+
 // * * * * * * * * * * *  Protected Member Functions * * * * * * * * * * * * //
 
 template<class ParcelType>
@@ -69,7 +71,7 @@ void Foam::KinematicParcel<ParcelType>::calc
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     scalar Cud = 0.0;
     vector dUTrans = vector::zero;
-    const vector U1 = calcVelocity(td, dt, Cud, dUTrans);
+    const vector U1 = calcVelocity(td, dt, vector::zero, mass(), Cud, dUTrans);
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -88,7 +90,7 @@ void Foam::KinematicParcel<ParcelType>::calc
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // 3. Set new particle properties
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    this->U() = U1;
+    U_ = U1;
 }
 
 
@@ -98,27 +100,51 @@ const Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
 (
     TrackData& td,
     const scalar dt,
+    const vector& Fx,
+    const scalar mass,
     scalar& Cud,
-    vector& dUTrans
+    vector& dUTrans,
 ) const
 {
     // Return linearised term from drag model
     Cud = td.cloud().drag().Cu(U_ - Uc_, d_, rhoc_, rho_, muc_);
 
+    // Initialise total force (per unit mass)
+    vector Ftot = vector::zero;
+
+    // Gravity force
+    if (td.cloud().forceGravity())
+    {
+        Ftot += td.g()*(1 - rhoc_/rho_);
+    }
+
+    // Virtual mass force
+    if (td.cloud().forceVirtualMass())
+    {
+//        Ftot += td.constProps().Cvm()*rhoc_/rho_*d(Uc - U_)/dt;
+    }
+
+    // Pressure gradient force
+    if (td.cloud().forcePressureGradient())
+    {
+        Ftot += rhoc_/rho_*(U_ & fvc::grad(Uc_))
+    }
 
     //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Set new particle velocity
     //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     // Update velocity - treat as 3-D
-    const vector ap = Uc_ + (1 - rhoc_/rho_)/(Cud + VSMALL)*td.g();
+    const vector ap = Uc_ + (Ftot + Fx)/(Cud + VSMALL);
     const scalar bp = Cud;
 
     vector Unew = td.cloud().UIntegrator().integrate(U_, dt, ap, bp).value();
 
     // Calculate the momentum transfer to the continuous phase
     // - do not include gravity impulse
-    dUTrans = -mass()*(Unew - U_ - dt*td.g());
+
+    // TODO: USE AVERAGE PARTICLE MASS
+    dUTrans = -mass*(Unew - U_ - dt*td.g());
 
     return Unew;
 }
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index c60a216498..b6df66d414 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -93,6 +93,9 @@ public:
             //- Minimum particle mass [kg]
             const scalar minParticleMass_;
 
+            //- Virtual mass coefficient []
+            const scalar Cvm_;
+
 
     public:
 
@@ -106,6 +109,9 @@ public:
 
             //- Return const access to the minimum particle mass
             inline scalar minParticleMass() const;
+
+            //- Return const access to the virtual mass coefficient
+            inline scalar Cvm() const;
     };
 
 
@@ -228,6 +234,8 @@ protected:
         (
             TrackData& td,
             const scalar dt,
+            const vector& Fx,
+            const scalar mass,
             scalar& Cud,
             vector& dUTrans
         ) const;
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
index 3e8d49b7ad..4a6be04a97 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
@@ -33,7 +33,8 @@ inline Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties
 )
 :
     rho0_(dimensionedScalar(dict.lookup("rho0")).value()),
-    minParticleMass_(dimensionedScalar(dict.lookup("minParticleMass")).value())
+    minParticleMass_(dimensionedScalar(dict.lookup("minParticleMass")).value()),
+    Cvm_(dimensionedScalar(dict.lookup("Cvm")).value())
 {}
 
 
@@ -103,6 +104,14 @@ Foam::KinematicParcel<ParcelType>::constantProperties::minParticleMass() const
 }
 
 
+template <class ParcelType>
+inline Foam::scalar
+Foam::KinematicParcel<ParcelType>::constantProperties::Cvm() const
+{
+    return Cvm_;
+}
+
+
 // * * * * * * * * * * * trackData Member Functions  * * * * * * * * * * * * //
 
 template <class ParcelType>
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index 8e8b9f9d68..65d8bc1d8f 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -82,35 +82,33 @@ void Foam::ReactingParcel<ParcelType>::calc
 
     scalar Cud = 0.0;
     vector dUTrans = vector::zero;
-    const vector U1 = calcVelocity(td, dt, Cud, dUTrans);
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // 2. Calculate heat transfer
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
-    scalar htc = 0.0;
-    scalar dhHT = 0.0;
-//    TODO: T1 no longer used - return dhHT instead??????????????????????????????
-//    scalar T1 = calcHeatTransfer(td, dt, cellI, htc, dhHT);
-    calcHeatTransfer(td, dt, cellI, htc, dhHT);
+    const vector U1 = calcVelocity(td, dt, vector::zero, mass0, Cud, dUTrans);
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~
-    // 3. Calculate phase change
+    // 2. Calculate phase change
     // ~~~~~~~~~~~~~~~~~~~~~~~~~
     // Mass transfer from particle to carrier phase
     scalarList dMassPC(td.cloud().gases().size(), 0.0);
     const scalar dMassPCTot = calcPhaseChange(td, dt, cellI, T0, 1.0, dMassPC);
 
-    // Update particle component mass fractions
-    updateMassFraction(mass0, dMassPC, Y_);
-
     // Enthalpy change due to change in particle composition (sink)
-    scalar dhPC = -dMassPCTot*td.cloud().composition().L(0, Y_, pc, T0);
+    scalar ShPC = -dMassPCTot*td.cloud().composition().L(0, Y_, pc, T0);
 
     // Enthalpy change due to species released into the carrier (source)
     scalar HEff = td.cloud().composition().H(0, Y_, pc, T0);
-    dhPC += dMassPCTot*HEff;
+    ShPC += dMassPCTot*HEff;
+
+    // Update particle component mass fractions
+    updateMassFraction(mass0, dMassPC, Y_);
+
+
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // 3. Calculate heat transfer
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
+    scalar htc = 0.0;
+    scalar ShHT = 0.0;
+    scalar T1 = calcHeatTransfer(td, dt, cellI, ShPC, htc, ShHT);
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -121,13 +119,10 @@ void Foam::ReactingParcel<ParcelType>::calc
     scalar mass1 = mass0 - dMassPCTot;
 
     // Total enthalpy transfer from the particle to the carrier phase
-    scalar dhTrans = dhHT + dhPC;
+    scalar dhTrans = ShHT + ShPC;
 
-    // New specific heat capacity of mixture - using old temperature
-    scalar cp1 = td.cloud().composition().cp(0, Y_, pc_, T0);
-
-    // New particle temperature - using average mass over the time interval
-    scalar T1 = T0 + dhTrans/(0.5*(mass0 + mass1)*cp1);
+    // New specific heat capacity of mixture - using new temperature
+    scalar cp1 = td.cloud().composition().cp(0, Y_, pc_, T1);
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -203,7 +198,7 @@ Foam::scalar Foam::ReactingParcel<ParcelType>::calcPhaseChange
     const scalar dt,
     const label cellI,
     const scalar T,
-    const scalar YPhase,
+    const scalar YPhase, // TODO: NEEDED?????????????????????????????????????????
     scalarList& dMassMT
 )
 {
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
index 61cbdf9535..da7a31200e 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -72,18 +72,18 @@ void Foam::ThermoParcel<ParcelType>::calc
     scalar dhTrans = 0.0;
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // 2. Calculate velocity - update U
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    scalar Cud = 0.0;
-    const vector U1 = calcVelocity(td, dt, Cud, dUTrans);
-
-
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // 3. Calculate heat transfer - update T
+    // 2. Calculate heat transfer - update T
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     scalar htc = 0.0;
-    const scalar T1 = calcHeatTransfer(td, dt, cellI, htc, dhTrans);
+    const scalar T1 = calcHeatTransfer(td, dt, cellI, 0.0, htc, dhTrans);
+
+
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // 3. Calculate velocity - update U
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    scalar Cud = 0.0;
+    const vector U1 = calcVelocity(td, dt, vector::zero, Cud, mass0, dUTrans);
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -108,7 +108,7 @@ void Foam::ThermoParcel<ParcelType>::calc
     // 5. Set new particle properties
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     this->U() = U1;
-    this->T() = T1;
+    T_ = T1;
 }
 
 
@@ -119,6 +119,7 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
     TrackData& td,
     const scalar dt,
     const label cellI,
+    const scalar Sh,
     scalar& htc,
     scalar& dhTrans
 )
@@ -142,9 +143,12 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
         this->muc_
     );
 
+    //- Assuming diameter = diameter at start of time step
+    scalar Ap = this->areasS();
+
     // Determine ap and bp coefficients
-    scalar ap = Tc_;
-    scalar bp = htc;
+    scalar ap = Tc_ + Sh/(htc*Ap + ROOTVSMALL);
+    scalar bp = 6.0*htc/(this->rho_*this->d_*cp_);
     if (td.cloud().radiation())
     {
         // Carrier phase incident radiation field
@@ -156,19 +160,18 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
         // Helper variables
         const scalar sigma = radiation::sigmaSB.value();
         const scalar epsilon = td.constProps().epsilon0();
-        const scalar epsilonSigmaT3 = epsilon*sigma*pow3(T_);
-        ap = (htc*Tc_ + 0.25*epsilon*G[cellI])/(htc + epsilonSigmaT3);
-        bp += epsilonSigmaT3;
+        const scalar D = epsilon*sigma*pow3(T_)/(htc + ROOTVSMALL) + 1.0;
+        ap += 0.25*epsilon*G[cellI]/(htc + ROOTVSMALL);
+        ap /= D;
+        bp *= D;
     }
-    bp *= 6.0/(this->rho_*this->d_*cp_);
-
 
     // Integrate to find the new parcel temperature
     IntegrationScheme<scalar>::integrationResult Tres =
         td.cloud().TIntegrator().integrate(T_, dt, ap, bp);
 
     // Using average parcel temperature for enthalpy transfer calculation
-    dhTrans = dt*this->areaS()*htc*(Tres.average() - Tc_);
+    dhTrans = dt*Ap*htc*(Tres.average() - Tc_);
 
     return Tres.value();
 }
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
index bc66a2a7d2..8506bb7c0a 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
@@ -210,6 +210,7 @@ protected:
             TrackData& td,
             const scalar dt,
             const label cellI,
+            const scalar Sh,
             scalar& htc,
             scalar& dhTrans
         );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C
index 273e93b0e1..f1b98e609c 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C
@@ -75,7 +75,7 @@ Foam::scalar Foam::DragModel<CloudType>::Cu
 {
     const scalar magUr = mag(Ur);
 
-    const scalar Re = rhoc*magUr*d/(mu + SMALL);
+    const scalar Re = rhoc*magUr*d/(mu + ROOTVSMALL);
 
     const scalar Cd = this->Cd(Re);
 

From 706e4254328647f2a9cce4f59593ac9c769a5cea Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 16 Mar 2009 09:37:48 +0000
Subject: [PATCH 034/175] updates to the reacting classes

---
 .../ReactingMultiphaseParcel.C                | 202 +++++++-----------
 .../ReactingMultiphaseParcel.H                |   2 +
 .../Templates/ReactingParcel/ReactingParcel.C |  62 +++---
 .../Templates/ReactingParcel/ReactingParcel.H |   4 +-
 .../Templates/ThermoParcel/ThermoParcel.C     |  27 +--
 .../LiquidEvaporation/LiquidEvaporation.C     |  10 +-
 .../LiquidEvaporation/LiquidEvaporation.H     |   4 +-
 .../NoPhaseChange/NoPhaseChange.C             |   3 +-
 .../NoPhaseChange/NoPhaseChange.H             |   4 +-
 .../PhaseChangeModel/PhaseChangeModel.H       |   4 +-
 .../ConstantRateDevolatilisation.C            |   8 +-
 .../ConstantRateDevolatilisation.H            |   4 +-
 .../SingleKineticRateDevolatilisation.C       |  11 +-
 .../SingleKineticRateDevolatilisation.H       |   4 +-
 14 files changed, 150 insertions(+), 199 deletions(-)

diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 2b67498fd2..816691d770 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -87,146 +87,102 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Define local properties at beginning of timestep
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    const vector U0 = this->U_;
     const scalar mass0 = this->mass();
-    const scalar cp0 = this->cp_;
     const scalar np0 = this->nParticle_;
-    scalar T0 = this->T_;
+    const scalar T0 = this->T_;
     const scalar pc = this->pc_;
-    scalarField& Y = this->Y_;
-    scalar mass1 = mass0;
+    scalarField& YMix = this->Y_;
+    const label idL = td.cloud().composition().idLiquid();
 
-    label idGas = td.cloud().composition().idGas();
-    label idLiquid = td.cloud().composition().idLiquid();
-    label idSolid = td.cloud().composition().idSolid();
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Initialise transfer terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    // Momentum transfer from the particle to the carrier phase
-    vector dUTrans = vector::zero;
-
-    // Enthalpy transfer from the particle to the carrier phase
-    scalar dhTrans = 0.0;
 
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Calculate phase change in liquid phase
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Mass transfer from particle to carrier phase
-    // - components exist in particle already
-    scalarList dMassMT(td.cloud().gases().size(), 0.0);
+    scalarList dMassPC(td.cloud().gases().size(), 0.0);
+    scalar shPC = 
+        calcPhaseChange(td, dt, cellI, T0, idL, YMix[idL], YLiquid_, dMassPC);
 
-    // Mass transfer due to surface reactions from particle to carrier phase
-    // - components do not necessarily exist in particle already
-    scalarList dMassSR(td.cloud().gases().size(), 0.0);
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate velocity - update U
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    scalar Cud = 0.0;
-    const vector U1 = calcVelocity(td, dt, Cud, dUTrans);
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate heat transfer - update T
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    scalar htc = 0.0;
-    scalar T1 = calcHeatTransfer(td, dt, cellI, htc, dhTrans);
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate phase change - update mass, Y, cp, T, dhTrans
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    const scalar dMassPC = calcPhaseChange(td, dt, cellI, T1, Y[idLiquid], dMassMT);
-
-    // Update particle mass
-    mass1 -= dMassPC;
-
-    // Update particle liquid component mass fractions
-    this->updateMassFraction(mass0, dMassMT, YLiquid_);
-
-    // New specific heat capacity of mixture
-    scalar cp1 = cpEff(td, pc, T1);
-
-    // Correct temperature due to evaporated components
-    // TODO: use hl function in liquidMixture???
-//    scalar dhPC = -dMassPCTot*td.cloud().composition().L(0, Y_, pc, T0);
-    scalar Lvap = td.cloud().composition().L(idLiquid, this->YLiquid_, pc, T0);
-    T1 -= Lvap*dMassPC/(0.5*(mass0 + mass1)*cp1);
-
-    // Correct dhTrans to account for the change in enthalpy due to the
-    // liquid phase change
-    dhTrans +=
-        dMassPC
-       *td.cloud().composition().H(idLiquid, YLiquid_, pc, 0.5*(T0 + T1));
-
-//????????????????????????????????????????????????????????????????????????????????
-    // Store temperature for the start of the next process
-    T0 = T1;
-//????????????????????????????????????????????????????????????????????????????????
+    // Update particle component mass fractions
+    updateMassFraction(mass0, dMassPC, YLiquid_);
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Calculate Devolatilisation
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~
-    const scalar dMassD = calcDevolatilisation(td, dt, T0, dMassMT);
-
-    // Update particle mass
-    mass1 -= dMassD;
-
-    // New specific heat capacity of mixture
-    cp1 = cpEff(td, pc, T1);
-
-    // Update gas and solid component mass fractions
-//    updateMassFraction(mass0, mass1, dMassMT, YGas_);
-//    updateMassFraction(mass0, mass1, dMassMT, YSolid_);
-
-    // Correct particle temperature to account for latent heat of
-    // devolatilisation
-    T1 -=
-        td.constProps().Ldevol()
-       *sum(dMassMT)
-       /(0.5*(mass0 + mass1)*cp1);
+    // Mass transfer from particle to carrier phase
+    // - components exist in particle already
+    scalarList dMassDV(td.cloud().gases().size(), 0.0);
+    scalar shDV = calcDevolatilisation(td, dt, T0, mass0, idGas, YMix, dMassDV);
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Calculate surface reactions
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
+    // Mass transfer of volatile components from particle to carrier phase
+    const scalarList dMassMT = dMassPC + dMassDV;
+    // Mass transfer due to surface reactions from particle to carrier phase
+    // - components do not necessarily exist in particle already
+    scalarList dMassSR(td.cloud().gases().size(), 0.0);
     // Initialise enthalpy retention to zero
     scalar dhRet = 0.0;
-
-    calcSurfaceReactions(td, dt, cellI, T0, T1, dMassMT, dMassSR, dhRet);
-
-    // New total mass
-    mass1 -= sum(dMassSR);
-
+    calcSurfaceReactions(td, dt, cellI, T0, dMassMT, dMassSR, dhRet);
 
     // Enthalpy retention divided between particle and carrier phase by the
     // fraction fh and (1 - fh)
-    T1 += td.constProps().fh()*dhRet/(0.5*(mass0 + mass1)*cp0);
+    scalar ShSR = td.constProps().fh()*dhRet;
     dhTrans -= (1.0 - td.constProps().fh())*dhRet;
 
-    // Correct dhTrans to account for enthalpy of evolved volatiles
-    dhTrans +=
-        sum(dMassMT)
-       *td.cloud().composition().H(idGas, YGas_, pc, 0.5*(T0 + T1));
-
     // Correct dhTrans to account for enthalpy of consumed solids
     dhTrans +=
-        sum(dMassSR)
-       *td.cloud().composition().H(idSolid, YSolid_, pc, 0.5*(T0 + T1));
+        sum(dMassSR)*td.cloud().composition().H(idSolid, YSolid_, pc, T0);
+
+    // Correct dhTrans to account for enthalpy of evolved volatiles
+    dhTrans +=
+        sum(dMassMT)*td.cloud().composition().H(idGas, YGas_, pc, T0);
 
 
+    // ~~~~~~~~~~~~~~~~~~~~~~~
+    // Calculate heat transfer
+    // ~~~~~~~~~~~~~~~~~~~~~~~
+    scalar htc = 0.0;
+
+    // Total enthalpy source
+    scalar Sh = ShPC + ShDV + ShSR;
+
+    scalar T1 = calcHeatTransfer(td, dt, cellI, Sh, htc, shHT);
+
+
+    // ~~~~~~~~~~~~~~~~~~
+    // Calculate velocity
+    // ~~~~~~~~~~~~~~~~~~
+    // Update mass
+    scalar mass1 = mass0 - massPC - massD - massSR;
+    scalar Cud = 0.0;
+    vector dUTrans = vector::zero;
+    vector Fx = vector::zero;
+    vector U1 = calcVelocity(td, dt, Fx, 0.5*(mass0 + mass1), Cud, dUTrans);
+
+
+
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Collect contributions to determine new particle thermo properties
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Update specific heat capacity
+    cp1 = cpEff(td, pc, T1);
+
+
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Accumulate carrier phase source terms
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     if (td.cloud().coupled())
     {
-        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        // Accumulate carrier phase source terms
-        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
         // Transfer mass lost from particle to carrier mass source
         forAll(dMassMT, i)
         {
-            td.cloud().rhoTrans(i)[cellI] += np0*(dMassMT[i] + dMassSR[i]);
+            td.cloud().rhoTrans(i)[cellI] +=
+                np0*(dMassPC[i] + dMassDV[i] + dMassSR[i]);
         }
 
         // Update momentum transfer
@@ -266,7 +222,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     {
         this->U_ = U1;
         this->T_ = T1;
-        this->cp_ = cpEff(td, pc, T1);
+        this->cp_ = cp1;
 
         // Update particle density or diameter
         if (td.constProps().constantVolume())
@@ -288,6 +244,9 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
     TrackData& td,
     const scalar dt,
     const scalar T,
+    const scalar mass,
+    const label idVolatile,
+    scalarField_ YMixture,
     scalarList& dMassMT
 )
 {
@@ -296,37 +255,34 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
     if
     (
         !td.cloud().devolatilisation().active()
-     || this->T_<td.constProps().Tvap()
-     || this->T_<td.constProps().Tbp()
+     || T < td.constProps().Tvap()
+     || T < td.constProps().Tbp()
     )
     {
         return 0.0;
     }
 
     // Determine mass to add to carrier phase
-    const scalar mass = this->mass();
-    scalarField& Y = this->Y_;
     const scalar dMassTot = td.cloud().devolatilisation().calculate
     (
         dt,
         this->mass0_,
         mass,
-        td.cloud().composition().YMixture0(),
-        Y,
+        td.cloud().composition().YMixture0()[idVolatile],
+        YMix[0],
         T,
         canCombust_
     );
 
     // Update (total) mass fractions
-    Y[0] = (Y[0]*mass - dMassTot)/(mass - dMassTot);
-    Y[1] = Y[1]*mass/(mass - dMassTot);
-    Y[2] = 1.0 - Y[0] - Y[1];
+    YMix[0] = (YMix[0]*mass - dMassTot)/(mass - dMassTot);
+    YMix[1] = YMix[1]*mass/(mass - dMassTot);
+    YMix[2] = 1.0 - YMix[0] - YMix[1];
 
     // Add to cummulative mass transfer
-    label idGas = td.cloud().composition().idGas();
     forAll (YGas_, i)
     {
-        label id = td.cloud().composition().globalIds(idGas)[i];
+        label id = td.cloud().composition().globalIds(idVolatile)[i];
 
         // Volatiles mass transfer
         scalar volatileMass = YGas_[i]*dMassTot;
@@ -335,7 +291,7 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
 
     td.cloud().addToMassDevolatilisation(dMassTot);
 
-    return dMassTot;
+    return = td.constProps().Ldevol()*dMassTot;
 }
 
 
@@ -346,8 +302,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
     TrackData& td,
     const scalar dt,
     const label cellI,
-    const scalar T0,
-    const scalar T1,
+    const scalar T,
     const scalarList& dMassMT,
     scalarList& dMassSR,
     scalar& dhRet
@@ -366,8 +321,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
         dt,
         cellI,
         this->d_,
-        T0,
-        T1,
+        T,
         this->Tc_,
         this->pc_,
         this->rhoc_,
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
index e70f0ae5c3..ca6315bde8 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -185,6 +185,8 @@ protected:
             TrackData& td,
             const scalar dt,
             const scalar T,
+	    const scalar mass,
+	    const label idVolatile,
             scalarList& dMassMT
         );
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index 65d8bc1d8f..1d18da3169 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -76,47 +76,41 @@ void Foam::ReactingParcel<ParcelType>::calc
     const scalar np0 = this->nParticle_;
     const scalar T0 = this->T_;
 
-    // ~~~~~~~~~~~~~~~~~~~~~
-    // 1. Calculate velocity
-    // ~~~~~~~~~~~~~~~~~~~~~
-
-    scalar Cud = 0.0;
-    vector dUTrans = vector::zero;
-    const vector U1 = calcVelocity(td, dt, vector::zero, mass0, Cud, dUTrans);
-
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~
-    // 2. Calculate phase change
+    // 1. Calculate phase change
     // ~~~~~~~~~~~~~~~~~~~~~~~~~
     // Mass transfer from particle to carrier phase
     scalarList dMassPC(td.cloud().gases().size(), 0.0);
-    const scalar dMassPCTot = calcPhaseChange(td, dt, cellI, T0, 1.0, dMassPC);
-
-    // Enthalpy change due to change in particle composition (sink)
-    scalar ShPC = -dMassPCTot*td.cloud().composition().L(0, Y_, pc, T0);
-
-    // Enthalpy change due to species released into the carrier (source)
-    scalar HEff = td.cloud().composition().H(0, Y_, pc, T0);
-    ShPC += dMassPCTot*HEff;
+    scalar ShPC = calcPhaseChange(td, dt, cellI, T0, 0, 1.0, Y_, dMassPC);
 
     // Update particle component mass fractions
     updateMassFraction(mass0, dMassPC, Y_);
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // 3. Calculate heat transfer
+    // 2. Calculate heat transfer
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~
     scalar htc = 0.0;
     scalar ShHT = 0.0;
     scalar T1 = calcHeatTransfer(td, dt, cellI, ShPC, htc, ShHT);
 
 
+    // ~~~~~~~~~~~~~~~~~~~~~
+    // 3. Calculate velocity
+    // ~~~~~~~~~~~~~~~~~~~~~
+    // Update mass
+    scalar mass1 = mass0 - sum(dMassPC);
+    scalar Cud = 0.0;
+    vector dUTrans = vector::zero;
+    vector Fx = vector::zero;
+    vector U1 = calcVelocity(td, dt, Fx, 0.5*(mass0 + mass1), Cud, dUTrans);
+
+
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // 4. Collect contributions to determine new particle thermo properties
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    // New mass
-    scalar mass1 = mass0 - dMassPCTot;
 
     // Total enthalpy transfer from the particle to the carrier phase
     scalar dhTrans = ShHT + ShPC;
@@ -165,6 +159,7 @@ void Foam::ReactingParcel<ParcelType>::calc
                 td.cloud().rhoTrans(i)[cellI] += np0*mass1*Y_[i];
             }
             td.cloud().UTrans()[cellI] += np0*mass1*U1;
+            scalar HEff = td.cloud().composition().H(0, YComponents, pc_, T1);
             td.cloud().hTrans()[cellI] += np0*mass1*HEff;
         }
     }
@@ -198,36 +193,47 @@ Foam::scalar Foam::ReactingParcel<ParcelType>::calcPhaseChange
     const scalar dt,
     const label cellI,
     const scalar T,
-    const scalar YPhase, // TODO: NEEDED?????????????????????????????????????????
-    scalarList& dMassMT
+    const label idPhase,
+    const scalar YPhase,
+    scalarField& YComponents,
+    scalarList& dMass
 )
 {
     if
     (
         !td.cloud().phaseChange().active()
      || T < td.constProps().Tvap()
-     || YPhase > SMALL
+     || YPhase < SMALL
     )
     {
         return 0.0;
     }
 
-    scalar dMass = td.cloud().phaseChange().calculate
+    td.cloud().phaseChange().calculate
     (
         dt,
         cellI,
-        T,
+        min(T, td.constProps().Tbp()), // Limiting to boiling temperature
         pc_,
         this->d_,
         this->Tc_,
         this->muc_/this->rhoc_,
         this->U_ - this->Uc_,
-        dMassMT
+        dMass
     );
 
-    td.cloud().addToMassPhaseChange(dMass);
+    scalar dMassTot = sum(dMass);
 
-    return dMass;
+    // Add to cumulative phase change mass
+    td.cloud().addToMassPhaseChange(dMassTot);
+
+    // Effective latent heat of vaporisation
+    scalar LEff = td.cloud().composition().L(idPhase, YComponents, pc_, T);
+
+    // Effective heat of vaporised components
+    scalar HEff = td.cloud().composition().H(idPhase, YComponents, pc_, T);
+
+    return dMassTot*(HEff - LEff);
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index d1c41acc40..3e4a248006 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -188,8 +188,10 @@ protected:
             const scalar dt,
             const label cellI,
             const scalar T,
+            const label idPhase,
             const scalar YPhase,
-            scalarList& dMassMT
+	    const scalarField& YComponents,
+            scalarList& dMass
         );
 
         //- Update mass fraction
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
index da7a31200e..b1ff448686 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -61,33 +61,24 @@ void Foam::ThermoParcel<ParcelType>::calc
     const scalar np0 = this->nParticle_;
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // 1. Initialise transfer terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    // Momentum transfer from the particle to the carrier phase
-    vector dUTrans = vector::zero;
-
-    // Enthalpy transfer from the particle to the carrier phase
-    scalar dhTrans = 0.0;
-
-
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // 2. Calculate heat transfer - update T
+    // 1. Calculate heat transfer - update T
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     scalar htc = 0.0;
-    const scalar T1 = calcHeatTransfer(td, dt, cellI, 0.0, htc, dhTrans);
+    scalar ShHT = 0.0;
+    const scalar T1 = calcHeatTransfer(td, dt, cellI, 0.0, htc, ShHT);
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // 3. Calculate velocity - update U
+    // 2. Calculate velocity - update U
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     scalar Cud = 0.0;
+    vector dUTrans = vector::zero;
     const vector U1 = calcVelocity(td, dt, vector::zero, Cud, mass0, dUTrans);
 
 
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // 4. Accumulate carrier phase source terms
+    // 3. Accumulate carrier phase source terms
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     if (td.cloud().coupled())
     {
@@ -98,7 +89,7 @@ void Foam::ThermoParcel<ParcelType>::calc
         td.cloud().UCoeff()[cellI] += np0*mass0*Cud;
 
         // Update enthalpy transfer
-        td.cloud().hTrans()[cellI] += np0*dhTrans;
+        td.cloud().hTrans()[cellI] += np0*ShHT;
 
         // Coefficient to be applied in carrier phase enthalpy coupling
         td.cloud().hCoeff()[cellI] += np0*htc*this->areaS();
@@ -121,7 +112,7 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
     const label cellI,
     const scalar Sh,
     scalar& htc,
-    scalar& dhTrans
+    scalar& ShHT
 )
 {
     if (!td.cloud().heatTransfer().active())
@@ -171,7 +162,7 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
         td.cloud().TIntegrator().integrate(T_, dt, ap, bp);
 
     // Using average parcel temperature for enthalpy transfer calculation
-    dhTrans = dt*Ap*htc*(Tres.average() - Tc_);
+    ShHT = dt*Ap*htc*(Tres.average() - Tc_);
 
     return Tres.value();
 }
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
index a3fde009a1..fd33527bf5 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
@@ -186,7 +186,7 @@ bool Foam::LiquidEvaporation<CloudType>::active() const
 
 
 template<class CloudType>
-Foam::scalar Foam::LiquidEvaporation<CloudType>::calculate
+void Foam::LiquidEvaporation<CloudType>::calculate
 (
     const scalar dt,
     const label cellI,
@@ -196,7 +196,7 @@ Foam::scalar Foam::LiquidEvaporation<CloudType>::calculate
     const scalar Tc,
     const scalar nuc,
     const vector& Ur,
-    scalarList& dMassMT
+    scalarList& dMass
 ) const
 {
     // initialise total mass transferred from the particle to carrier phase
@@ -242,12 +242,8 @@ Foam::scalar Foam::LiquidEvaporation<CloudType>::calculate
         scalar Ni = max(kc*(Cs - Cinf), 0.0);
 
         // mass transfer [kg]
-        scalar dm = Ni*A*liquids_->properties()[lid].W()*dt;
-        dMassMT[gid] += dm;
-        dMassTot += dm;
+        dMass[gid] += Ni*A*liquids_->properties()[lid].W()*dt;
     }
-
-    return dMassTot;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
index a9321af4a9..0aa6953521 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
@@ -104,7 +104,7 @@ public:
         bool active() const;
 
         //- Update model
-        scalar calculate
+        void calculate
         (
             const scalar dt,
             const label cellI,
@@ -114,7 +114,7 @@ public:
             const scalar Tc,
             const scalar nuc,
             const vector& Ur,
-            scalarList& dMassMT
+            scalarList& dMass
         ) const;
 };
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
index aa4fbc4cee..7ecb03c773 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
@@ -56,7 +56,7 @@ bool Foam::NoPhaseChange<CloudType>::active() const
 
 
 template<class CloudType>
-Foam::scalar Foam::NoPhaseChange<CloudType>::calculate
+void Foam::NoPhaseChange<CloudType>::calculate
 (
     const scalar,
     const label,
@@ -70,7 +70,6 @@ Foam::scalar Foam::NoPhaseChange<CloudType>::calculate
 ) const
 {
     // Nothing to do...
-    return 0.0;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
index 1a58a5141f..e1ec25dd5e 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
@@ -70,7 +70,7 @@ public:
         bool active() const;
 
         //- Update model
-        scalar calculate
+        void calculate
         (
             const scalar dt,
             const label cellI,
@@ -80,7 +80,7 @@ public:
             const scalar Tc,
             const scalar nuc,
             const vector& Ur,
-            scalarList& dMassMT
+            scalarList& dMass
         ) const;
 };
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
index ff9a77e9b6..32e44a960f 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
@@ -136,7 +136,7 @@ public:
         virtual bool active() const = 0;
 
         //- Update model
-        virtual scalar calculate
+        virtual void calculate
         (
             const scalar dt,
             const label cellI,
@@ -146,7 +146,7 @@ public:
             const scalar Tc,
             const scalar nuc,
             const vector& Ur,
-            scalarList& dMassMT
+            scalarList& dMass
         ) const = 0;
 };
 
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
index bf371114dd..afe83f1baa 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
@@ -66,14 +66,14 @@ Foam::scalar Foam::ConstantRateDevolatilisation<CloudType>::calculate
     const scalar dt,
     const scalar mass0,
     const scalar mass,
-    const scalarField& YMixture0,
-    const scalarField& YMixture,
+    const scalar YVolatile0,
+    const scalarField& YVolatile,
     const scalar T,
     bool& canCombust
 ) const
 {
-    const scalar massVolatile0 = YMixture0[0]*mass0;
-    const scalar massVolatile  = YMixture[0]*mass;
+    const scalar massVolatile0 = YVolatile0*mass0;
+    const scalar massVolatile  = YVolatile*mass;
 
     if (massVolatile <= volatileResidualCoeff_*massVolatile0)
     {
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
index 80bc0ced2f..13abc8b2a9 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
@@ -93,8 +93,8 @@ public:
             const scalar dt,
             const scalar mass0,
             const scalar mass,
-            const scalarField& YMixture0,
-            const scalarField& YMixture,
+            const scalar YVolatile0,
+            const scalarField& YVolatile,
             const scalar T,
             bool& canCombust
         ) const;
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
index 43eee0ad2a..488e22978e 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
@@ -29,7 +29,8 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template <class CloudType>
-Foam::SingleKineticRateDevolatilisation<CloudType>::SingleKineticRateDevolatilisation
+Foam::SingleKineticRateDevolatilisation<CloudType>::
+SingleKineticRateDevolatilisation
 (
     const dictionary& dict,
     CloudType& owner
@@ -68,14 +69,14 @@ Foam::scalar Foam::SingleKineticRateDevolatilisation<CloudType>::calculate
     const scalar dt,
     const scalar mass0,
     const scalar mass,
-    const scalarField& YMixture0,
-    const scalarField& YMixture,
+    const scalar YVolatile0,
+    const scalarField& YVolatile,
     const scalar T,
     bool& canCombust
 ) const
 {
-    const scalar massVolatile0 = YMixture0[0]*mass;
-    const scalar massVolatile = YMixture[0]*mass;
+    const scalar massVolatile0 = YVolatile0*mass;
+    const scalar massVolatile = YVolatile*mass;
 
     if (massVolatile <= volatileResidualCoeff_*massVolatile0)
     {
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
index f68ea2245a..62873a77d7 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
@@ -95,8 +95,8 @@ public:
             const scalar dt,
             const scalar mass0,
             const scalar mass,
-            const scalarField& YMixture0,
-            const scalarField& YMixture,
+            const scalar YVolatile0,
+            const scalarField& YVolatile,
             const scalar T,
             bool& canCombust
         ) const;

From 0ccaf7aae784f4c5d7b864b3c064134030e01956 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 16 Mar 2009 17:42:28 +0000
Subject: [PATCH 035/175] added writePositions

---
 src/lagrangian/basic/Cloud/Cloud.C | 20 ++++++++++
 src/lagrangian/basic/Cloud/Cloud.H | 61 +++++++++++++++++-------------
 2 files changed, 54 insertions(+), 27 deletions(-)

diff --git a/src/lagrangian/basic/Cloud/Cloud.C b/src/lagrangian/basic/Cloud/Cloud.C
index 8d39c1f70a..72e1b1f818 100644
--- a/src/lagrangian/basic/Cloud/Cloud.C
+++ b/src/lagrangian/basic/Cloud/Cloud.C
@@ -30,6 +30,7 @@ License
 #include "PstreamCombineReduceOps.H"
 #include "mapPolyMesh.H"
 #include "Time.H"
+#include "OFstream.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -320,6 +321,25 @@ void Foam::Cloud<ParticleType>::autoMap(const mapPolyMesh& mapper)
 }
 
 
+template<class ParticleType>
+void Foam::Cloud<ParticleType>::writePositions() const
+{
+    OFstream pObj
+    (
+        this->db().time().path()/this->name() + "_positions.obj"
+    );
+
+    forAllConstIter(typename Cloud<ParticleType>, *this, pIter)
+    {
+        const ParticleType& p = pIter();
+        pObj<< "v " << p.position().x() << " " << p.position().y() << " "
+            << p.position().z() << nl;
+    }
+
+    pObj.flush();
+}
+
+
 // * * * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * //
 
 #include "CloudIO.C"
diff --git a/src/lagrangian/basic/Cloud/Cloud.H b/src/lagrangian/basic/Cloud/Cloud.H
index d82dc933f1..f0ca222d91 100644
--- a/src/lagrangian/basic/Cloud/Cloud.H
+++ b/src/lagrangian/basic/Cloud/Cloud.H
@@ -46,6 +46,7 @@ SourceFiles
 namespace Foam
 {
 
+// Forward declaration of functions
 template<class ParticleType>
 class Cloud;
 
@@ -173,44 +174,47 @@ public:
                 return IDLList<ParticleType>::size();
             };
 
-            const const_iterator begin() const
-            {
-                return IDLList<ParticleType>::begin();
-            };
 
-            const const_iterator cbegin() const
-            {
-                return IDLList<ParticleType>::cbegin();
-            };
+            // Iterators
 
-            const const_iterator end() const
-            {
-                return IDLList<ParticleType>::end();
-            };
+                const const_iterator begin() const
+                {
+                    return IDLList<ParticleType>::begin();
+                };
 
-            const const_iterator cend() const
-            {
-                return IDLList<ParticleType>::cend();
-            };
+                const const_iterator cbegin() const
+                {
+                    return IDLList<ParticleType>::cbegin();
+                };
 
-            iterator begin()
-            {
-                return IDLList<ParticleType>::begin();
-            };
+                const const_iterator end() const
+                {
+                    return IDLList<ParticleType>::end();
+                };
 
-            iterator end()
-            {
-                return IDLList<ParticleType>::end();
-            };
+                const const_iterator cend() const
+                {
+                    return IDLList<ParticleType>::cend();
+                };
+
+                iterator begin()
+                {
+                    return IDLList<ParticleType>::begin();
+                };
+
+                iterator end()
+                {
+                    return IDLList<ParticleType>::end();
+                };
+
+
+        // Edit
 
             void clear()
             {
                 return IDLList<ParticleType>::clear();
             };
 
-
-        // Edit
-
             //- Transfer particle to cloud
             void addParticle(ParticleType* pPtr);
 
@@ -262,6 +266,9 @@ public:
                 IOstream::compressionType cmp
             ) const;
 
+            //- Write positions to <cloudName>_positions.obj file
+            void writePositions() const;
+
 
     // Ostream Operator
 

From c5c16150b7319adbf7265959bdf56080348dbee2 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 16 Mar 2009 17:43:12 +0000
Subject: [PATCH 036/175] multiple updates

---
 .../Templates/KinematicCloud/KinematicCloud.C |  23 +--
 .../Templates/KinematicCloud/KinematicCloud.H |   3 -
 .../Templates/ReactingCloud/ReactingCloud.C   |   2 +-
 .../ReactingMultiphaseCloud.C                 |   2 +-
 .../Templates/ThermoCloud/ThermoCloud.C       |   2 +-
 .../KinematicParcel/KinematicParcel.C         |  53 +++---
 .../KinematicParcel/KinematicParcel.H         |   3 +-
 .../ReactingMultiphaseParcel.C                | 168 ++++++++++--------
 .../ReactingMultiphaseParcel.H                |  16 +-
 .../Templates/ReactingParcel/ReactingParcel.C |  85 ++++-----
 .../Templates/ReactingParcel/ReactingParcel.H |   2 +-
 .../Templates/ThermoParcel/ThermoParcel.C     |  63 ++++---
 .../LiquidEvaporation/LiquidEvaporation.C     |   3 -
 .../ConstantRateDevolatilisation.C            |   4 +-
 .../ConstantRateDevolatilisation.H            |   4 +-
 .../DevolatilisationModel.H                   |   4 +-
 .../NoDevolatilisation/NoDevolatilisation.C   |   4 +-
 .../NoDevolatilisation/NoDevolatilisation.H   |   4 +-
 .../SingleKineticRateDevolatilisation.C       |   4 +-
 .../SingleKineticRateDevolatilisation.H       |   4 +-
 .../NoSurfaceReaction/NoSurfaceReaction.C     |  33 ++--
 .../NoSurfaceReaction/NoSurfaceReaction.H     |  14 +-
 .../SurfaceReactionModel.H                    |  15 +-
 23 files changed, 263 insertions(+), 252 deletions(-)

diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index 6df424c523..f60f69261c 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -232,7 +232,7 @@ void Foam::KinematicCloud<ParcelType>::evolve()
 
     if (debug)
     {
-        this->dumpParticlePositions();
+        this->writePositions();
     }
 
     if (coupled_)
@@ -261,25 +261,4 @@ void Foam::KinematicCloud<ParcelType>::info() const
 }
 
 
-template<class ParcelType>
-void Foam::KinematicCloud<ParcelType>::dumpParticlePositions() const
-{
-    OFstream pObj
-    (
-        this->db().time().path()/"parcelPositions_"
-      + this->name() + "_"
-      + name(this->injection().nInjections()) + ".obj"
-    );
-
-    forAllConstIter(typename KinematicCloud<ParcelType>, *this, iter)
-    {
-        const ParcelType& p = iter();
-        pObj<< "v " << p.position().x() << " " << p.position().y() << " "
-            << p.position().z() << nl;
-    }
-
-    pObj.flush();
-}
-
-
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index 77a61b02d2..7f39808f83 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -338,9 +338,6 @@ public:
             //- Print cloud information
             void info() const;
 
-            //- Dump particle positions to .obj file
-            void dumpParticlePositions() const;
-
 
             // Fields
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
index 15a088c000..b14fcc17cd 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -204,7 +204,7 @@ void Foam::ReactingCloud<ParcelType>::evolve()
 
     if (debug)
     {
-        this->dumpParticlePositions();
+        this->writePositions();
     }
 
     if (this->coupled())
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
index 708a3f7223..29936f328c 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
@@ -181,7 +181,7 @@ void Foam::ReactingMultiphaseCloud<ParcelType>::evolve()
 
     if (debug)
     {
-        this->dumpParticlePositions();
+        this->writePositions();
     }
 
     if (this->coupled())
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
index b54624bb81..40731ec254 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
@@ -203,7 +203,7 @@ void Foam::ThermoCloud<ParcelType>::evolve()
 
     if (debug)
     {
-        this->dumpParticlePositions();
+        this->writePositions();
     }
 
     if (this->coupled())
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index c9df5a5776..637bf15fa4 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -27,8 +27,6 @@ License
 #include "KinematicParcel.H"
 #include "dimensionedConstants.H"
 
-#include "fvcGrad.H"
-
 // * * * * * * * * * * *  Protected Member Functions * * * * * * * * * * * * //
 
 template<class ParcelType>
@@ -66,30 +64,43 @@ void Foam::KinematicParcel<ParcelType>::calc
     const label cellI
 )
 {
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // 1. Calculate velocity - update U, dUTrans
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    scalar Cud = 0.0;
+    // Define local properties at beginning of time step
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    const scalar mass0 = mass();
+
+
+    // Initialise transfer terms
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Momentum
     vector dUTrans = vector::zero;
-    const vector U1 = calcVelocity(td, dt, vector::zero, mass(), Cud, dUTrans);
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // 2. Accumulate carrier phase source terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Motion
+    // ~~~~~~
+
+    // No additional forces
+    vector Fx = vector::zero;
+
+    // Calculate new particle velocity
+    scalar Cud = 0.0;
+    vector U1 = calcVelocity(td, dt, cellI, Fx, mass0, Cud, dUTrans);
+
+
+    // Accumulate carrier phase source terms
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     if (td.cloud().coupled())
     {
         // Update momentum transfer
         td.cloud().UTrans()[cellI] += nParticle_*dUTrans;
 
         // Coefficient to be applied in carrier phase momentum coupling
-        td.cloud().UCoeff()[cellI] += nParticle_*mass()*Cud;
+        td.cloud().UCoeff()[cellI] += nParticle_*mass0*Cud;
     }
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // 3. Set new particle properties
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Set new particle properties
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
     U_ = U1;
 }
 
@@ -100,10 +111,11 @@ const Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
 (
     TrackData& td,
     const scalar dt,
+    const label cellI,
     const vector& Fx,
     const scalar mass,
     scalar& Cud,
-    vector& dUTrans,
+    vector& dUTrans
 ) const
 {
     // Return linearised term from drag model
@@ -127,12 +139,13 @@ const Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
     // Pressure gradient force
     if (td.cloud().forcePressureGradient())
     {
-        Ftot += rhoc_/rho_*(U_ & fvc::grad(Uc_))
+        const vector& d = this->mesh().deltaCoeffs()[cellI];
+        Ftot += rhoc_/rho_*(U_ & (d^Uc_));
     }
 
-    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Set new particle velocity
-    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // New particle velocity
+    //~~~~~~~~~~~~~~~~~~~~~~
 
     // Update velocity - treat as 3-D
     const vector ap = Uc_ + (Ftot + Fx)/(Cud + VSMALL);
@@ -142,8 +155,6 @@ const Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
 
     // Calculate the momentum transfer to the continuous phase
     // - do not include gravity impulse
-
-    // TODO: USE AVERAGE PARTICLE MASS
     dUTrans = -mass*(Unew - U_ - dt*td.g());
 
     return Unew;
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index b6df66d414..35b46329dc 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -84,7 +84,6 @@ public:
     //- Class to hold kinematic particle constant properties
     class constantProperties
     {
-
         // Private data
 
             //- Particle density [kg/m3] (constant)
@@ -120,7 +119,6 @@ public:
     :
         public Particle<ParcelType>::trackData
     {
-
         // Private data
 
             //- Reference to the cloud containing this particle
@@ -234,6 +232,7 @@ protected:
         (
             TrackData& td,
             const scalar dt,
+            const label cellI,
             const vector& Fx,
             const scalar mass,
             scalar& Cud,
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 816691d770..8bcc94cef2 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -84,7 +84,6 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     const label cellI
 )
 {
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Define local properties at beginning of timestep
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     const scalar mass0 = this->mass();
@@ -92,97 +91,94 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     const scalar T0 = this->T_;
     const scalar pc = this->pc_;
     scalarField& YMix = this->Y_;
+    const label idG = td.cloud().composition().idGas();
     const label idL = td.cloud().composition().idLiquid();
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate phase change in liquid phase
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Mass transfer from particle to carrier phase
+    // Initialise transfer terms
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Momentum
+    vector dUTrans = vector::zero;
+
+    // Enthalpy
+    scalar dhTrans = 0.0;
+
+    // Mass transfer due to phase change
     scalarList dMassPC(td.cloud().gases().size(), 0.0);
-    scalar shPC = 
+
+    // Mass transfer due to devolatilisation
+    scalarList dMassDV(td.cloud().gases().size(), 0.0);
+
+    // Change in carrier phase composition due to surface reactions
+    scalarList dMassSRc(td.cloud().gases().size(), 0.0);
+
+
+    // Phase change in liquid phase
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Return enthalpy source and calc mass transfer due to phase change
+    scalar ShPC =
         calcPhaseChange(td, dt, cellI, T0, idL, YMix[idL], YLiquid_, dMassPC);
 
     // Update particle component mass fractions
-    updateMassFraction(mass0, dMassPC, YLiquid_);
+    this->updateMassFraction(mass0, dMassPC, YLiquid_);
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate Devolatilisation
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Mass transfer from particle to carrier phase
-    // - components exist in particle already
-    scalarList dMassDV(td.cloud().gases().size(), 0.0);
-    scalar shDV = calcDevolatilisation(td, dt, T0, mass0, idGas, YMix, dMassDV);
+    // Devolatilisation
+    // ~~~~~~~~~~~~~~~~
+
+    // Return enthalpy source and calc mass transfer due to devolatilisation
+    scalar ShDV = calcDevolatilisation(td, dt, T0, mass0, idG, YMix, dMassDV);
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate surface reactions
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Surface reactions
+    // ~~~~~~~~~~~~~~~~~
+
     // Mass transfer of volatile components from particle to carrier phase
     const scalarList dMassMT = dMassPC + dMassDV;
-    // Mass transfer due to surface reactions from particle to carrier phase
-    // - components do not necessarily exist in particle already
-    scalarList dMassSR(td.cloud().gases().size(), 0.0);
-    // Initialise enthalpy retention to zero
-    scalar dhRet = 0.0;
-    calcSurfaceReactions(td, dt, cellI, T0, dMassMT, dMassSR, dhRet);
 
-    // Enthalpy retention divided between particle and carrier phase by the
-    // fraction fh and (1 - fh)
-    scalar ShSR = td.constProps().fh()*dhRet;
-    dhTrans -= (1.0 - td.constProps().fh())*dhRet;
-
-    // Correct dhTrans to account for enthalpy of consumed solids
-    dhTrans +=
-        sum(dMassSR)*td.cloud().composition().H(idSolid, YSolid_, pc, T0);
-
-    // Correct dhTrans to account for enthalpy of evolved volatiles
-    dhTrans +=
-        sum(dMassMT)*td.cloud().composition().H(idGas, YGas_, pc, T0);
+    // Return enthalpy source and calc mass transfer(s) due to surface reaction
+    scalar ShSR =
+        calcSurfaceReactions(td, dt, cellI, T0, dMassMT, dMassSRc, dhTrans);
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate heat transfer
-    // ~~~~~~~~~~~~~~~~~~~~~~~
-    scalar htc = 0.0;
+    // Heat transfer
+    // ~~~~~~~~~~~~~
 
     // Total enthalpy source
     scalar Sh = ShPC + ShDV + ShSR;
 
-    scalar T1 = calcHeatTransfer(td, dt, cellI, Sh, htc, shHT);
+    // Calculate new particle temperature
+    scalar htc = 0.0;
+    scalar T1 = calcHeatTransfer(td, dt, cellI, Sh, htc, dhTrans);
 
 
-    // ~~~~~~~~~~~~~~~~~~
-    // Calculate velocity
-    // ~~~~~~~~~~~~~~~~~~
-    // Update mass
-    scalar mass1 = mass0 - massPC - massD - massSR;
-    scalar Cud = 0.0;
-    vector dUTrans = vector::zero;
+    // Motion
+    // ~~~~~~
+
+    // Update mass (not to include cMassSR)
+    scalar mass1 = mass0 - sum(dMassPC) - sum(dMassDV);
+
+    // No additional forces
     vector Fx = vector::zero;
-    vector U1 = calcVelocity(td, dt, Fx, 0.5*(mass0 + mass1), Cud, dUTrans);
+
+    // Calculate new particle velocity
+    scalar Cud = 0.0;
+    vector U1 =
+        calcVelocity(td, dt, cellI, Fx, 0.5*(mass0 + mass1), Cud, dUTrans);
 
 
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Collect contributions to determine new particle thermo properties
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    // Update specific heat capacity
-    cp1 = cpEff(td, pc, T1);
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Accumulate carrier phase source terms
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
     if (td.cloud().coupled())
     {
         // Transfer mass lost from particle to carrier mass source
         forAll(dMassMT, i)
         {
             td.cloud().rhoTrans(i)[cellI] +=
-                np0*(dMassPC[i] + dMassDV[i] + dMassSR[i]);
+                np0*(dMassPC[i] + dMassDV[i] + dMassSRc[i]);
         }
 
         // Update momentum transfer
@@ -200,9 +196,9 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     }
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Remove the particle when mass falls below minimum threshold
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
     if (mass1 < td.constProps().minParticleMass())
     {
         td.keepParticle = false;
@@ -215,14 +211,16 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
         td.cloud().hTrans()[cellI] += np0*mass1*HEff(td, pc, T1);
         td.cloud().UTrans()[cellI] += np0*mass1*U1;
     }
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
     // Set new particle properties
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
     else
     {
         this->U_ = U1;
         this->T_ = T1;
-        this->cp_ = cp1;
+        this->cp_ = cpEff(td, pc, T1);
 
         // Update particle density or diameter
         if (td.constProps().constantVolume())
@@ -246,8 +244,8 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
     const scalar T,
     const scalar mass,
     const label idVolatile,
-    scalarField_ YMixture,
-    scalarList& dMassMT
+    scalarField& YMixture,
+    scalarList& dMassDV
 )
 {
     // Check that model is active, and that the parcel temperature is
@@ -268,16 +266,16 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
         dt,
         this->mass0_,
         mass,
-        td.cloud().composition().YMixture0()[idVolatile],
-        YMix[0],
         T,
+        td.cloud().composition().YMixture0()[idVolatile],
+        YMixture[0],
         canCombust_
     );
 
     // Update (total) mass fractions
-    YMix[0] = (YMix[0]*mass - dMassTot)/(mass - dMassTot);
-    YMix[1] = YMix[1]*mass/(mass - dMassTot);
-    YMix[2] = 1.0 - YMix[0] - YMix[1];
+    YMixture[0] = (YMixture[0]*mass - dMassTot)/(mass - dMassTot);
+    YMixture[1] = YMixture[1]*mass/(mass - dMassTot);
+    YMixture[2] = 1.0 - YMixture[0] - YMixture[1];
 
     // Add to cummulative mass transfer
     forAll (YGas_, i)
@@ -286,26 +284,26 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
 
         // Volatiles mass transfer
         scalar volatileMass = YGas_[i]*dMassTot;
-        dMassMT[id] += volatileMass;
+        dMassDV[id] += volatileMass;
     }
 
     td.cloud().addToMassDevolatilisation(dMassTot);
 
-    return = td.constProps().Ldevol()*dMassTot;
+    return td.constProps().Ldevol()*dMassTot;
 }
 
 
 template<class ParcelType>
 template<class TrackData>
-void Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
+Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
 (
     TrackData& td,
     const scalar dt,
     const label cellI,
     const scalar T,
     const scalarList& dMassMT,
-    scalarList& dMassSR,
-    scalar& dhRet
+    scalarList& dMassSRc,
+    scalar& dhTrans
 )
 {
     // Check that model is active
@@ -316,7 +314,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
 
     // Update mass transfer(s)
     // - Also updates Y()'s
-    td.cloud().surfaceReaction().calculate
+    scalar HReaction = td.cloud().surfaceReaction().calculate
     (
         dt,
         cellI,
@@ -331,11 +329,27 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
         YLiquid_,
         YSolid_,
         this->Y_,
-        dMassSR,
-        dhRet
+        dMassSRc,
+        HReaction
     );
 
+    // Heat of reaction divided between particle and carrier phase by the
+    // fraction fh and (1 - fh)
+    dhTrans -= (1.0 - td.constProps().fh())*HReaction;
+
+/*
+    // Correct dhTrans to account for enthalpy of consumed solids
+    dhTrans +=
+        sum(dMassSR)*td.cloud().composition().H(idSolid, YSolid_, pc, T0);
+
+    // Correct dhTrans to account for enthalpy of evolved volatiles
+    dhTrans +=
+        sum(dMassMT)*td.cloud().composition().H(idGas, YGas_, pc, T0);
+
     // TODO: td.cloud().addToMassSurfaceReaction(sum(dMassSR));
+*/
+
+    return td.constProps().fh()*HReaction;
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
index ca6315bde8..35ff4f296b 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -185,23 +185,23 @@ protected:
             TrackData& td,
             const scalar dt,
             const scalar T,
-	    const scalar mass,
-	    const label idVolatile,
-            scalarList& dMassMT
+            const scalar mass,
+            const label idVolatile,
+            scalarField& YMixture,
+            scalarList& dMassDV
         );
 
         //- Calculate surface reactions
         template<class TrackData>
-        void calcSurfaceReactions
+        scalar calcSurfaceReactions
         (
             TrackData& td,
             const scalar dt,
             const label cellI,
-            const scalar T0,
-            const scalar T1,
+            const scalar T,
             const scalarList& dMassMT,
-            scalarList& dMassSR,
-            scalar& dhRet
+            scalarList& dMassSRc,
+            scalar& dhTrans
         );
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index 1d18da3169..b751f5c9eb 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -69,7 +69,6 @@ void Foam::ReactingParcel<ParcelType>::calc
     const label cellI
 )
 {
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Define local properties at beginning of time step
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     const scalar mass0 = this->mass();
@@ -77,51 +76,54 @@ void Foam::ReactingParcel<ParcelType>::calc
     const scalar T0 = this->T_;
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-    // 1. Calculate phase change
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Mass transfer from particle to carrier phase
+    // Intialise transfer terms
+    // ~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Momentum
+    vector dUTrans = vector::zero;
+
+    // Enthalpy
+    scalar dhTrans = 0.0;
+
+    // Mass transfer due to phase change
     scalarList dMassPC(td.cloud().gases().size(), 0.0);
+
+
+    // Phase change
+    // ~~~~~~~~~~~~
+
+    // Return enthalpy source and calc mass transfer due to phase change
     scalar ShPC = calcPhaseChange(td, dt, cellI, T0, 0, 1.0, Y_, dMassPC);
 
     // Update particle component mass fractions
     updateMassFraction(mass0, dMassPC, Y_);
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // 2. Calculate heat transfer
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Heat transfer
+    // ~~~~~~~~~~~~~
+
+    // Calculate new particle temperature
     scalar htc = 0.0;
-    scalar ShHT = 0.0;
-    scalar T1 = calcHeatTransfer(td, dt, cellI, ShPC, htc, ShHT);
+    scalar T1 = calcHeatTransfer(td, dt, cellI, ShPC, htc, dhTrans);
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~
-    // 3. Calculate velocity
-    // ~~~~~~~~~~~~~~~~~~~~~
+    // Motion
+    // ~~~~~~
+
     // Update mass
     scalar mass1 = mass0 - sum(dMassPC);
-    scalar Cud = 0.0;
-    vector dUTrans = vector::zero;
+
+    // No additional forces
     vector Fx = vector::zero;
-    vector U1 = calcVelocity(td, dt, Fx, 0.5*(mass0 + mass1), Cud, dUTrans);
+
+    // Calculate new particle velocity
+    scalar Cud = 0.0;
+    vector U1 =
+        calcVelocity(td, dt, cellI, Fx, 0.5*(mass0 + mass1), Cud, dUTrans);
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // 4. Collect contributions to determine new particle thermo properties
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-    // Total enthalpy transfer from the particle to the carrier phase
-    scalar dhTrans = ShHT + ShPC;
-
-    // New specific heat capacity of mixture - using new temperature
-    scalar cp1 = td.cloud().composition().cp(0, Y_, pc_, T1);
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // 5. Accumulate carrier phase source terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Accumulate carrier phase source terms
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     if (td.cloud().coupled())
     {
         // Transfer mass lost from particle to carrier mass source
@@ -137,16 +139,15 @@ void Foam::ReactingParcel<ParcelType>::calc
         td.cloud().UCoeff()[cellI] += np0*mass0*Cud;
 
         // Update enthalpy transfer
-        td.cloud().hTrans()[cellI] += np0*dhTrans;
+        td.cloud().hTrans()[cellI] += np0*(dhTrans + ShPC);
 
         // Coefficient to be applied in carrier phase enthalpy coupling
         td.cloud().hCoeff()[cellI] += np0*htc*this->areaS();
     }
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // 6a. Remove the particle when mass falls below minimum threshold
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Remove the particle when mass falls below minimum threshold
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     if (mass1 < td.constProps().minParticleMass())
     {
         td.keepParticle = false;
@@ -159,18 +160,20 @@ void Foam::ReactingParcel<ParcelType>::calc
                 td.cloud().rhoTrans(i)[cellI] += np0*mass1*Y_[i];
             }
             td.cloud().UTrans()[cellI] += np0*mass1*U1;
-            scalar HEff = td.cloud().composition().H(0, YComponents, pc_, T1);
+            scalar HEff = td.cloud().composition().H(0, Y_, pc_, T1);
             td.cloud().hTrans()[cellI] += np0*mass1*HEff;
         }
     }
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // 6b. Set new particle properties
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+    // Set new particle properties
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
     else
     {
         this->U_ = U1;
         this->T_ = T1;
-        this->cp_ = cp1;
+        this->cp_ = td.cloud().composition().cp(0, Y_, pc_, T1);
 
         // Update particle density or diameter
         if (td.constProps().constantVolume())
@@ -195,7 +198,7 @@ Foam::scalar Foam::ReactingParcel<ParcelType>::calcPhaseChange
     const scalar T,
     const label idPhase,
     const scalar YPhase,
-    scalarField& YComponents,
+    const scalarField& YComponents,
     scalarList& dMass
 )
 {
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index 3e4a248006..cde36a297d 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -190,7 +190,7 @@ protected:
             const scalar T,
             const label idPhase,
             const scalar YPhase,
-	    const scalarField& YComponents,
+            const scalarField& YComponents,
             scalarList& dMass
         );
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
index b1ff448686..d8b999d0f5 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -53,7 +53,6 @@ void Foam::ThermoParcel<ParcelType>::calc
     const label cellI
 )
 {
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Define local properties at beginning of time step
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     const vector U0 = this->U_;
@@ -61,25 +60,37 @@ void Foam::ThermoParcel<ParcelType>::calc
     const scalar np0 = this->nParticle_;
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // 1. Calculate heat transfer - update T
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    scalar htc = 0.0;
-    scalar ShHT = 0.0;
-    const scalar T1 = calcHeatTransfer(td, dt, cellI, 0.0, htc, ShHT);
+    // Initialise transfer terms
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // 2. Calculate velocity - update U
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    scalar Cud = 0.0;
     vector dUTrans = vector::zero;
-    const vector U1 = calcVelocity(td, dt, vector::zero, Cud, mass0, dUTrans);
+    scalar dhTrans = 0.0;
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // 3. Accumulate carrier phase source terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Heat transfer
+    // ~~~~~~~~~~~~~
+
+    // No additional enthalpy sources
+    vector Sh = 0.0;
+
+    // Calculate new particle velocity
+    scalar htc = 0.0;
+    scalar T1 = calcHeatTransfer(td, dt, cellI, Sh, htc, dhTrans);
+
+
+    // Motion
+    // ~~~~~~
+
+    // No additional forces
+    vector Fx = vector::zero;
+
+    // Calculate new particle velocity
+    scalar Cud = 0.0;
+    vector U1 = calcVelocity(td, dt, cellI, Fx, Cud, mass0, dUTrans);
+
+
+    //  Accumulate carrier phase source terms
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     if (td.cloud().coupled())
     {
         // Update momentum transfer
@@ -89,16 +100,15 @@ void Foam::ThermoParcel<ParcelType>::calc
         td.cloud().UCoeff()[cellI] += np0*mass0*Cud;
 
         // Update enthalpy transfer
-        td.cloud().hTrans()[cellI] += np0*ShHT;
+        td.cloud().hTrans()[cellI] += np0*dhTrans;
 
         // Coefficient to be applied in carrier phase enthalpy coupling
         td.cloud().hCoeff()[cellI] += np0*htc*this->areaS();
     }
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // 5. Set new particle properties
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    this->U() = U1;
+    // Set new particle properties
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    this->U_ = U1;
     T_ = T1;
 }
 
@@ -118,7 +128,7 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
     if (!td.cloud().heatTransfer().active())
     {
         htc = 0.0;
-        dhTrans = 0.0;
+        ShHT = 0.0;
         return T_;
     }
 
@@ -134,7 +144,11 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
         this->muc_
     );
 
-    //- Assuming diameter = diameter at start of time step
+
+    // Set new particle temperature
+    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Assuming diameter = diameter at start of time step
     scalar Ap = this->areasS();
 
     // Determine ap and bp coefficients
@@ -161,7 +175,8 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
     IntegrationScheme<scalar>::integrationResult Tres =
         td.cloud().TIntegrator().integrate(T_, dt, ap, bp);
 
-    // Using average parcel temperature for enthalpy transfer calculation
+    // Enthalpy transfer
+    // - Using average particle temperature
     ShHT = dt*Ap*htc*(Tres.average() - Tc_);
 
     return Tres.value();
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
index fd33527bf5..584588d695 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
@@ -199,9 +199,6 @@ void Foam::LiquidEvaporation<CloudType>::calculate
     scalarList& dMass
 ) const
 {
-    // initialise total mass transferred from the particle to carrier phase
-    scalar dMassTot = 0.0;
-
     // construct carrier phase species volume fractions for cell, cellI
     scalarField Xc = calcXc(cellI);
 
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
index afe83f1baa..77cea7e00b 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
@@ -66,9 +66,9 @@ Foam::scalar Foam::ConstantRateDevolatilisation<CloudType>::calculate
     const scalar dt,
     const scalar mass0,
     const scalar mass,
-    const scalar YVolatile0,
-    const scalarField& YVolatile,
     const scalar T,
+    const scalar YVolatile0,
+    const scalar YVolatile,
     bool& canCombust
 ) const
 {
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
index 13abc8b2a9..a026bae9a9 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
@@ -93,9 +93,9 @@ public:
             const scalar dt,
             const scalar mass0,
             const scalar mass,
-            const scalar YVolatile0,
-            const scalarField& YVolatile,
             const scalar T,
+            const scalar YVolatile0,
+            const scalar YVolatile,
             bool& canCombust
         ) const;
 };
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
index 004482a040..bb4e7ddc63 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
@@ -135,9 +135,9 @@ public:
             const scalar dt,
             const scalar mass0,
             const scalar mass,
-            const scalarField& YMixture0,
-            const scalarField& YMixture,
             const scalar T,
+            const scalar YVolatile0,
+            const scalar YVolatile,
             bool& canCombust
         ) const = 0;
 };
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
index 9d7ff14749..c0431a61f3 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
@@ -61,8 +61,8 @@ Foam::scalar Foam::NoDevolatilisation<CloudType>::calculate
     const scalar,
     const scalar,
     const scalar,
-    const scalarField&,
-    const scalarField&,
+    const scalar,
+    const scalar,
     const scalar,
     bool& canCombust
 ) const
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
index 915547180a..4dbea82607 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
@@ -76,8 +76,8 @@ public:
             const scalar,
             const scalar,
             const scalar,
-            const scalarField&,
-            const scalarField&,
+            const scalar,
+            const scalar,
             const scalar,
             bool&
         ) const;
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
index 488e22978e..2d09c134a9 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
@@ -69,9 +69,9 @@ Foam::scalar Foam::SingleKineticRateDevolatilisation<CloudType>::calculate
     const scalar dt,
     const scalar mass0,
     const scalar mass,
-    const scalar YVolatile0,
-    const scalarField& YVolatile,
     const scalar T,
+    const scalar YVolatile0,
+    const scalar YVolatile,
     bool& canCombust
 ) const
 {
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
index 62873a77d7..91bd5f0612 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
@@ -95,9 +95,9 @@ public:
             const scalar dt,
             const scalar mass0,
             const scalar mass,
-            const scalar YVolatile0,
-            const scalarField& YVolatile,
             const scalar T,
+            const scalar YVolatile0,
+            const scalar YVolatile,
             bool& canCombust
         ) const;
 };
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C
index 8556282b9d..4b92bb38df 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C
@@ -56,27 +56,26 @@ bool Foam::NoSurfaceReaction<CloudType>::active() const
 
 
 template<class CloudType>
-void Foam::NoSurfaceReaction<CloudType>::calculate
+Foam::scalar Foam::NoSurfaceReaction<CloudType>::calculate
 (
-    const scalar dt,
-    const label celli,
-    const scalar dp,
-    const scalar T0,
-    const scalar T1,
-    const scalar Tc,
-    const scalar pc,
-    const scalar rhoc,
-    const scalar massp,
-    const scalarList& dMassMT,
-    scalarField& YGas,
-    scalarField& YLiquid,
-    scalarField& YSolid,
-    scalarField& YMixture,
-    scalarList& dMassSR,
-    scalar& dhRet
+    const scalar,
+    const label,
+    const scalar,
+    const scalar,
+    const scalar,
+    const scalar,
+    const scalar,
+    const scalar,
+    const scalarList&,
+    scalarField&,
+    scalarField&,
+    scalarField&,
+    scalarField&,
+    scalarList&
 ) const
 {
     // do nothing
+    return 0.0;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
index edb919a621..75b729baa7 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
@@ -74,24 +74,22 @@ public:
         virtual bool active() const;
 
         //- Update surface reactions
-        virtual void calculate
+        virtual scalar calculate
         (
             const scalar dt,
-            const label celli,
-            const scalar dp,
-            const scalar T0,
-            const scalar T1,
+            const label cellI,
+            const scalar d,
+            const scalar T,
             const scalar Tc,
             const scalar pc,
             const scalar rhoc,
-            const scalar massp,
+            const scalar mass,
             const scalarList& dMassMT,
             scalarField& YGas,
             scalarField& YLiquid,
             scalarField& YSolid,
             scalarField& YMixture,
-            scalarList& dMassSR,
-            scalar& dhRet
+            scalarList& dMassSRc
         ) const;
 };
 
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
index 6b4f5be31c..5bc62e89eb 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
@@ -132,24 +132,23 @@ public:
         virtual bool active() const = 0;
 
         //- Update surface reactions
-        virtual void calculate
+        //  Returns the heat of reaction
+        virtual scalar calculate
         (
             const scalar dt,
-            const label celli,
-            const scalar dp,
-            const scalar T0,
-            const scalar T1,
+            const label cellI,
+            const scalar d,
+            const scalar T,
             const scalar Tc,
             const scalar pc,
             const scalar rhoc,
-            const scalar massp,
+            const scalar mass,
             const scalarList& dMassMT,
             scalarField& YGas,
             scalarField& YLiquid,
             scalarField& YSolid,
             scalarField& YMixture,
-            scalarList& dMassSR,
-            scalar& dhRet
+            scalarList& dMassSRc
         ) const = 0;
 };
 

From 0612c15134ef545ec57ed0a3245725470f2c0505 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 17 Mar 2009 13:07:49 +0000
Subject: [PATCH 037/175] using scalarList for Y instead of scalarField

---
 .../ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C   | 2 +-
 .../parcels/Templates/ReactingParcel/ReactingParcel.H       | 6 +++---
 .../parcels/Templates/ReactingParcel/ReactingParcelI.H      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
index 61513ae783..9756082ae8 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
@@ -68,7 +68,7 @@ Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
         }
 
         // scale the mass fractions
-        const scalarField& YMix = this->Y_;
+        const scalarList& YMix = this->Y_;
         YGas_ /= YMix[0] + ROOTVSMALL;
         YLiquid_ /= YMix[1] + ROOTVSMALL;
         YSolid_ /= YMix[2] + ROOTVSMALL;
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index cde36a297d..bc38527efb 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -169,7 +169,7 @@ protected:
             scalar mass0_;
 
             //- Mass fractions of mixture []
-            scalarField Y_;
+            scalarList Y_;
 
 
         // Cell-based quantities
@@ -250,7 +250,7 @@ public:
             inline scalar mass0() const;
 
             //- Return const access to mass fractions of mixture
-            inline const scalarField& Y() const;
+            inline const scalarList& Y() const;
 
             //- Return the owner cell pressure
             inline scalar pc() const;
@@ -262,7 +262,7 @@ public:
             inline scalar& mass0();
 
             //- Return access to mass fractions of mixture
-            inline scalarField& Y();
+            inline scalarList& Y();
 
 
         // Main calculation loop
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
index 8c0d09e757..aeb38c9c5c 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
@@ -166,7 +166,7 @@ inline Foam::scalar Foam::ReactingParcel<ParcelType>::mass0() const
 
 
 template<class ParcelType>
-inline const Foam::scalarField& Foam::ReactingParcel<ParcelType>::Y() const
+inline const Foam::scalarList& Foam::ReactingParcel<ParcelType>::Y() const
 {
     return Y_;
 }
@@ -187,7 +187,7 @@ inline Foam::scalar& Foam::ReactingParcel<ParcelType>::mass0()
 
 
 template<class ParcelType>
-inline Foam::scalarField& Foam::ReactingParcel<ParcelType>::Y()
+inline Foam::scalarList& Foam::ReactingParcel<ParcelType>::Y()
 {
     return Y_;
 }

From 398849cd1d5ff35e08aa45ba646901ba9f4dd9ba Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 17 Mar 2009 18:21:16 +0000
Subject: [PATCH 038/175] updates for reacting parcels

---
 .../ReactingMultiphaseParcel.C                | 188 +++++++++++++-----
 .../ReactingMultiphaseParcel.H                |  45 ++++-
 .../ReactingMultiphaseParcelIO.C              |  18 +-
 .../Templates/ReactingParcel/ReactingParcel.C |   3 +-
 .../phaseProperties/phaseProperties.C         |  37 +++-
 .../phaseProperties/phaseProperties.H         |  11 +-
 .../phaseProperties/phasePropertiesIO.C       |   5 +-
 .../CompositionModel/CompositionModel.C       |  27 +++
 .../CompositionModel/CompositionModel.H       |   7 +
 .../NoSurfaceReaction/NoSurfaceReaction.C     |   5 +-
 .../NoSurfaceReaction/NoSurfaceReaction.H     |  13 +-
 .../SurfaceReactionModel.H                    |  13 +-
 12 files changed, 296 insertions(+), 76 deletions(-)

diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 8bcc94cef2..03a8c01aa6 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -26,6 +26,18 @@ License
 
 #include "ReactingMultiphaseParcel.H"
 
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<class ParcelType>
+const Foam::label Foam::ReactingMultiphaseParcel<ParcelType>::GAS(0);
+
+template<class ParcelType>
+const Foam::label Foam::ReactingMultiphaseParcel<ParcelType>::LIQUID(1);
+
+template<class ParcelType>
+const Foam::label Foam::ReactingMultiphaseParcel<ParcelType>::SOLID(2);
+
+
 // * * * * * * * * * * * *  Private Member Functions * * * * * * * * * * * * //
 
 template<class ParcelType>
@@ -34,13 +46,16 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::cpEff
 (
     TrackData& td,
     const scalar p,
-    const scalar T
+    const scalar T,
+    const label idG,
+    const label idL,
+    const label idS
 ) const
 {
     return
-        this->Y_[0]*td.cloud().composition().cp(0, YGas_, p, T)
-      + this->Y_[1]*td.cloud().composition().cp(0, YLiquid_, p, T)
-      + this->Y_[2]*td.cloud().composition().cp(0, YSolid_, p, T);
+        this->Y_[GAS]*td.cloud().composition().cp(idG, YGas_, p, T)
+      + this->Y_[LIQUID]*td.cloud().composition().cp(idL, YLiquid_, p, T)
+      + this->Y_[SOLID]*td.cloud().composition().cp(idS, YSolid_, p, T);
 }
 
 
@@ -50,13 +65,45 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::HEff
 (
     TrackData& td,
     const scalar p,
-    const scalar T
+    const scalar T,
+    const label idG,
+    const label idL,
+    const label idS
 ) const
 {
     return
-        this->Y_[0]*td.cloud().composition().H(0, YGas_, p, T)
-      + this->Y_[1]*td.cloud().composition().H(0, YLiquid_, p, T)
-      + this->Y_[2]*td.cloud().composition().H(0, YSolid_, p, T);
+        this->Y_[GAS]*td.cloud().composition().H(idG, YGas_, p, T)
+      + this->Y_[LIQUID]*td.cloud().composition().H(idL, YLiquid_, p, T)
+      + this->Y_[SOLID]*td.cloud().composition().H(idS, YSolid_, p, T);
+}
+
+
+template<class ParcelType>
+Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::updateMassFractions
+(
+    const scalar mass0,
+    const scalarField& dMassGas,
+    const scalarField& dMassLiquid,
+    const scalarField& dMassSolid
+)
+{
+    scalarList& YMix = this->Y_;
+
+    scalar dMassGasTot = sum(dMassGas);
+    scalar dMassLiquidTot = sum(dMassLiquid);
+    scalar dMassSolidTot = sum(dMassSolid);
+
+    this->updateMassFraction(mass0*YMix[GAS], dMassGas, YGas_);
+    this->updateMassFraction(mass0*YMix[LIQUID], dMassLiquid, YLiquid_);
+    this->updateMassFraction(mass0*YMix[SOLID], dMassSolid, YSolid_);
+
+    scalar massNew = mass0 - (dMassGasTot + dMassLiquidTot + dMassSolidTot);
+
+    YMix[GAS] = (mass0*YMix[GAS] - dMassGas)/massNew;
+    YMix[LIQUID] = (mass0*YMix[LIQUID] - dMassLiquid)/massNew;
+    YMix[SOLID] = 1.0 - YMix[GAS] - YMix[LIQUID];
+
+    return massNew;
 }
 
 
@@ -93,6 +140,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     scalarField& YMix = this->Y_;
     const label idG = td.cloud().composition().idGas();
     const label idL = td.cloud().composition().idLiquid();
+    const label idS = td.cloud().composition().idSolid();
 
 
     // Initialise transfer terms
@@ -105,13 +153,16 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     scalar dhTrans = 0.0;
 
     // Mass transfer due to phase change
-    scalarList dMassPC(td.cloud().gases().size(), 0.0);
+    scalarField dMassPC(YLiquid_.size(), 0.0);
 
     // Mass transfer due to devolatilisation
-    scalarList dMassDV(td.cloud().gases().size(), 0.0);
+    scalarField dMassDV(YGas_.size(), 0.0);
 
     // Change in carrier phase composition due to surface reactions
-    scalarList dMassSRc(td.cloud().gases().size(), 0.0);
+    scalarField dMassSRGas(YGas_.size(), 0.0);
+    scalarField dMassSRLiquid(YLiquid_.size(), 0.0);
+    scalarField dMassSRSolid(YSolid_.size(), 0.0);
+    scalarField dMassSRc(td.cloud().gases().size(), 0.0);
 
 
     // Phase change in liquid phase
@@ -121,26 +172,33 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     scalar ShPC =
         calcPhaseChange(td, dt, cellI, T0, idL, YMix[idL], YLiquid_, dMassPC);
 
-    // Update particle component mass fractions
-    this->updateMassFraction(mass0, dMassPC, YLiquid_);
-
 
     // Devolatilisation
     // ~~~~~~~~~~~~~~~~
 
     // Return enthalpy source and calc mass transfer due to devolatilisation
-    scalar ShDV = calcDevolatilisation(td, dt, T0, mass0, idG, YMix, dMassDV);
+    scalar ShDV =
+        calcDevolatilisation(td, dt, T0, mass0, idG, YMix, dMassDV);
 
 
     // Surface reactions
     // ~~~~~~~~~~~~~~~~~
 
-    // Mass transfer of volatile components from particle to carrier phase
-    const scalarList dMassMT = dMassPC + dMassDV;
-
     // Return enthalpy source and calc mass transfer(s) due to surface reaction
     scalar ShSR =
-        calcSurfaceReactions(td, dt, cellI, T0, dMassMT, dMassSRc, dhTrans);
+        calcSurfaceReactions
+        (
+            td,
+            dt,
+            cellI,
+            T0,
+            dMassPC + dMassDV, // total volatiles evolved
+            dMassSRGas,
+            dMassSRLiquid,
+            dMassSRSolid,
+            dMassSRc,
+            dhTrans
+        );
 
 
     // Heat transfer
@@ -154,12 +212,20 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     scalar T1 = calcHeatTransfer(td, dt, cellI, Sh, htc, dhTrans);
 
 
+    // Update component mass fractions
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    scalarField dMassGas = dMassDV + dMassSRGas;
+    scalarField dMassLiquid = dMassPC + dMassSRLiquid;
+    scalarField dMassSolid = dMassSRSolid;
+
+    scalar mass1 =
+        updateMassFractions(mass0, dMassGas, dMassLiquid, dMassSolid);
+
+
     // Motion
     // ~~~~~~
 
-    // Update mass (not to include cMassSR)
-    scalar mass1 = mass0 - sum(dMassPC) - sum(dMassDV);
-
     // No additional forces
     vector Fx = vector::zero;
 
@@ -175,10 +241,25 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     if (td.cloud().coupled())
     {
         // Transfer mass lost from particle to carrier mass source
-        forAll(dMassMT, i)
+        forAll(YGas_, i)
         {
-            td.cloud().rhoTrans(i)[cellI] +=
-                np0*(dMassPC[i] + dMassDV[i] + dMassSRc[i]);
+            label id = td.composition().localToGlobalGasId(GAS, i);
+            td.cloud().rhoTrans(id)[cellI] += np0*dMassGas[i];
+        }
+        forAll(YLiquid_, i)
+        {
+            label id = td.composition().localToGlobalGasId(LIQUID, i);
+            td.cloud().rhoTrans(id)[cellI] += np0*dMassLiquid[i];
+        }
+        // No mapping between solid components and carrier phase
+//        forAll(YSolid_, i)
+//        {
+//            label id = td.composition().localToGlobalGasId(SOLID, i);
+//            td.cloud().rhoTrans(id)[cellI] += np0*dMassSolid[i];
+//        }
+        forAll(dMassSRc, i)
+        {
+            td.cloud().rhoTrans(i)[cellI] += np0*dMassSRc[i];
         }
 
         // Update momentum transfer
@@ -203,13 +284,29 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     {
         td.keepParticle = false;
 
-        // Absorb particle(s) into carrier phase
-        forAll(dMassMT, i)
+        if (td.cloud().coupled())
         {
-            td.cloud().rhoTrans(i)[cellI] += np0*dMassMT[i];
+            // Absorb particle(s) into carrier phase
+            forAll(YGas_, i)
+            {
+                label id = td.composition().localToGlobalGasId(GAS, i);
+                td.cloud().rhoTrans(id)[cellI] += np0*dMassGas[i];
+            }
+            forAll(YLiquid_, i)
+            {
+                label id = td.composition().localToGlobalGasId(LIQUID, i);
+                td.cloud().rhoTrans(id)[cellI] += np0*dMassLiquid[i];
+            }
+            // No mapping between solid components and carrier phase
+//            forAll(YSolid_, i)
+//            {
+//                label id = td.composition().localToGlobalGasId(SOLID, i);
+//                td.cloud().rhoTrans(id)[cellI] += np0*dMassSolid[i];
+//            }
+
+            td.cloud().hTrans()[cellI] += np0*mass1*HEff(td, pc, T1, idG, idL, idS);
+            td.cloud().UTrans()[cellI] += np0*mass1*U1;
         }
-        td.cloud().hTrans()[cellI] += np0*mass1*HEff(td, pc, T1);
-        td.cloud().UTrans()[cellI] += np0*mass1*U1;
     }
 
 
@@ -220,7 +317,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     {
         this->U_ = U1;
         this->T_ = T1;
-        this->cp_ = cpEff(td, pc, T1);
+        this->cp_ = cpEff(td, pc, T1, idG, idL, idS);
 
         // Update particle density or diameter
         if (td.constProps().constantVolume())
@@ -244,8 +341,8 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
     const scalar T,
     const scalar mass,
     const label idVolatile,
-    scalarField& YMixture,
-    scalarList& dMassDV
+    const scalarField& YMixture,
+    scalarList& dMass
 )
 {
     // Check that model is active, and that the parcel temperature is
@@ -268,15 +365,10 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
         mass,
         T,
         td.cloud().composition().YMixture0()[idVolatile],
-        YMixture[0],
+        YMixture[GAS],
         canCombust_
     );
 
-    // Update (total) mass fractions
-    YMixture[0] = (YMixture[0]*mass - dMassTot)/(mass - dMassTot);
-    YMixture[1] = YMixture[1]*mass/(mass - dMassTot);
-    YMixture[2] = 1.0 - YMixture[0] - YMixture[1];
-
     // Add to cummulative mass transfer
     forAll (YGas_, i)
     {
@@ -284,7 +376,7 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
 
         // Volatiles mass transfer
         scalar volatileMass = YGas_[i]*dMassTot;
-        dMassDV[id] += volatileMass;
+        dMass[i] += volatileMass;
     }
 
     td.cloud().addToMassDevolatilisation(dMassTot);
@@ -301,7 +393,10 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
     const scalar dt,
     const label cellI,
     const scalar T,
-    const scalarList& dMassMT,
+    const scalarList& dMassVolatile,
+    scalarField& dMassSRGas,
+    scalarField& dMassSRLiquid,
+    scalarField& dMassSRSolid,
     scalarList& dMassSRc,
     scalar& dhTrans
 )
@@ -312,8 +407,7 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
         return;
     }
 
-    // Update mass transfer(s)
-    // - Also updates Y()'s
+    // Update surface reactions
     scalar HReaction = td.cloud().surfaceReaction().calculate
     (
         dt,
@@ -324,13 +418,15 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
         this->pc_,
         this->rhoc_,
         this->mass(),
-        dMassMT,
         YGas_,
         YLiquid_,
         YSolid_,
         this->Y_,
-        dMassSRc,
-        HReaction
+        dMassVolatile,
+        dMassSRGas,
+        dMassSRLiquid,
+        dMassSRSolid,
+        dMassSRc
     );
 
     // Heat of reaction divided between particle and carrier phase by the
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
index 35ff4f296b..e213ddace8 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -149,17 +149,49 @@ private:
 
         //- Return the mixture effective specific heat capacity
         template<class TrackData>
-        scalar cpEff(TrackData& td, const scalar p, const scalar T) const;
+        scalar cpEff
+        (
+            TrackData& td,
+            const scalar p,
+            const scalar T,
+            const label idG,
+            const label idL,
+            const label idS
+        ) const;
 
         //- Return the mixture effective enthalpy
         template<class TrackData>
-        scalar HEff(TrackData& td, const scalar p, const scalar T) const;
+        scalar HEff
+        (
+            TrackData& td,
+            const scalar p,
+            const scalar T,
+            const label idG,
+            const label idL,
+            const label idS
+        ) const;
+
+        //- Update the mass fractions (Y, YGas, YLiquid, YSolid)
+        scalar updateMassFractions
+        (
+            const scalar mass0,
+            const scalarField& dMassGas,
+            const scalarField& dMassLiquid,
+            const scalarField& dMassSolid
+        );
 
 
 protected:
 
     // Protected data
 
+        // IDs of phases in parent phase list
+
+            static const label GAS;
+            static const label LIQUID;
+            static const label SOLID;
+
+
         // Parcel properties
 
             //- Mass fractions of gases []
@@ -187,8 +219,8 @@ protected:
             const scalar T,
             const scalar mass,
             const label idVolatile,
-            scalarField& YMixture,
-            scalarList& dMassDV
+            const scalarField& YMixture,
+            scalarList& dMass
         );
 
         //- Calculate surface reactions
@@ -199,7 +231,10 @@ protected:
             const scalar dt,
             const label cellI,
             const scalar T,
-            const scalarList& dMassMT,
+            const scalarList& dMassVolatile,
+            scalarField& dMassSRGas,
+            scalarField& dMassSRLiquid,
+            scalarField& dMassSRSolid,
             scalarList& dMassSRc,
             scalar& dhTrans
         );
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
index 9756082ae8..cbb952181c 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
@@ -69,9 +69,9 @@ Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
 
         // scale the mass fractions
         const scalarList& YMix = this->Y_;
-        YGas_ /= YMix[0] + ROOTVSMALL;
-        YLiquid_ /= YMix[1] + ROOTVSMALL;
-        YSolid_ /= YMix[2] + ROOTVSMALL;
+        YGas_ /= YMix[GAS] + ROOTVSMALL;
+        YLiquid_ /= YMix[LIQUID] + ROOTVSMALL;
+        YSolid_ /= YMix[SOLID] + ROOTVSMALL;
     }
 
     // Check state of Istream
@@ -134,7 +134,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
         forAllIter(typename Cloud<ParcelType>, c, iter)
         {
             ReactingMultiphaseParcel<ParcelType>& p = iter();
-            p.YGas_[j] = YGas[i++]/(p.Y()[0] + ROOTVSMALL);
+            p.YGas_[j] = YGas[i++]/(p.Y()[GAS] + ROOTVSMALL);
         }
     }
     // Populate YLiquid for each parcel
@@ -153,7 +153,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
         forAllIter(typename Cloud<ParcelType>, c, iter)
         {
             ReactingMultiphaseParcel<ParcelType>& p = iter();
-            p.YLiquid_[j] = YLiquid[i++]/(p.Y()[1] + ROOTVSMALL);
+            p.YLiquid_[j] = YLiquid[i++]/(p.Y()[LIQUID] + ROOTVSMALL);
         }
     }
     // Populate YSolid for each parcel
@@ -172,7 +172,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
         forAllIter(typename Cloud<ParcelType>, c, iter)
         {
             ReactingMultiphaseParcel<ParcelType>& p = iter();
-            p.YSolid_[j] = YSolid[i++]/(p.Y()[2] + ROOTVSMALL);
+            p.YSolid_[j] = YSolid[i++]/(p.Y()[SOLID] + ROOTVSMALL);
         }
     }
 }
@@ -211,7 +211,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
             forAllConstIter(typename Cloud<ParcelType>, c, iter)
             {
                 const ReactingMultiphaseParcel<ParcelType>& p0 = iter();
-                YGas[i++] = p0.YGas()[j]*p0.Y()[0];
+                YGas[i++] = p0.YGas()[j]*p0.Y()[GAS];
             }
 
             YGas.write();
@@ -235,7 +235,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
             forAllConstIter(typename Cloud<ParcelType>, c, iter)
             {
                 const ReactingMultiphaseParcel<ParcelType>& p0 = iter();
-                YLiquid[i++] = p0.YLiquid()[j]*p0.Y()[1];
+                YLiquid[i++] = p0.YLiquid()[j]*p0.Y()[LIQUID];
             }
 
             YLiquid.write();
@@ -259,7 +259,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
             forAllConstIter(typename Cloud<ParcelType>, c, iter)
             {
                 const ReactingMultiphaseParcel<ParcelType>& p0 = iter();
-                YSolid[i++] = p0.YSolid()[j]*p0.Y()[2];
+                YSolid[i++] = p0.YSolid()[j]*p0.Y()[SOLID];
             }
 
             YSolid.write();
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index b751f5c9eb..4ff61b6602 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -157,7 +157,8 @@ void Foam::ReactingParcel<ParcelType>::calc
             // Absorb particle(s) into carrier phase
             forAll(Y_, i)
             {
-                td.cloud().rhoTrans(i)[cellI] += np0*mass1*Y_[i];
+                label id = td.composition().localToGlobalGasId(0, i);
+                td.cloud().rhoTrans(id)[cellI] += np0*mass1*Y_[i];
             }
             td.cloud().UTrans()[cellI] += np0*mass1*U1;
             scalar HEff = td.cloud().composition().H(0, Y_, pc_, T1);
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
index df2b1d9f6d..99d6fcfd0d 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
@@ -44,7 +44,7 @@ const Foam::NamedEnum<Foam::phaseProperties::phaseType, 4>
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::phaseProperties::setGlobalGasIds
+void Foam::phaseProperties::setGlobalIds
 (
     const PtrList<volScalarField>& YGas
 )
@@ -111,6 +111,27 @@ void Foam::phaseProperties::setGlobalIds(const wordList& globalNames)
 }
 
 
+void Foam::phaseProperties::setGlobalGasIds
+(
+    const PtrList<volScalarField>& YGas
+)
+{
+    forAll(names_, i)
+    {
+        forAll (YGas, j)
+        {
+            word specieName = YGas[j].name();
+
+            if (specieName == names_[i])
+            {
+                globalGasIds_[i] = j;
+                break;
+            }
+        }
+    }
+}
+
+
 void Foam::phaseProperties::checkTotalMassFraction() const
 {
     scalar total = 0.0;
@@ -209,17 +230,23 @@ void Foam::phaseProperties::initialiseGlobalIds
     {
         case GAS:
         {
-            setGlobalGasIds(YGas);
+            setGlobalIds(YGas);
+            forAll(globalGasIds_, i)
+            {
+                globalGasIds_[i] = globalIds_[i];
+            }
             break;
         }
         case LIQUID:
         {
             setGlobalIds(liquidNames);
+            setGlobalGasIds(YGas);
             break;
         }
         case SOLID:
         {
             setGlobalIds(solidNames);
+            setGlobalGasIds(YGas);
             break;
         }
         default:
@@ -330,6 +357,12 @@ const Foam::labelList& Foam::phaseProperties::globalIds() const
 }
 
 
+const Foam::labelList& Foam::phaseProperties::globalGasIds() const
+{
+    return globalGasIds_;
+}
+
+
 Foam::label Foam::phaseProperties::id(const word& cmptName) const
 {
     forAll(names_, cmptI)
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
index 139d2acc19..7e8b305143 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
@@ -88,15 +88,21 @@ private:
         //- Global ids
         labelList globalIds_;
 
+        //- Map to gas global id
+        labelList globalGasIds_;
+
 
     // Private member functions
 
         //- Set global ids - specialisation for carrier gas phases
-        void setGlobalGasIds(const PtrList<volScalarField>& YGas);
+        void setGlobalIds(const PtrList<volScalarField>& YGas);
 
         //- Set global ids - liquid and solid phases
         void setGlobalIds(const wordList& globalNames);
 
+        //- Set global gas ids - attempts to map component names to global gases
+        void setGlobalGasIds(const PtrList<volScalarField>& YGas);
+
         //- Check the total mass fraction
         void checkTotalMassFraction() const;
 
@@ -159,6 +165,9 @@ public:
             //- Return const acccess to the global ids
             const labelList& globalIds() const;
 
+            //- Return const acccess to the map to the gas global ids
+            const labelList& globalGasIds() const;
+
             //- Return the global id of a component in the local list by name
             //  Returns -1 if not found
             label globalId(const word& cmptName) const;
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
index b0c3937ea4..776a9b4d57 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
@@ -35,7 +35,8 @@ Foam::phaseProperties::phaseProperties(Istream& is)
     stateLabel_("(unknown)"),
     names_(0),
     Y_(0),
-    globalIds_(0)
+    globalIds_(0),
+    globalGasIds_(0)
 {
     is.check("Foam::phaseProperties::phaseProperties(Istream& is)");
 
@@ -66,6 +67,7 @@ Foam::phaseProperties::phaseProperties(Istream& is)
 
     // initialise global ids to -1
     globalIds_.setSize(nComponents, -1);
+    globalGasIds_.setSize(nComponents, -1);
 
     checkTotalMassFraction();
 }
@@ -110,6 +112,7 @@ Foam::Istream& Foam::operator>>(Istream& is, phaseProperties& pp)
 
     // initialise global ids to -1
     pp.globalIds_.setSize(nComponents, -1);
+    pp.globalGasIds_.setSize(nComponents, -1);
 
     pp.checkTotalMassFraction();
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
index 36fd93c451..4bc06eaf84 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
@@ -240,6 +240,33 @@ Foam::label Foam::CompositionModel<CloudType>::localId
 }
 
 
+template<class CloudType>
+Foam::label Foam::CompositionModel<CloudType>::localToGlobalGaslId
+(
+    const label phaseI,
+    const label id
+) const
+{
+    label gid = phaseProps_[phaseI].globalGasIds()[id];
+
+    if (gid < 0)
+    {
+        FatalErrorIn
+        (
+            "Foam::label Foam::CompositionModel<CloudType>::localToGlobalGasId"
+            "("
+                "const label, "
+                "const label"
+            ") const"
+        )   << "Unable to determine global gas id for phase "
+            << phaseI << " with local id " << id
+            << nl << abort(FatalError);
+    }
+
+    return id;
+}
+
+
 template<class CloudType>
 const Foam::scalarField& Foam::CompositionModel<CloudType>::Y0
 (
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
index c5382a4f9f..fc01732314 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
@@ -187,6 +187,13 @@ public:
                 //- Return local id of component cmptName in phase phaseI
                 label localId(const label phaseI, const word& cmptName) const;
 
+                //- Return global gas id of component given local id
+                label localToGlobalGaslId
+                (
+                    const label phaseI,
+                    const label id
+                ) const;
+
                 //- Return the list of phase phaseI mass fractions
                 const scalarField& Y0(const label phaseI) const;
 
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C
index 4b92bb38df..0630158e28 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C
@@ -66,8 +66,11 @@ Foam::scalar Foam::NoSurfaceReaction<CloudType>::calculate
     const scalar,
     const scalar,
     const scalar,
+    const scalarField&,
+    const scalarField&,
+    const scalarField&,
+    const scalarList&,
     const scalarList&,
-    scalarField&,
     scalarField&,
     scalarField&,
     scalarField&,
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
index 75b729baa7..505902f8c8 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
@@ -84,11 +84,14 @@ public:
             const scalar pc,
             const scalar rhoc,
             const scalar mass,
-            const scalarList& dMassMT,
-            scalarField& YGas,
-            scalarField& YLiquid,
-            scalarField& YSolid,
-            scalarField& YMixture,
+            const scalarField& YGas,
+            const scalarField& YLiquid,
+            const scalarField& YSolid,
+            const scalarList& YMixture,
+            const scalarList& dMassVolatile,
+            scalarField& dMassGas,
+            scalarField& dMassLiquid,
+            scalarField& dMassSolid,
             scalarList& dMassSRc
         ) const;
 };
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
index 5bc62e89eb..1a3b664d4a 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
@@ -143,11 +143,14 @@ public:
             const scalar pc,
             const scalar rhoc,
             const scalar mass,
-            const scalarList& dMassMT,
-            scalarField& YGas,
-            scalarField& YLiquid,
-            scalarField& YSolid,
-            scalarField& YMixture,
+            const scalarField& YGas,
+            const scalarField& YLiquid,
+            const scalarField& YSolid,
+            const scalarList& YMixture,
+            const scalarList& dMassVolatile,
+            scalarField& dMassGas,
+            scalarField& dMassLiquid,
+            scalarField& dMassSolid,
             scalarList& dMassSRc
         ) const = 0;
 };

From e534882f5aed12fa5e2592babd55c915e26d5ad5 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 17 Mar 2009 18:33:27 +0000
Subject: [PATCH 039/175] adding warning messages

---
 .../Templates/KinematicParcel/KinematicParcel.C     | 13 +++++++++++++
 .../Templates/ReactingParcel/ReactingParcel.C       | 12 ++++++++++++
 .../parcels/Templates/ThermoParcel/ThermoParcel.C   | 13 +++++++++++++
 3 files changed, 38 insertions(+)

diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index 637bf15fa4..a6a3865ba1 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -39,6 +39,19 @@ void Foam::KinematicParcel<ParcelType>::updateCellQuantities
 )
 {
     rhoc_ = td.rhoInterp().interpolate(this->position(), cellI);
+    if (rhoc_ < SMALL)
+    {
+        WarningIn
+        (
+            "void Foam::KinematicParcel<ParcelType>::updateCellQuantities"
+            "("
+                "TrackData&, "
+                "const scalar, "
+                "const label"
+            ")"
+        )   << "Density < " << SMALL << " in cell " << cellI << nl << endl;
+    }
+
     Uc_ = td.UInterp().interpolate(this->position(), cellI);
     muc_ = td.muInterp().interpolate(this->position(), cellI);
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index 4ff61b6602..8b59c5017a 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -40,6 +40,18 @@ void Foam::ReactingParcel<ParcelType>::updateCellQuantities
     ThermoParcel<ParcelType>::updateCellQuantities(td, dt, cellI);
 
     pc_ = td.pInterp().interpolate(this->position(), cellI);
+    if (pc_ < SMALL)
+    {
+        WarningIn
+        (
+            "void Foam::ReactingParcel<ParcelType>::updateCellQuantities"
+            "("
+                "TrackData&, "
+                "const scalar, "
+                "const label"
+            ")"
+        )   << "Pressure < " << SMALL << " in cell " << cellI << nl << endl;
+    }
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
index d8b999d0f5..b22a8e57e6 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -40,6 +40,19 @@ void Foam::ThermoParcel<ParcelType>::updateCellQuantities
     KinematicParcel<ParcelType>::updateCellQuantities(td, dt, cellI);
 
     Tc_ = td.TInterp().interpolate(this->position(), cellI);
+    if (Tc_ < SMALL)
+    {
+        WarningIn
+        (
+            "void Foam::ThermoParcel<ParcelType>::updateCellQuantities"
+            "("
+                "TrackData&, "
+                "const scalar, "
+                "const label"
+            ")"
+        )   << "Temperature < " << SMALL << " in cell " << cellI << nl << endl;
+    }
+
     cpc_ = td.cpInterp().interpolate(this->position(), cellI);
 }
 

From 81564961bed98a31c4353ac5dc869d828177d3e1 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 17 Mar 2009 19:13:41 +0000
Subject: [PATCH 040/175] tidying up + using composition model functions for
 species ids

---
 .../ReactingMultiphaseParcel.C                | 38 +++++++----
 .../ReactingMultiphaseParcel.H                | 15 ++---
 .../Templates/ReactingParcel/ReactingParcel.C |  2 +-
 .../Templates/ThermoParcel/ThermoParcel.C     |  5 +-
 .../LiquidEvaporation/LiquidEvaporation.C     | 67 ++-----------------
 .../LiquidEvaporation/LiquidEvaporation.H     |  3 -
 .../NoSurfaceReaction/NoSurfaceReaction.H     |  2 +-
 .../SurfaceReactionModel.H                    |  2 +-
 .../RanzMarshall/RanzMarshall.C               |  2 +-
 9 files changed, 43 insertions(+), 93 deletions(-)

diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 03a8c01aa6..aacd51f04a 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -162,7 +162,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     scalarField dMassSRGas(YGas_.size(), 0.0);
     scalarField dMassSRLiquid(YLiquid_.size(), 0.0);
     scalarField dMassSRSolid(YSolid_.size(), 0.0);
-    scalarField dMassSRc(td.cloud().gases().size(), 0.0);
+    scalarField dMassSRCarrier(td.cloud().gases().size(), 0.0);
 
 
     // Phase change in liquid phase
@@ -177,8 +177,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     // ~~~~~~~~~~~~~~~~
 
     // Return enthalpy source and calc mass transfer due to devolatilisation
-    scalar ShDV =
-        calcDevolatilisation(td, dt, T0, mass0, idG, YMix, dMassDV);
+    scalar ShDV = calcDevolatilisation(td, dt, T0, mass0, idG, YMix, dMassDV);
 
 
     // Surface reactions
@@ -196,7 +195,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
             dMassSRGas,
             dMassSRLiquid,
             dMassSRSolid,
-            dMassSRc,
+            dMassSRCarrier,
             dhTrans
         );
 
@@ -257,9 +256,9 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
 //            label id = td.composition().localToGlobalGasId(SOLID, i);
 //            td.cloud().rhoTrans(id)[cellI] += np0*dMassSolid[i];
 //        }
-        forAll(dMassSRc, i)
+        forAll(dMassSRCarrier, i)
         {
-            td.cloud().rhoTrans(i)[cellI] += np0*dMassSRc[i];
+            td.cloud().rhoTrans(i)[cellI] += np0*dMassSRCarrier[i];
         }
 
         // Update momentum transfer
@@ -270,7 +269,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
 
         // Update enthalpy transfer
         // - enthalpy of lost solids already accounted for
-        td.cloud().hTrans()[cellI] += np0*dhTrans;
+        td.cloud().hTrans()[cellI] += np0*(dhTrans + Sh);
 
         // Coefficient to be applied in carrier phase enthalpy coupling
         td.cloud().hCoeff()[cellI] += np0*htc*this->areaS();
@@ -286,25 +285,36 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
 
         if (td.cloud().coupled())
         {
-            // Absorb particle(s) into carrier phase
+            // Absorb parcel into carrier phase
             forAll(YGas_, i)
             {
                 label id = td.composition().localToGlobalGasId(GAS, i);
-                td.cloud().rhoTrans(id)[cellI] += np0*dMassGas[i];
+                td.cloud().rhoTrans(id)[cellI] += np0*mass1*YMix[GAS]*YGas_[i];
             }
             forAll(YLiquid_, i)
             {
                 label id = td.composition().localToGlobalGasId(LIQUID, i);
-                td.cloud().rhoTrans(id)[cellI] += np0*dMassLiquid[i];
+                td.cloud().rhoTrans(id)[cellI] +=
+                    np0
+                   *mass1
+                   *YMix[LIQUID]
+                   *YLiquid_[i];
             }
             // No mapping between solid components and carrier phase
 //            forAll(YSolid_, i)
 //            {
 //                label id = td.composition().localToGlobalGasId(SOLID, i);
-//                td.cloud().rhoTrans(id)[cellI] += np0*dMassSolid[i];
+//                td.cloud().rhoTrans(id)[cellI] +=
+//                    np0
+//                   *mass1
+//                   *YMix[SOLID]
+//                   *YSolid_[i];
 //            }
 
-            td.cloud().hTrans()[cellI] += np0*mass1*HEff(td, pc, T1, idG, idL, idS);
+            td.cloud().hTrans()[cellI] +=
+                np0
+               *mass1
+               *HEff(td, pc, T1, idG, idL, idS);
             td.cloud().UTrans()[cellI] += np0*mass1*U1;
         }
     }
@@ -397,7 +407,7 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
     scalarField& dMassSRGas,
     scalarField& dMassSRLiquid,
     scalarField& dMassSRSolid,
-    scalarList& dMassSRc,
+    scalarList& dMassSRCarrier,
     scalar& dhTrans
 )
 {
@@ -426,7 +436,7 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
         dMassSRGas,
         dMassSRLiquid,
         dMassSRSolid,
-        dMassSRc
+        dMassSRCarrier
     );
 
     // Heat of reaction divided between particle and carrier phase by the
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
index e213ddace8..58e2ef60dc 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -66,9 +66,15 @@ class ReactingMultiphaseParcel
 :
     public ReactingParcel<ParcelType>
 {
-
 public:
 
+    // IDs of phases in ReacingParcel phase list (Y)
+
+        static const label GAS;
+        static const label LIQUID;
+        static const label SOLID;
+
+
     //- Class to hold reacting particle constant properties
     class constantProperties
     :
@@ -185,13 +191,6 @@ protected:
 
     // Protected data
 
-        // IDs of phases in parent phase list
-
-            static const label GAS;
-            static const label LIQUID;
-            static const label SOLID;
-
-
         // Parcel properties
 
             //- Mass fractions of gases []
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index 8b59c5017a..676e0f10b2 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -166,7 +166,7 @@ void Foam::ReactingParcel<ParcelType>::calc
 
         if (td.cloud().coupled())
         {
-            // Absorb particle(s) into carrier phase
+            // Absorb parcel into carrier phase
             forAll(Y_, i)
             {
                 label id = td.composition().localToGlobalGasId(0, i);
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
index b22a8e57e6..276fcd0b59 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -135,13 +135,12 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
     const label cellI,
     const scalar Sh,
     scalar& htc,
-    scalar& ShHT
+    scalar& dhTrans
 )
 {
     if (!td.cloud().heatTransfer().active())
     {
         htc = 0.0;
-        ShHT = 0.0;
         return T_;
     }
 
@@ -190,7 +189,7 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
 
     // Enthalpy transfer
     // - Using average particle temperature
-    ShHT = dt*Ap*htc*(Tres.average() - Tc_);
+    dhTrans = dt*Ap*htc*(Tres.average() - Tc_);
 
     return Tres.value();
 }
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
index 584588d695..830c4d7f1d 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
@@ -29,44 +29,6 @@ License
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-template <class CloudType>
-Foam::label Foam::LiquidEvaporation<CloudType>::carrierSpecieId
-(
-    const word& specieName
-) const
-{
-    forAll (this->owner().carrierThermo().composition().Y(), i)
-    {
-        if
-        (
-            this->owner().carrierThermo().composition().Y()[i].name()
-         == specieName
-        )
-        {
-            return i;
-        }
-    }
-
-    wordList species(this->owner().carrierThermo().composition().Y().size());
-    forAll (this->owner().carrierThermo().composition().Y(), i)
-    {
-        species[i] = this->owner().carrierThermo().composition().Y()[i].name();
-    }
-
-    FatalErrorIn
-    (
-        "Foam::label Foam::LiquidEvaporation<CloudType>::carrierSpecieId"
-        "("
-            "const word&"
-        ") const"
-    )   << "Could not find " << specieName << " in species list" << nl
-        <<  "Avialable species:" << nl << species
-        << nl << exit(FatalError);
-
-    return -1;
-}
-
-
 template<class CloudType>
 Foam::scalarField Foam::LiquidEvaporation<CloudType>::calcXc
 (
@@ -136,35 +98,18 @@ Foam::LiquidEvaporation<CloudType>::LiquidEvaporation
     }
 
     // Determine mapping between liquid and carrier phase species
+    label idLiquid = owner.composition().idLiquid();
     forAll(activeLiquids_, i)
     {
-        liqToGasMap_[i] = carrierSpecieId(activeLiquids_[i]);
+        liqToGasMap_[i] =
+            owner.composition().globalId(idLiquid, activeLiquids_[i]);
     }
 
     // Determine mapping between local and global liquids
     forAll(activeLiquids_, i)
     {
-        forAll(liquids_->components(), j)
-        {
-            if (liquids_->components()[j] == activeLiquids_[i])
-            {
-                liqToLiqMap_[i] = j;
-            }
-        }
-
-        if (liqToLiqMap_[i] < 0)
-        {
-            FatalErrorIn
-            (
-                "Foam::LiquidEvaporation<CloudType>::LiquidEvaporation"
-                "("
-                    "const dictionary& dict, "
-                    "CloudType& owner"
-                ")"
-            )   << "Unable to find liquid species " << activeLiquids_[i]
-                << " in global liquids list. Avaliable liquids:" << nl
-                << liquids_->components() << nl << exit(FatalError);
-        }
+        liqToLiqMap_[i] =
+            owner.composition().localId(idLiquid, activeLiquids_[i]);
     }
 }
 
@@ -239,7 +184,7 @@ void Foam::LiquidEvaporation<CloudType>::calculate
         scalar Ni = max(kc*(Cs - Cinf), 0.0);
 
         // mass transfer [kg]
-        dMass[gid] += Ni*A*liquids_->properties()[lid].W()*dt;
+        dMass[lid] += Ni*A*liquids_->properties()[lid].W()*dt;
     }
 }
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
index 0aa6953521..c70c081e90 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
@@ -68,9 +68,6 @@ protected:
 
     // Protected member functions
 
-        //- Return the id of species specieName in the carrier phase
-        label carrierSpecieId(const word& specieName) const;
-
         //- Sherwood number as a function of Reynolds and Schmidt numbers
         scalar Sh(const scalar Re, const scalar Sc) const;
 
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
index 505902f8c8..6566f60456 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
@@ -92,7 +92,7 @@ public:
             scalarField& dMassGas,
             scalarField& dMassLiquid,
             scalarField& dMassSolid,
-            scalarList& dMassSRc
+            scalarList& dMassSRCarrier
         ) const;
 };
 
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
index 1a3b664d4a..269c37de37 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
@@ -151,7 +151,7 @@ public:
             scalarField& dMassGas,
             scalarField& dMassLiquid,
             scalarField& dMassSolid,
-            scalarList& dMassSRc
+            scalarList& dMassSRCarrier
         ) const = 0;
 };
 
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.C
index 3cfe1f712c..b728282001 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.C
@@ -65,7 +65,7 @@ Foam::scalar Foam::RanzMarshall<CloudType>::Nu
     const scalar Pr
 ) const
 {
-    return 2.0 + 0.6*pow(Re, 1.0/2.0)*pow(Pr, 1.0/3.0);
+    return 2.0 + 0.6*pow(Re, 0.5)*pow(Pr, 0.333);
 }
 
 

From 0d0e364f41357fdb40fd4dd89eadfbaa223ad0c7 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 23 Mar 2009 16:43:14 +0000
Subject: [PATCH 041/175] converted entrainment injection into field activated
 injection

---
 .../makeBasicKinematicParcelInjectionModels.C |  4 +-
 ...cReactingMultiphaseParcelInjectionModels.C |  4 +-
 .../makeBasicReactingParcelInjectionModels.C  |  4 +-
 .../makeBasicThermoParcelInjectionModels.C    |  4 +-
 .../FieldActivatedInjection.C}                | 45 +++++++++----------
 .../FieldActivatedInjection.H}                | 45 ++++++++-----------
 6 files changed, 47 insertions(+), 59 deletions(-)
 rename src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/{EntrainmentInjection/EntrainmentInjection.C => FieldActivatedInjection/FieldActivatedInjection.C} (81%)
 mode change 100755 => 100644
 rename src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/{EntrainmentInjection/EntrainmentInjection.H => FieldActivatedInjection/FieldActivatedInjection.H} (83%)
 mode change 100755 => 100644

diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/submodels/makeBasicKinematicParcelInjectionModels.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/submodels/makeBasicKinematicParcelInjectionModels.C
index ca6eea491e..272ea3e06d 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/submodels/makeBasicKinematicParcelInjectionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/submodels/makeBasicKinematicParcelInjectionModels.C
@@ -28,7 +28,7 @@ License
 #include "KinematicCloud.H"
 
 #include "ConeInjection.H"
-#include "EntrainmentInjection.H"
+#include "FieldActivatedInjection.H"
 #include "ManualInjection.H"
 #include "NoInjection.H"
 
@@ -47,7 +47,7 @@ namespace Foam
     );
     makeInjectionModelType
     (
-        EntrainmentInjection,
+        FieldActivatedInjection,
         KinematicCloud,
         basicKinematicParcel
     );
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelInjectionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelInjectionModels.C
index 38b738d924..6b427ae7c2 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelInjectionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelInjectionModels.C
@@ -28,7 +28,7 @@ License
 #include "ReactingCloud.H"
 
 #include "ConeInjection.H"
-#include "EntrainmentInjection.H"
+#include "FieldActivatedInjection.H"
 #include "ManualInjection.H"
 #include "NoInjection.H"
 
@@ -47,7 +47,7 @@ namespace Foam
     );
     makeInjectionModelType
     (
-        EntrainmentInjection,
+        FieldActivatedInjection,
         KinematicCloud,
         basicReactingMultiphaseParcel
     );
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelInjectionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelInjectionModels.C
index b5a7e83610..4ed4e7894a 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelInjectionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelInjectionModels.C
@@ -28,7 +28,7 @@ License
 #include "ReactingCloud.H"
 
 #include "ConeInjection.H"
-#include "EntrainmentInjection.H"
+#include "FieldActivatedInjection.H"
 #include "ManualInjection.H"
 #include "NoInjection.H"
 
@@ -47,7 +47,7 @@ namespace Foam
     );
     makeInjectionModelType
     (
-        EntrainmentInjection,
+        FieldActivatedInjection,
         KinematicCloud,
         basicReactingParcel
     );
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelInjectionModels.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelInjectionModels.C
index feb948d66c..2bf6f2e1b3 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelInjectionModels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelInjectionModels.C
@@ -28,7 +28,7 @@ License
 #include "ThermoCloud.H"
 
 #include "ConeInjection.H"
-#include "EntrainmentInjection.H"
+#include "FieldActivatedInjection.H"
 #include "ManualInjection.H"
 #include "NoInjection.H"
 
@@ -48,7 +48,7 @@ namespace Foam
     );
     makeInjectionModelType
     (
-        EntrainmentInjection,
+        FieldActivatedInjection,
         KinematicCloud,
         basicThermoParcel
     );
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/EntrainmentInjection/EntrainmentInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
old mode 100755
new mode 100644
similarity index 81%
rename from src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/EntrainmentInjection/EntrainmentInjection.C
rename to src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
index 758a14ee33..b6662e0c92
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/EntrainmentInjection/EntrainmentInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
@@ -24,13 +24,13 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "EntrainmentInjection.H"
+#include "FieldActivatedInjection.H"
 #include "volFields.H"
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::label Foam::EntrainmentInjection<CloudType>::parcelsToInject
+Foam::label Foam::FieldActivatedInjection<CloudType>::parcelsToInject
 (
     const scalar time0,
     const scalar time1
@@ -48,7 +48,7 @@ Foam::label Foam::EntrainmentInjection<CloudType>::parcelsToInject
 
 
 template<class CloudType>
-Foam::scalar Foam::EntrainmentInjection<CloudType>::volumeToInject
+Foam::scalar Foam::FieldActivatedInjection<CloudType>::volumeToInject
 (
     const scalar time0,
     const scalar time1
@@ -68,33 +68,25 @@ Foam::scalar Foam::EntrainmentInjection<CloudType>::volumeToInject
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::EntrainmentInjection<CloudType>::EntrainmentInjection
+Foam::FieldActivatedInjection<CloudType>::FieldActivatedInjection
 (
     const dictionary& dict,
     CloudType& owner
 )
 :
     InjectionModel<CloudType>(dict, owner, typeName),
-    c_(readScalar(this->coeffDict().lookup("c"))),
-    rhoc_
+    referenceField_
     (
         owner.db().objectRegistry::lookupObject<volScalarField>
         (
-            this->coeffDict().lookup("rhoc")
+            this->coeffDict().lookup("referenceField")
         )
     ),
-    rhol_
+    thresholdField_
     (
         owner.db().objectRegistry::lookupObject<volScalarField>
         (
-            this->coeffDict().lookup("rhol")
-        )
-    ),
-    Uc_
-    (
-        owner.db().objectRegistry::lookupObject<volVectorField>
-        (
-            this->coeffDict().lookup("Uc")
+            this->coeffDict().lookup("thresholdField")
         )
     ),
     positionsFile_(this->coeffDict().lookup("positionsFile")),
@@ -153,28 +145,28 @@ Foam::EntrainmentInjection<CloudType>::EntrainmentInjection
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::EntrainmentInjection<CloudType>::~EntrainmentInjection()
+Foam::FieldActivatedInjection<CloudType>::~FieldActivatedInjection()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CloudType>
-bool Foam::EntrainmentInjection<CloudType>::active() const
+bool Foam::FieldActivatedInjection<CloudType>::active() const
 {
     return true;
 }
 
 
 template<class CloudType>
-Foam::scalar Foam::EntrainmentInjection<CloudType>::timeEnd() const
+Foam::scalar Foam::FieldActivatedInjection<CloudType>::timeEnd() const
 {
     return GREAT;
 }
 
 
 template<class CloudType>
-void Foam::EntrainmentInjection<CloudType>::setPositionAndCell
+void Foam::FieldActivatedInjection<CloudType>::setPositionAndCell
 (
     const label parcelI,
     const scalar,
@@ -188,7 +180,7 @@ void Foam::EntrainmentInjection<CloudType>::setPositionAndCell
 
 
 template<class CloudType>
-Foam::vector Foam::EntrainmentInjection<CloudType>::velocity
+Foam::vector Foam::FieldActivatedInjection<CloudType>::velocity
 (
     const label,
     const scalar
@@ -199,7 +191,7 @@ Foam::vector Foam::EntrainmentInjection<CloudType>::velocity
 
 
 template<class CloudType>
-Foam::scalar Foam::EntrainmentInjection<CloudType>::d0
+Foam::scalar Foam::FieldActivatedInjection<CloudType>::d0
 (
     const label parcelI,
     const scalar
@@ -210,14 +202,17 @@ Foam::scalar Foam::EntrainmentInjection<CloudType>::d0
 
 
 template<class CloudType>
-bool Foam::EntrainmentInjection<CloudType>::validInjection(const label parcelI)
+bool Foam::FieldActivatedInjection<CloudType>::validInjection
+(
+    const label parcelI
+)
 {
-
     const label cellI = injectorCells_[parcelI];
+
     if
     (
          nParcelsInjected_[parcelI] < nParcelsPerInjector_
-      && rhol_[cellI] < c_*0.5*rhoc_[cellI]*magSqr(Uc_[cellI])
+      && referenceField_[cellI] > thresholdField_[cellI]
     )
     {
         nParcelsInjected_[parcelI]++;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/EntrainmentInjection/EntrainmentInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
old mode 100755
new mode 100644
similarity index 83%
rename from src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/EntrainmentInjection/EntrainmentInjection.H
rename to src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
index 9a82c46aaa..e82074bc6b
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/EntrainmentInjection/EntrainmentInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
@@ -23,27 +23,26 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::EntrainmentInjection
+    Foam::FieldActivatedInjection
 
 Description
     Injection at specified positions, with the condition that for injection
     to be allowed
 
-        rhol <= c_*0.5*rhoc*|Uc|^2
+        referenceField[cellI] >= thresholdField[cellI]
 
     where:
-      - rhol is the effective density (of all clouds)
-      - c_ is a modelling constant [s2/m2]
-      - rhoc is the carrier phase density
-      - Uc is the carrier phase velocity
+      - referenceField is the field used to supply the look-up values
+      - thresholdField supplies the values beyond which the injection is
+        permitted
 
 SourceFiles
-    EntrainmentInjection.C
+    FieldActivatedInjection.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef EntrainmentInjection_H
-#define EntrainmentInjection_H
+#ifndef FieldActivatedInjection_H
+#define FieldActivatedInjection_H
 
 #include "InjectionModel.H"
 #include "pdf.H"
@@ -55,11 +54,11 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                    Class EntrainmentInjection Declaration
+                    Class FieldActivatedInjection Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class CloudType>
-class EntrainmentInjection
+class FieldActivatedInjection
 :
     public InjectionModel<CloudType>
 {
@@ -67,17 +66,11 @@ class EntrainmentInjection
 
         // Model parameters
 
-            //- Modelling constant
-            const scalar c_;
+            //- Reference field
+            const volScalarField& referenceField_;
 
-            //- Carrier phase density field
-            const volScalarField& rhoc_;
-
-            //- Lagrangian phase density field
-            const scalarField& rhol_;
-
-            //- Carrier phase velocity field
-            const vectorField& Uc_;
+            //- Threshold field
+            const volScalarField& thresholdField_;
 
 
         // Injector properties
@@ -91,7 +84,7 @@ class EntrainmentInjection
             //- Field of cell labels corresoponding to injector positions
             labelField injectorCells_;
 
-            //- nParcels per injector
+            //- Number of parcels per injector
             const label nParcelsPerInjector_;
 
             //- Field of number of parcels injected for each injector
@@ -132,13 +125,13 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("EntrainmentInjection");
+    TypeName("FieldActivatedInjection");
 
 
     // Constructors
 
         //- Construct from dictionary
-        EntrainmentInjection
+        FieldActivatedInjection
         (
             const dictionary& dict,
             CloudType& owner
@@ -146,7 +139,7 @@ public:
 
 
     // Destructor
-    virtual ~EntrainmentInjection();
+    virtual ~FieldActivatedInjection();
 
 
     // Member Functions
@@ -196,7 +189,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "EntrainmentInjection.C"
+#   include "FieldActivatedInjection.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

From 7df6b6adffc6da49fe7722f97503430b3b39faf6 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 23 Mar 2009 17:43:49 +0000
Subject: [PATCH 042/175] tidying

---
 .../Templates/KinematicParcel/KinematicParcel.C  | 16 +++-------------
 .../IO/DataEntry/polynomial/polynomial.H         |  2 ++
 .../DispersionModel/NoDispersion/NoDispersion.C  | 10 +++++-----
 .../Kinematic/DragModel/NoDrag/NoDrag.C          | 11 ++---------
 .../Kinematic/DragModel/SphereDrag/SphereDrag.C  |  5 +----
 .../InjectionModel/ConeInjection/ConeInjection.C |  1 +
 6 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index a6a3865ba1..70adc771b1 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -178,10 +178,7 @@ const Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
 
 template<class ParcelType>
 template<class TrackData>
-bool Foam::KinematicParcel<ParcelType>::move
-(
-    TrackData& td
-)
+bool Foam::KinematicParcel<ParcelType>::move(TrackData& td)
 {
     ParcelType& p = static_cast<ParcelType&>(*this);
 
@@ -289,19 +286,12 @@ void Foam::KinematicParcel<ParcelType>::hitPatch
 
 
 template<class ParcelType>
-void Foam::KinematicParcel<ParcelType>::hitPatch
-(
-    const polyPatch&,
-    int&
-)
+void Foam::KinematicParcel<ParcelType>::hitPatch(const polyPatch&, int&)
 {}
 
 
 template<class ParcelType>
-void Foam::KinematicParcel<ParcelType>::transformProperties
-(
-    const tensor& T
-)
+void Foam::KinematicParcel<ParcelType>::transformProperties(const tensor& T)
 {
     Particle<ParcelType>::transformProperties(T);
     U_ = transform(T, U_);
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
index 3787cf69ac..f405b9c54e 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
@@ -54,8 +54,10 @@ SourceFiles
 namespace Foam
 {
 
+// Forward declaration of classes
 class polynomial;
 
+// Forward declaration of friend functions
 Ostream& operator<<
 (
     Ostream&,
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C
index c239a281ba..5a41d3f39e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C
@@ -60,12 +60,12 @@ bool Foam::NoDispersion<CloudType>::active() const
 template<class CloudType>
 Foam::vector Foam::NoDispersion<CloudType>::update
 (
-    const scalar dt,
-    const label celli,
-    const vector& U,
+    const scalar,
+    const label,
+    const vector&,
     const vector& Uc,
-    vector& UTurb,
-    scalar& tTurb
+    vector&,
+    scalar&
 )
 {
     // Do nothing
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.C
index 31ce20689c..2d1586c9cb 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.C
@@ -29,11 +29,7 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template <class CloudType>
-Foam::NoDrag<CloudType>::NoDrag
-(
-    const dictionary& dict,
-    CloudType& owner
-)
+Foam::NoDrag<CloudType>::NoDrag(const dictionary& dict, CloudType& owner)
 :
     DragModel<CloudType>(dict, owner)
 {}
@@ -56,10 +52,7 @@ bool Foam::NoDrag<CloudType>::active() const
 
 
 template<class CloudType>
-Foam::scalar Foam::NoDrag<CloudType>::Cd
-(
-    const scalar
-) const
+Foam::scalar Foam::NoDrag<CloudType>::Cd(const scalar) const
 {
     return 0.0;
 }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.C
index c535410383..e5c76c5416 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.C
@@ -56,10 +56,7 @@ bool Foam::SphereDrag<CloudType>::active() const
 
 
 template <class CloudType>
-Foam::scalar Foam::SphereDrag<CloudType>::Cd
-(
-    const scalar Re
-) const
+Foam::scalar Foam::SphereDrag<CloudType>::Cd(const scalar Re) const
 {
     scalar Cd;
     if (Re < SMALL)
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
index 167e0937f8..a812eb9189 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
@@ -231,4 +231,5 @@ bool Foam::ConeInjection<CloudType>::validInjection(const label parcelI)
     return true;
 }
 
+
 // ************************************************************************* //

From a0d36e3f90a88a1f30b0eea86594a883c34ce89b Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 27 Mar 2009 13:15:06 +0000
Subject: [PATCH 043/175] further dev on coupling, bits of restructuring

---
 .../Templates/KinematicCloud/KinematicCloud.C |   4 +-
 .../Templates/ReactingCloud/ReactingCloud.C   |   4 +-
 .../ReactingMultiphaseCloud.C                 |   6 +-
 .../Templates/ThermoCloud/ThermoCloud.C       |   4 +-
 .../KinematicParcel/KinematicParcel.C         |  30 ++-
 .../KinematicParcel/KinematicParcel.H         |  77 ++++---
 .../KinematicParcel/KinematicParcelI.H        | 195 ++++++++++-------
 .../KinematicParcel/KinematicParcelIO.C       |  27 +--
 .../ReactingMultiphaseParcel.C                | 207 ++++++++++++------
 .../ReactingMultiphaseParcel.H                |  56 +++--
 .../ReactingMultiphaseParcelI.H               |  51 ++---
 .../ReactingMultiphaseParcelIO.C              |   8 +-
 .../Templates/ReactingParcel/ReactingParcel.C |  62 ++++--
 .../Templates/ReactingParcel/ReactingParcel.H |  28 +--
 .../ReactingParcel/ReactingParcelI.H          |  12 +-
 .../ReactingParcel/ReactingParcelIO.C         |   6 +-
 .../Templates/ThermoParcel/ThermoParcel.C     |  58 +++--
 .../Templates/ThermoParcel/ThermoParcel.H     |  19 +-
 .../Templates/ThermoParcel/ThermoParcelI.H    |  16 +-
 .../Templates/ThermoParcel/ThermoParcelIO.C   |   4 +-
 .../basicKinematicParcel.C                    |   8 +-
 .../basicKinematicParcel.H                    |   9 +-
 .../basicReactingMultiphaseParcel.C           |   8 +-
 .../basicReactingMultiphaseParcel.H           |   6 +-
 .../basicReactingParcel/basicReactingParcel.C |   8 +-
 .../basicReactingParcel/basicReactingParcel.H |   4 +-
 .../basicThermoParcel/basicThermoParcel.C     |   8 +-
 .../basicThermoParcel/basicThermoParcel.H     |  11 +-
 .../IO/DataEntry/polynomial/polynomial.H      |   2 +-
 .../CompositionModel/CompositionModel.C       |   2 +-
 .../CompositionModel/CompositionModel.H       |   2 +-
 .../LiquidEvaporation/LiquidEvaporation.C     |   6 +-
 .../LiquidEvaporation/LiquidEvaporation.H     |   6 +-
 .../NoPhaseChange/NoPhaseChange.C             |   2 +-
 .../NoPhaseChange/NoPhaseChange.H             |   4 +-
 .../PhaseChangeModel/PhaseChangeModel.H       |   4 +-
 .../NoSurfaceReaction/NoSurfaceReaction.C     |   6 +-
 .../NoSurfaceReaction/NoSurfaceReaction.H     |   6 +-
 .../SurfaceReactionModel.H                    |   7 +-
 39 files changed, 592 insertions(+), 391 deletions(-)

diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index f60f69261c..eeee670009 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -50,12 +50,12 @@ void Foam::KinematicCloud<ParcelType>::addNewParcel
     ParcelType* pPtr = new ParcelType
     (
         *this,
-        parcelTypeId_,
         position,
         cellId,
+        parcelTypeId_,
+        nParticles,
         d,
         U,
-        nParticles,
         constProps_
     );
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
index b14fcc17cd..4fec0e0666 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -45,12 +45,12 @@ void Foam::ReactingCloud<ParcelType>::addNewParcel
     ParcelType* pPtr = new ParcelType
     (
         *this,
-        this->parcelTypeId(),
         position,
         cellId,
+        this->parcelTypeId(),
+        nParticles,
         d,
         U,
-        nParticles,
         composition().YMixture0(),
         constProps_
     );
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
index 29936f328c..7936ddea40 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
@@ -49,16 +49,16 @@ void Foam::ReactingMultiphaseCloud<ParcelType>::addNewParcel
     ParcelType* pPtr = new ParcelType
     (
         *this,
-        this->parcelTypeId(),
         position,
         cellId,
+        this->parcelTypeId(),
+        nParticles,
         d,
         U,
-        nParticles,
+        this->composition().YMixture0(),
         this->composition().Y0(idGas),
         this->composition().Y0(idLiquid),
         this->composition().Y0(idSolid),
-        this->composition().YMixture0(),
         constProps_
     );
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
index 40731ec254..6872f2428e 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
@@ -46,12 +46,12 @@ void Foam::ThermoCloud<ParcelType>::addNewParcel
     ParcelType* pPtr = new ParcelType
     (
         *this,
-        this->parcelTypeId(),
         position,
         cellId,
+        this->parcelTypeId(),
+        nParticles,
         d,
         U,
-        nParticles,
         constProps_
     );
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index 70adc771b1..007e5aac47 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -79,6 +79,10 @@ void Foam::KinematicParcel<ParcelType>::calc
 {
     // Define local properties at beginning of time step
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    const scalar np0 = nParticle_;
+    const scalar d0 = d_;
+    const scalar U0 = U_;
+    const scalar rho0 = rho_;
     const scalar mass0 = mass();
 
 
@@ -97,7 +101,8 @@ void Foam::KinematicParcel<ParcelType>::calc
 
     // Calculate new particle velocity
     scalar Cud = 0.0;
-    vector U1 = calcVelocity(td, dt, cellI, Fx, mass0, Cud, dUTrans);
+    vector U1 =
+        calcVelocity(td, dt, cellI, d0, U0, rho0, mass0, Fx, Cud, dUTrans);
 
 
     // Accumulate carrier phase source terms
@@ -105,10 +110,10 @@ void Foam::KinematicParcel<ParcelType>::calc
     if (td.cloud().coupled())
     {
         // Update momentum transfer
-        td.cloud().UTrans()[cellI] += nParticle_*dUTrans;
+        td.cloud().UTrans()[cellI] += np0*dUTrans;
 
         // Coefficient to be applied in carrier phase momentum coupling
-        td.cloud().UCoeff()[cellI] += nParticle_*mass0*Cud;
+        td.cloud().UCoeff()[cellI] += np0*mass0*Cud;
     }
 
 
@@ -125,14 +130,17 @@ const Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
     TrackData& td,
     const scalar dt,
     const label cellI,
-    const vector& Fx,
+    const scalar d,
+    const vector& U,
+    const scalar rho,
     const scalar mass,
+    const vector& Fx,
     scalar& Cud,
     vector& dUTrans
 ) const
 {
     // Return linearised term from drag model
-    Cud = td.cloud().drag().Cu(U_ - Uc_, d_, rhoc_, rho_, muc_);
+    Cud = td.cloud().drag().Cu(U - Uc_, d, rhoc_, rho, muc_);
 
     // Initialise total force (per unit mass)
     vector Ftot = vector::zero;
@@ -140,20 +148,20 @@ const Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
     // Gravity force
     if (td.cloud().forceGravity())
     {
-        Ftot += td.g()*(1 - rhoc_/rho_);
+        Ftot += td.g()*(1 - rhoc_/rho);
     }
 
     // Virtual mass force
     if (td.cloud().forceVirtualMass())
     {
-//        Ftot += td.constProps().Cvm()*rhoc_/rho_*d(Uc - U_)/dt;
+//        Ftot += td.constProps().Cvm()*rhoc_/rho*d(Uc - U)/dt;
     }
 
     // Pressure gradient force
     if (td.cloud().forcePressureGradient())
     {
-        const vector& d = this->mesh().deltaCoeffs()[cellI];
-        Ftot += rhoc_/rho_*(U_ & (d^Uc_));
+//        const vector& delta = td.cloud().mesh().deltaCoeffs()[cellI];
+//        Ftot += rhoc_/rho*(U & (delta^Uc_));
     }
 
 
@@ -164,11 +172,11 @@ const Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
     const vector ap = Uc_ + (Ftot + Fx)/(Cud + VSMALL);
     const scalar bp = Cud;
 
-    vector Unew = td.cloud().UIntegrator().integrate(U_, dt, ap, bp).value();
+    vector Unew = td.cloud().UIntegrator().integrate(U, dt, ap, bp).value();
 
     // Calculate the momentum transfer to the continuous phase
     // - do not include gravity impulse
-    dUTrans = -mass*(Unew - U_ - dt*td.g());
+    dUTrans = -mass*(Unew - U - dt*td.g());
 
     return Unew;
 }
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index 35b46329dc..1717ee1feb 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -31,7 +31,7 @@ Description
 
     Sub-models include:
     - drag
-    - break-up
+    - turbulent dispersion
     - wall interactions
 
 SourceFiles
@@ -193,15 +193,15 @@ protected:
             //- Parcel type id
             label typeId_;
 
+            //- Number of particles in Parcel
+            scalar nParticle_;
+
             //- Diameter [m]
             scalar d_;
 
             //- Velocity of Parcel [m/s]
             vector U_;
 
-            //- Number of particles in Parcel
-            scalar nParticle_;
-
             //- Density [kg/m3]
             scalar rho_;
 
@@ -214,13 +214,13 @@ protected:
 
         // Cell-based quantities
 
-            // - Density [kg/m3]
+            //- Density [kg/m3]
             scalar rhoc_;
 
-            // - Velocity [m/s]
+            //- Velocity [m/s]
             vector Uc_;
 
-            // - Viscosity [Pa.s]
+            //- Viscosity [Pa.s]
             scalar muc_;
 
 
@@ -231,12 +231,15 @@ protected:
         const vector calcVelocity
         (
             TrackData& td,
-            const scalar dt,
-            const label cellI,
-            const vector& Fx,
-            const scalar mass,
-            scalar& Cud,
-            vector& dUTrans
+            const scalar dt,           // timestep
+            const label cellI,         // owner cell
+            const scalar d,            // diameter
+            const vector& U,           // velocity
+            const scalar rho,          // density
+            const scalar mass,         // mass
+            const vector& Fx,          // additional forces
+            scalar& Cud,               // linearised drag term coeff
+            vector& dUTrans            // momentum transfer to carrier phase
         ) const;
 
 
@@ -254,12 +257,12 @@ public:
         inline KinematicParcel
         (
             KinematicCloud<ParcelType>& owner,
-            const label typeId,
             const vector& position,
             const label cellI,
+            const label typeId,
+            const scalar nParticle0,
             const scalar d0,
             const vector& U0,
-            const scalar nParticle0,
             const constantProperties& constProps
         );
 
@@ -282,21 +285,18 @@ public:
 
         // Access
 
-            //- Return type id
+            //- Return const access to type id
             inline label typeId() const;
 
+            //- Return const access to number of particles
+            inline scalar nParticle() const;
+
             //- Return const access to diameter
             inline scalar d() const;
 
             //- Return const access to velocity
             inline const vector& U() const;
 
-            //- Return const access to relative velocity
-            inline const vector& Ur() const;
-
-            //- Return const access to number of particles
-            inline scalar nParticle() const;
-
             //- Return const access to density
             inline scalar rho() const;
 
@@ -306,25 +306,21 @@ public:
             //- Return const access to turbulent velocity fluctuation
             inline const vector& UTurb() const;
 
-            //- The nearest distance to a wall that
-            //  the particle can be in the n direction
-            inline scalar wallImpactDistance(const vector& n) const;
-
 
         // Edit
 
+            //- Return access to type id
+            inline label typeId();
+
+            //- Return access to number of particles
+            inline scalar& nParticle();
+
             //- Return access to diameter
             inline scalar& d();
 
             //- Return access to velocity
             inline vector& U();
 
-            //- Return access to relative velocity
-            inline vector& Ur();
-
-            //- Return access to number of particles
-            inline scalar& nParticle();
-
             //- Return access to density
             inline scalar& rho();
 
@@ -337,22 +333,35 @@ public:
 
         // Helper functions
 
+            //- The nearest distance to a wall that
+            //  the particle can be in the n direction
+            inline scalar wallImpactDistance(const vector& n) const;
+
             //- Return the index of the face to be used in the interpolation
             //  routine
             inline label faceInterpolation() const;
 
+            //- Particle mass
+            inline scalar mass() const;
+
             //- Particle volume
             inline scalar volume() const;
 
-            //- Particle mass
-            inline scalar mass() const;
+            //- Particle volume for a given diameter
+            inline scalar volume(const scalar d) const;
 
             //- Particle projected area
             inline scalar areaP() const;
 
+            //- Projected area for given diameter
+            inline scalar areaP(const scalar d) const;
+
             //- Particle surface area
             inline scalar areaS() const;
 
+            //- Surface area for given diameter
+            inline scalar areaS(const scalar d) const;
+
 
         // Main calculation loop
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
index 4a6be04a97..8582792460 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
@@ -63,20 +63,20 @@ template <class ParcelType>
 inline Foam::KinematicParcel<ParcelType>::KinematicParcel
 (
     KinematicCloud<ParcelType>& owner,
-    const label typeId,
     const vector& position,
     const label cellI,
+    const label typeId,
+    const scalar nParticle0,
     const scalar d0,
     const vector& U0,
-    const scalar nParticle0,
     const constantProperties& constProps
 )
 :
     Particle<ParcelType>(owner, position, cellI),
     typeId_(typeId),
+    nParticle_(nParticle0),
     d_(d0),
     U_(U0),
-    nParticle_(nParticle0),
     rho_(constProps.rho0()),
     tTurb_(0.0),
     UTurb_(vector::zero),
@@ -171,6 +171,13 @@ inline Foam::label Foam::KinematicParcel<ParcelType>::typeId() const
 }
 
 
+template <class ParcelType>
+inline Foam::scalar Foam::KinematicParcel<ParcelType>::nParticle() const
+{
+    return nParticle_;
+}
+
+
 template <class ParcelType>
 inline Foam::scalar Foam::KinematicParcel<ParcelType>::d() const
 {
@@ -178,6 +185,48 @@ inline Foam::scalar Foam::KinematicParcel<ParcelType>::d() const
 }
 
 
+template <class ParcelType>
+inline const Foam::vector& Foam::KinematicParcel<ParcelType>::U() const
+{
+    return U_;
+}
+
+
+template <class ParcelType>
+inline Foam::scalar Foam::KinematicParcel<ParcelType>::rho() const
+{
+    return rho_;
+}
+
+
+template <class ParcelType>
+inline Foam::scalar Foam::KinematicParcel<ParcelType>::tTurb() const
+{
+    return tTurb_;
+}
+
+
+template <class ParcelType>
+inline const Foam::vector& Foam::KinematicParcel<ParcelType>::UTurb() const
+{
+    return UTurb_;
+}
+
+
+template <class ParcelType>
+inline Foam::label Foam::KinematicParcel<ParcelType>::typeId()
+{
+    return typeId_;
+}
+
+
+template <class ParcelType>
+inline Foam::scalar& Foam::KinematicParcel<ParcelType>::nParticle()
+{
+    return nParticle_;
+}
+
+
 template <class ParcelType>
 inline Foam::scalar& Foam::KinematicParcel<ParcelType>::d()
 {
@@ -185,6 +234,34 @@ inline Foam::scalar& Foam::KinematicParcel<ParcelType>::d()
 }
 
 
+template <class ParcelType>
+inline Foam::vector& Foam::KinematicParcel<ParcelType>::U()
+{
+    return U_;
+}
+
+
+template <class ParcelType>
+inline Foam::scalar& Foam::KinematicParcel<ParcelType>::rho()
+{
+    return rho_;
+}
+
+
+template <class ParcelType>
+inline Foam::scalar& Foam::KinematicParcel<ParcelType>::tTurb()
+{
+    return tTurb_;
+}
+
+
+template <class ParcelType>
+inline Foam::vector& Foam::KinematicParcel<ParcelType>::UTurb()
+{
+    return UTurb_;
+}
+
+
 template <class ParcelType>
 inline Foam::scalar Foam::KinematicParcel<ParcelType>::wallImpactDistance
 (
@@ -210,83 +287,6 @@ inline Foam::label Foam::KinematicParcel<ParcelType>::faceInterpolation() const
 }
 
 
-template <class ParcelType>
-inline const Foam::vector& Foam::KinematicParcel<ParcelType>::U() const
-{
-    return U_;
-}
-
-
-template <class ParcelType>
-inline Foam::vector& Foam::KinematicParcel<ParcelType>::U()
-{
-    return U_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar Foam::KinematicParcel<ParcelType>::nParticle() const
-{
-    return nParticle_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar& Foam::KinematicParcel<ParcelType>::nParticle()
-{
-    return nParticle_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar Foam::KinematicParcel<ParcelType>::rho() const
-{
-    return rho_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar& Foam::KinematicParcel<ParcelType>::rho()
-{
-    return rho_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar Foam::KinematicParcel<ParcelType>::tTurb() const
-{
-    return tTurb_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar& Foam::KinematicParcel<ParcelType>::tTurb()
-{
-    return tTurb_;
-}
-
-
-template <class ParcelType>
-inline const Foam::vector& Foam::KinematicParcel<ParcelType>::UTurb() const
-{
-    return UTurb_;
-}
-
-
-template <class ParcelType>
-inline Foam::vector& Foam::KinematicParcel<ParcelType>::UTurb()
-{
-    return UTurb_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar Foam::KinematicParcel<ParcelType>::volume() const
-{
-    return mathematicalConstant::pi/6.0*pow3(d_);
-}
-
-
 template <class ParcelType>
 inline Foam::scalar Foam::KinematicParcel<ParcelType>::mass() const
 {
@@ -294,17 +294,48 @@ inline Foam::scalar Foam::KinematicParcel<ParcelType>::mass() const
 }
 
 
+template <class ParcelType>
+inline Foam::scalar Foam::KinematicParcel<ParcelType>::volume() const
+{
+    return volume(d_);
+}
+
+
+template <class ParcelType>
+inline Foam::scalar
+Foam::KinematicParcel<ParcelType>::volume(const scalar d) const
+{
+    return mathematicalConstant::pi/6.0*pow3(d);
+}
+
+
 template <class ParcelType>
 inline Foam::scalar Foam::KinematicParcel<ParcelType>::areaP() const
 {
-    return 0.25*areaS();
+    return areaP(d_);
+}
+
+
+template <class ParcelType>
+inline Foam::scalar
+Foam::KinematicParcel<ParcelType>::areaP(const scalar d) const
+{
+    return 0.25*areaS(d);
 }
 
 
 template <class ParcelType>
 inline Foam::scalar Foam::KinematicParcel<ParcelType>::areaS() const
 {
-    return mathematicalConstant::pi*d_*d_;
+    return areaS(d_);
+}
+
+
+template <class ParcelType>
+inline Foam::scalar
+Foam::KinematicParcel<ParcelType>::areaS(const scalar d) const
+{
+    return mathematicalConstant::pi*d*d;
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
index 36535ab6a0..ae96d25a14 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
@@ -41,9 +41,9 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
 :
     Particle<ParcelType>(cloud, is, readFields),
     typeId_(0),
+    nParticle_(0.0),
     d_(0.0),
     U_(vector::zero),
-    nParticle_(0.0),
     rho_(0.0),
     tTurb_(0.0),
     UTurb_(vector::zero),
@@ -56,9 +56,9 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
         if (is.format() == IOstream::ASCII)
         {
             typeId_ = readLabel(is);
+            nParticle_ = readScalar(is);
             d_ = readScalar(is);
             is >> U_;
-            nParticle_ = readScalar(is);
             rho_ = readScalar(is);
             tTurb_ = readScalar(is);
             is >> UTurb_;
@@ -69,9 +69,9 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
             (
                 reinterpret_cast<char*>(&typeId_),
                 sizeof(typeId_)
+              + sizeof(nParticle_)
               + sizeof(d_)
               + sizeof(U_)
-              + sizeof(nParticle_)
               + sizeof(rho_)
               + sizeof(tTurb_)
               + sizeof(UTurb_)
@@ -108,7 +108,8 @@ void Foam::KinematicParcel<ParcelType>::readFields
     IOField<vector> U(c.fieldIOobject("U", IOobject::MUST_READ));
     c.checkFieldIOobject(c, U);
 
-    IOField<scalar> nParticle(c.fieldIOobject("nParticle", IOobject::MUST_READ));
+    IOField<scalar>
+        nParticle(c.fieldIOobject("nParticle", IOobject::MUST_READ));
     c.checkFieldIOobject(c, nParticle);
 
     IOField<scalar> rho(c.fieldIOobject("rho", IOobject::MUST_READ));
@@ -126,9 +127,9 @@ void Foam::KinematicParcel<ParcelType>::readFields
         ParcelType& p = iter();
 
         p.typeId_ = typeId[i];
+        p.nParticle_ = nParticle[i];
         p.d_ = d[i];
         p.U_ = U[i];
-        p.nParticle_ = nParticle[i];
         p.rho_ = rho[i];
         p.tTurb_ = tTurb[i];
         p.UTurb_ = UTurb[i];
@@ -148,13 +149,13 @@ void Foam::KinematicParcel<ParcelType>::writeFields
     label np =  c.size();
 
     IOField<label> typeId(c.fieldIOobject("typeId", IOobject::NO_READ), np);
-    IOField<scalar> d(c.fieldIOobject("d", IOobject::NO_READ), np);
-    IOField<vector> U(c.fieldIOobject("U", IOobject::NO_READ), np);
     IOField<scalar> nParticle
     (
         c.fieldIOobject("nParticle", IOobject::NO_READ),
         np
     );
+    IOField<scalar> d(c.fieldIOobject("d", IOobject::NO_READ), np);
+    IOField<vector> U(c.fieldIOobject("U", IOobject::NO_READ), np);
     IOField<scalar> rho(c.fieldIOobject("rho", IOobject::NO_READ), np);
     IOField<scalar> tTurb(c.fieldIOobject("tTurb", IOobject::NO_READ), np);
     IOField<vector> UTurb(c.fieldIOobject("UTurb", IOobject::NO_READ), np);
@@ -165,9 +166,9 @@ void Foam::KinematicParcel<ParcelType>::writeFields
         const KinematicParcel<ParcelType>& p = iter();
 
         typeId[i] = p.typeId();
+        nParticle[i] = p.nParticle();
         d[i] = p.d();
         U[i] = p.U();
-        nParticle[i] = p.nParticle();
         rho[i] = p.rho();
         tTurb[i] = p.tTurb();
         UTurb[i] = p.UTurb();
@@ -175,9 +176,9 @@ void Foam::KinematicParcel<ParcelType>::writeFields
     }
 
     typeId.write();
+    nParticle.write();
     d.write();
     U.write();
-    nParticle.write();
     rho.write();
     tTurb.write();
     UTurb.write();
@@ -195,25 +196,25 @@ Foam::Ostream& Foam::operator<<
 {
     if (os.format() == IOstream::ASCII)
     {
-        os  << static_cast<const Particle<ParcelType>& >(p)
+        os  << static_cast<const Particle<ParcelType>&>(p)
             << token::SPACE << p.typeId()
+            << token::SPACE << p.nParticle()
             << token::SPACE << p.d()
             << token::SPACE << p.U()
-            << token::SPACE << p.nParticle()
             << token::SPACE << p.rho()
             << token::SPACE << p.tTurb()
             << token::SPACE << p.UTurb();
     }
     else
     {
-        os  << static_cast<const Particle<ParcelType>& >(p);
+        os  << static_cast<const Particle<ParcelType>&>(p);
         os.write
         (
             reinterpret_cast<const char*>(&p.typeId_),
             sizeof(p.typeId())
+          + sizeof(p.nParticle())
           + sizeof(p.d())
           + sizeof(p.U())
-          + sizeof(p.nParticle())
           + sizeof(p.rho())
           + sizeof(p.tTurb())
           + sizeof(p.UTurb())
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index aacd51f04a..70d04a910e 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -87,7 +87,7 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::updateMassFractions
     const scalarField& dMassSolid
 )
 {
-    scalarList& YMix = this->Y_;
+    scalarField& YMix = this->Y_;
 
     scalar dMassGasTot = sum(dMassGas);
     scalar dMassLiquidTot = sum(dMassLiquid);
@@ -99,8 +99,8 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::updateMassFractions
 
     scalar massNew = mass0 - (dMassGasTot + dMassLiquidTot + dMassSolidTot);
 
-    YMix[GAS] = (mass0*YMix[GAS] - dMassGas)/massNew;
-    YMix[LIQUID] = (mass0*YMix[LIQUID] - dMassLiquid)/massNew;
+    YMix[GAS] = (mass0*YMix[GAS] - dMassGasTot)/massNew;
+    YMix[LIQUID] = (mass0*YMix[LIQUID] - dMassLiquidTot)/massNew;
     YMix[SOLID] = 1.0 - YMix[GAS] - YMix[LIQUID];
 
     return massNew;
@@ -133,11 +133,17 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
 {
     // Define local properties at beginning of timestep
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    const scalar mass0 = this->mass();
     const scalar np0 = this->nParticle_;
+    const scalar d0 = this->d_;
+    const vector& U0 = this->U_;
+    const scalar rho0 = this->rho_;
     const scalar T0 = this->T_;
+    const scalar cp0 = this->cp_;
+    const scalar mass0 = this->mass();
+
     const scalar pc = this->pc_;
-    scalarField& YMix = this->Y_;
+
+    const scalarField& YMix = this->Y_;
     const label idG = td.cloud().composition().idGas();
     const label idL = td.cloud().composition().idLiquid();
     const label idS = td.cloud().composition().idSolid();
@@ -170,14 +176,39 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
 
     // Return enthalpy source and calc mass transfer due to phase change
     scalar ShPC =
-        calcPhaseChange(td, dt, cellI, T0, idL, YMix[idL], YLiquid_, dMassPC);
+        calcPhaseChange
+        (
+            td,
+            dt,
+            cellI,
+            d0,
+            T0,
+            U0,
+            idL,
+            YMix[LIQUID],
+            YLiquid_,
+            dMassPC
+        );
 
 
     // Devolatilisation
     // ~~~~~~~~~~~~~~~~
 
     // Return enthalpy source and calc mass transfer due to devolatilisation
-    scalar ShDV = calcDevolatilisation(td, dt, T0, mass0, idG, YMix, dMassDV);
+    scalar ShDV =
+        calcDevolatilisation
+        (
+            td,
+            dt,
+            T0,
+            mass0,
+            this->mass0_,
+            idG,
+            YMix[GAS],
+            YGas_,
+            canCombust_,
+            dMassDV
+        );
 
 
     // Surface reactions
@@ -190,8 +221,15 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
             td,
             dt,
             cellI,
+            d0,
             T0,
-            dMassPC + dMassDV, // total volatiles evolved
+            mass0,
+            canCombust_,
+            dMassPC + dMassDV, // total mass of volatiles evolved
+            YMix,
+            YGas_,
+            YLiquid_,
+            YSolid_,
             dMassSRGas,
             dMassSRLiquid,
             dMassSRSolid,
@@ -208,7 +246,21 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
 
     // Calculate new particle temperature
     scalar htc = 0.0;
-    scalar T1 = calcHeatTransfer(td, dt, cellI, Sh, htc, dhTrans);
+    scalar T1 =
+        calcHeatTransfer
+        (
+            td,
+            dt,
+            cellI,
+            d0,
+            U0,
+            rho0,
+            T0,
+            cp0,
+            Sh,
+            htc,
+            dhTrans
+        );
 
 
     // Update component mass fractions
@@ -231,7 +283,19 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     // Calculate new particle velocity
     scalar Cud = 0.0;
     vector U1 =
-        calcVelocity(td, dt, cellI, Fx, 0.5*(mass0 + mass1), Cud, dUTrans);
+        calcVelocity
+        (
+            td,
+            dt,
+            cellI,
+            d0,
+            U0,
+            rho0,
+            0.5*(mass0 + mass1),
+            Fx,
+            Cud,
+            dUTrans
+        );
 
 
     // Accumulate carrier phase source terms
@@ -242,18 +306,18 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
         // Transfer mass lost from particle to carrier mass source
         forAll(YGas_, i)
         {
-            label id = td.composition().localToGlobalGasId(GAS, i);
+            label id = td.cloud().composition().localToGlobalGasId(GAS, i);
             td.cloud().rhoTrans(id)[cellI] += np0*dMassGas[i];
         }
         forAll(YLiquid_, i)
         {
-            label id = td.composition().localToGlobalGasId(LIQUID, i);
+            label id = td.cloud().composition().localToGlobalGasId(LIQUID, i);
             td.cloud().rhoTrans(id)[cellI] += np0*dMassLiquid[i];
         }
-        // No mapping between solid components and carrier phase
+//        // No mapping between solid components and carrier phase
 //        forAll(YSolid_, i)
 //        {
-//            label id = td.composition().localToGlobalGasId(SOLID, i);
+//            label id = td.cloud().composition().localToGlobalGasId(SOLID, i);
 //            td.cloud().rhoTrans(id)[cellI] += np0*dMassSolid[i];
 //        }
         forAll(dMassSRCarrier, i)
@@ -268,8 +332,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
         td.cloud().UCoeff()[cellI] += np0*mass0*Cud;
 
         // Update enthalpy transfer
-        // - enthalpy of lost solids already accounted for
-        td.cloud().hTrans()[cellI] += np0*(dhTrans + Sh);
+        td.cloud().hTrans()[cellI] += np0*dhTrans;
 
         // Coefficient to be applied in carrier phase enthalpy coupling
         td.cloud().hCoeff()[cellI] += np0*htc*this->areaS();
@@ -288,22 +351,24 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
             // Absorb parcel into carrier phase
             forAll(YGas_, i)
             {
-                label id = td.composition().localToGlobalGasId(GAS, i);
+                label id = td.cloud().composition().localToGlobalGasId(GAS, i);
                 td.cloud().rhoTrans(id)[cellI] += np0*mass1*YMix[GAS]*YGas_[i];
             }
             forAll(YLiquid_, i)
             {
-                label id = td.composition().localToGlobalGasId(LIQUID, i);
+                label id =
+                    td.cloud().composition().localToGlobalGasId(LIQUID, i);
                 td.cloud().rhoTrans(id)[cellI] +=
                     np0
                    *mass1
                    *YMix[LIQUID]
                    *YLiquid_[i];
             }
-            // No mapping between solid components and carrier phase
+//            // No mapping between solid components and carrier phase
 //            forAll(YSolid_, i)
 //            {
-//                label id = td.composition().localToGlobalGasId(SOLID, i);
+//                label id =
+//                    td.cloud().composition().localToGlobalGasId(SOLID, i);
 //                td.cloud().rhoTrans(id)[cellI] +=
 //                    np0
 //                   *mass1
@@ -350,9 +415,12 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
     const scalar dt,
     const scalar T,
     const scalar mass,
+    const scalar mass0,
     const label idVolatile,
-    const scalarField& YMixture,
-    scalarList& dMass
+    const scalar YVolatileTot,
+    const scalarField& YVolatile,
+    bool& canCombust,
+    scalarField& dMassDV
 )
 {
     // Check that model is active, and that the parcel temperature is
@@ -367,31 +435,27 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
         return 0.0;
     }
 
-    // Determine mass to add to carrier phase
+    // Total mass of volatiles evolved
     const scalar dMassTot = td.cloud().devolatilisation().calculate
     (
         dt,
-        this->mass0_,
+        mass0,
         mass,
         T,
         td.cloud().composition().YMixture0()[idVolatile],
-        YMixture[GAS],
-        canCombust_
+        YVolatileTot,
+        canCombust
     );
 
-    // Add to cummulative mass transfer
-    forAll (YGas_, i)
+    // Volatile mass transfer - equal components of each volatile specie
+    forAll(YVolatile, i)
     {
-        label id = td.cloud().composition().globalIds(idVolatile)[i];
-
-        // Volatiles mass transfer
-        scalar volatileMass = YGas_[i]*dMassTot;
-        dMass[i] += volatileMass;
+        dMassDV[i] = YVolatile[i]*dMassTot;
     }
 
     td.cloud().addToMassDevolatilisation(dMassTot);
 
-    return td.constProps().Ldevol()*dMassTot;
+    return -dMassTot*td.constProps().LDevol();
 }
 
 
@@ -402,36 +466,46 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
     TrackData& td,
     const scalar dt,
     const label cellI,
+    const scalar d,
     const scalar T,
-    const scalarList& dMassVolatile,
+    const scalar mass,
+    const bool canCombust,
+    const scalarField& dMassVolatile,
+    const scalarField& YMix,
+    const scalarField& YGas,
+    const scalarField& YLiquid,
+    const scalarField& YSolid,
     scalarField& dMassSRGas,
     scalarField& dMassSRLiquid,
     scalarField& dMassSRSolid,
-    scalarList& dMassSRCarrier,
+    scalarField& dMassSRCarrier,
     scalar& dhTrans
 )
 {
     // Check that model is active
-    if (!td.cloud().surfaceReaction().active() || !canCombust_)
+    if (!td.cloud().surfaceReaction().active() || !canCombust)
     {
-        return;
+        return 0.0;
     }
 
     // Update surface reactions
-    scalar HReaction = td.cloud().surfaceReaction().calculate
+    const scalar pc = this->pc_;
+    const scalar Tc = this->Tc_;
+    const scalar rhoc = this->rhoc_;
+    const scalar HReaction = td.cloud().surfaceReaction().calculate
     (
         dt,
         cellI,
-        this->d_,
+        d,
         T,
-        this->Tc_,
-        this->pc_,
-        this->rhoc_,
-        this->mass(),
-        YGas_,
-        YLiquid_,
-        YSolid_,
-        this->Y_,
+        Tc,
+        pc,
+        rhoc,
+        mass,
+        YGas,
+        YLiquid,
+        YSolid,
+        YMix,
         dMassVolatile,
         dMassSRGas,
         dMassSRLiquid,
@@ -439,23 +513,32 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
         dMassSRCarrier
     );
 
+    td.cloud().addToMassSurfaceReaction
+    (
+        sum(dMassSRGas) + sum(dMassSRLiquid) + sum(dMassSRSolid)
+    );
+
+    // Add enthalpy of consumed components to the carrier phase enthalpy
+    // transfer
+    const label idG = td.cloud().composition().idGas();
+    const label idL = td.cloud().composition().idLiquid();
+    const label idS = td.cloud().composition().idSolid();
+    scalar dhGas =
+        sum(dMassSRGas)*td.cloud().composition().H(idG, YGas, pc, T);
+
+    scalar dhLiquid =
+        sum(dMassSRLiquid)*td.cloud().composition().H(idL, YLiquid, pc, T);
+
+    scalar dhSolid =
+        sum(dMassSRSolid)*td.cloud().composition().H(idS, YSolid, pc, T);
+
+    dhTrans += dhGas + dhLiquid + dhSolid;
+
     // Heat of reaction divided between particle and carrier phase by the
     // fraction fh and (1 - fh)
-    dhTrans -= (1.0 - td.constProps().fh())*HReaction;
+    dhTrans += (1.0 - td.constProps().hRetentionCoeff())*HReaction;
 
-/*
-    // Correct dhTrans to account for enthalpy of consumed solids
-    dhTrans +=
-        sum(dMassSR)*td.cloud().composition().H(idSolid, YSolid_, pc, T0);
-
-    // Correct dhTrans to account for enthalpy of evolved volatiles
-    dhTrans +=
-        sum(dMassMT)*td.cloud().composition().H(idGas, YGas_, pc, T0);
-
-    // TODO: td.cloud().addToMassSurfaceReaction(sum(dMassSR));
-*/
-
-    return td.constProps().fh()*HReaction;
+    return td.constProps().hRetentionCoeff()*HReaction;
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
index 58e2ef60dc..5053c106b4 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -83,11 +83,11 @@ public:
         // Private data
 
             //- Latent heat of devolatilisation [J/kg]
-            const scalar Ldevol_;
+            const scalar LDevol_;
 
             //- Fraction of enthalpy retained by parcel due to surface
             //  reactions
-            const scalar fh_;
+            const scalar hRetentionCoeff_;
 
 
     public:
@@ -98,11 +98,11 @@ public:
         // Access
 
             //- Return const access to the latent heat of devolatilisation
-            inline scalar Ldevol() const;
+            inline scalar LDevol() const;
 
             //- Return const access to the fraction of enthalpy retained by
-            // parcel due to surface reactions
-            inline scalar fh() const;
+            //  parcel due to surface reactions
+            inline scalar hRetentionCoeff() const;
     };
 
 
@@ -214,12 +214,15 @@ protected:
         scalar calcDevolatilisation
         (
             TrackData& td,
-            const scalar dt,
-            const scalar T,
-            const scalar mass,
-            const label idVolatile,
-            const scalarField& YMixture,
-            scalarList& dMass
+            const scalar dt,           // timestep
+            const scalar T,            // temperature
+            const scalar mass,         // mass
+            const scalar mass0,        // mass (initial on injection)
+            const label idVolatile,    // id of volatile phase
+            const scalar YVolatileTot, // total volatile mass fraction
+            const scalarField& YVolatile, // volatile component mass fractions
+            bool& canCombust,          // 'can combust' flag
+            scalarField& dMassDV       // mass transfer - local to particle
         );
 
         //- Calculate surface reactions
@@ -227,15 +230,22 @@ protected:
         scalar calcSurfaceReactions
         (
             TrackData& td,
-            const scalar dt,
-            const label cellI,
-            const scalar T,
-            const scalarList& dMassVolatile,
-            scalarField& dMassSRGas,
-            scalarField& dMassSRLiquid,
-            scalarField& dMassSRSolid,
-            scalarList& dMassSRc,
-            scalar& dhTrans
+            const scalar dt,           // timestep
+            const label cellI,         // owner cell
+            const scalar d,            // diameter
+            const scalar T,            // temperature
+            const scalar mass,         // mass
+            const bool canCombust,     // 'can combust' flag
+            const scalarField& dMassVolatile, // mass transfer of volatiles
+            const scalarField& YMix,    // mixture mass fractions
+            const scalarField& YGas,   // gas-phase mass fractions
+            const scalarField& YLiquid,// liquid-phase mass fractions
+            const scalarField& YSolid, // solid-phase mass fractions
+            scalarField& dMassSRGas,   // gas-phase mass transfer - local
+            scalarField& dMassSRLiquid,// liquid-phase mass transfer - local
+            scalarField& dMassSRSolid, // solid-phase mass transfer - local
+            scalarField& dMassSRCarrier,// carrier phase mass transfer
+            scalar& dhTrans            // enthalpy transfer to carrier phase
         );
 
 
@@ -253,16 +263,16 @@ public:
         inline ReactingMultiphaseParcel
         (
             ReactingMultiphaseCloud<ParcelType>& owner,
-            const label typeId,
             const vector& position,
             const label cellI,
+            const label typeId,
+            const scalar nParticle0,
             const scalar d0,
             const vector& U0,
-            const scalar nParticle0,
+            const scalarField& Y0,
             const scalarField& YGas0,
             const scalarField& YLiquid0,
             const scalarField& YSolid0,
-            const scalarField& Y0,
             const constantProperties& constProps
         );
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
index 1018f1e3f2..d7d3cf1781 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
@@ -34,8 +34,8 @@ constantProperties
 )
 :
     ReactingParcel<ParcelType>::constantProperties(dict),
-    Ldevol_(dimensionedScalar(dict.lookup("Ldevol")).value()),
-    fh_(dimensionedScalar(dict.lookup("fh")).value())
+    LDevol_(dimensionedScalar(dict.lookup("LDevol")).value()),
+    hRetentionCoeff_(dimensionedScalar(dict.lookup("hRetentionCoeff")).value())
 {}
 
 
@@ -74,28 +74,28 @@ template<class ParcelType>
 inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
 (
     ReactingMultiphaseCloud<ParcelType>& owner,
-    const label typeId,
     const vector& position,
     const label cellI,
+    const label typeId,
+    const scalar nParticle0,
     const scalar d0,
     const vector& U0,
-    const scalar nParticle0,
+    const scalarField& Y0,
     const scalarField& YGas0,
     const scalarField& YLiquid0,
     const scalarField& YSolid0,
-    const scalarField& Y0,
     const constantProperties& constProps
 )
 :
     ReactingParcel<ParcelType>
     (
         owner,
-        typeId,
         position,
         cellI,
+        typeId,
+        nParticle0,
         d0,
         U0,
-        nParticle0,
         Y0,
         constProps
     ),
@@ -109,17 +109,18 @@ inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
 
 template<class ParcelType>
 inline Foam::scalar
-Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::Ldevol() const
+Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::LDevol() const
 {
-    return Ldevol_;
+    return LDevol_;
 }
 
 
 template<class ParcelType>
 inline Foam::scalar
-Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::fh() const
+Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::
+hRetentionCoeff() const
 {
-    return fh_;
+    return hRetentionCoeff_;
 }
 
 
@@ -152,13 +153,6 @@ YGas() const
 }
 
 
-template<class ParcelType>
-inline Foam::scalarField& Foam::ReactingMultiphaseParcel<ParcelType>::YGas()
-{
-    return YGas_;
-}
-
-
 template<class ParcelType>
 inline const Foam::scalarField& Foam::ReactingMultiphaseParcel<ParcelType>::
 YLiquid() const
@@ -167,13 +161,6 @@ YLiquid() const
 }
 
 
-template<class ParcelType>
-inline Foam::scalarField& Foam::ReactingMultiphaseParcel<ParcelType>::YLiquid()
-{
-    return YLiquid_;
-}
-
-
 template<class ParcelType>
 inline const Foam::scalarField& Foam::ReactingMultiphaseParcel<ParcelType>::
 YSolid() const
@@ -182,6 +169,20 @@ YSolid() const
 }
 
 
+template<class ParcelType>
+inline Foam::scalarField& Foam::ReactingMultiphaseParcel<ParcelType>::YGas()
+{
+    return YGas_;
+}
+
+
+template<class ParcelType>
+inline Foam::scalarField& Foam::ReactingMultiphaseParcel<ParcelType>::YLiquid()
+{
+    return YLiquid_;
+}
+
+
 template<class ParcelType>
 inline Foam::scalarField& Foam::ReactingMultiphaseParcel<ParcelType>::YSolid()
 {
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
index cbb952181c..64829732e8 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
@@ -45,7 +45,7 @@ Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
     if (readFields)
     {
         const ReactingMultiphaseCloud<ParcelType>& cR =
-            dynamic_cast<const ReactingMultiphaseCloud<ParcelType>& >(cloud);
+            dynamic_cast<const ReactingMultiphaseCloud<ParcelType>&>(cloud);
 
         const label idGas = cR.composition().idGas();
         const label nGas = cR.composition().componentNames(idGas).size();
@@ -68,7 +68,7 @@ Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
         }
 
         // scale the mass fractions
-        const scalarList& YMix = this->Y_;
+        const scalarField& YMix = this->Y_;
         YGas_ /= YMix[GAS] + ROOTVSMALL;
         YLiquid_ /= YMix[LIQUID] + ROOTVSMALL;
         YSolid_ /= YMix[SOLID] + ROOTVSMALL;
@@ -282,14 +282,14 @@ Foam::Ostream& Foam::operator<<
     scalarField YSolidLoc = p.YSolid()*p.Y()[2];
     if (os.format() == IOstream::ASCII)
     {
-        os  << static_cast<const ReactingMultiphaseParcel<ParcelType>& >(p)
+        os  << static_cast<const ReactingMultiphaseParcel<ParcelType>&>(p)
             << token::SPACE << YGasLoc
             << token::SPACE << YLiquidLoc
             << token::SPACE << YSolidLoc;
     }
     else
     {
-        os  << static_cast<const ReactingMultiphaseParcel<ParcelType>& >(p);
+        os  << static_cast<const ReactingMultiphaseParcel<ParcelType>&>(p);
         os << YGasLoc << YLiquidLoc << YSolidLoc;
     }
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index 676e0f10b2..66bc6242b1 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -59,7 +59,7 @@ template<class ParcelType>
 void Foam::ReactingParcel<ParcelType>::updateMassFraction
 (
     const scalar mass0,
-    const scalarList& dMass,
+    const scalarField& dMass,
     scalarField& Y
 )
 {
@@ -83,9 +83,13 @@ void Foam::ReactingParcel<ParcelType>::calc
 {
     // Define local properties at beginning of time step
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    const scalar mass0 = this->mass();
     const scalar np0 = this->nParticle_;
+    const scalar d0 = this->d_;
+    const vector& U0 = this->U_;
+    const scalar rho0 = this->rho_;
     const scalar T0 = this->T_;
+    const scalar cp0 = this->cp_;
+    const scalar mass0 = this->mass();
 
 
     // Intialise transfer terms
@@ -98,14 +102,15 @@ void Foam::ReactingParcel<ParcelType>::calc
     scalar dhTrans = 0.0;
 
     // Mass transfer due to phase change
-    scalarList dMassPC(td.cloud().gases().size(), 0.0);
+    scalarField dMassPC(td.cloud().gases().size(), 0.0);
 
 
     // Phase change
     // ~~~~~~~~~~~~
 
     // Return enthalpy source and calc mass transfer due to phase change
-    scalar ShPC = calcPhaseChange(td, dt, cellI, T0, 0, 1.0, Y_, dMassPC);
+    scalar ShPC =
+        calcPhaseChange(td, dt, cellI, d0, T0, U0, 0, 1.0, Y_, dMassPC);
 
     // Update particle component mass fractions
     updateMassFraction(mass0, dMassPC, Y_);
@@ -116,7 +121,21 @@ void Foam::ReactingParcel<ParcelType>::calc
 
     // Calculate new particle temperature
     scalar htc = 0.0;
-    scalar T1 = calcHeatTransfer(td, dt, cellI, ShPC, htc, dhTrans);
+    scalar T1 =
+        calcHeatTransfer
+        (
+            td,
+            dt,
+            cellI,
+            d0,
+            U0,
+            rho0,
+            T0,
+            cp0,
+            ShPC,
+            htc,
+            dhTrans
+        );
 
 
     // Motion
@@ -131,7 +150,19 @@ void Foam::ReactingParcel<ParcelType>::calc
     // Calculate new particle velocity
     scalar Cud = 0.0;
     vector U1 =
-        calcVelocity(td, dt, cellI, Fx, 0.5*(mass0 + mass1), Cud, dUTrans);
+        calcVelocity
+        (
+            td,
+            dt,
+            cellI,
+            d0,
+            U0,
+            rho0,
+            0.5*(mass0 + mass1),
+            Fx,
+            Cud,
+            dUTrans
+        );
 
 
     // Accumulate carrier phase source terms
@@ -151,7 +182,7 @@ void Foam::ReactingParcel<ParcelType>::calc
         td.cloud().UCoeff()[cellI] += np0*mass0*Cud;
 
         // Update enthalpy transfer
-        td.cloud().hTrans()[cellI] += np0*(dhTrans + ShPC);
+        td.cloud().hTrans()[cellI] += np0*dhTrans;
 
         // Coefficient to be applied in carrier phase enthalpy coupling
         td.cloud().hCoeff()[cellI] += np0*htc*this->areaS();
@@ -208,11 +239,13 @@ Foam::scalar Foam::ReactingParcel<ParcelType>::calcPhaseChange
     TrackData& td,
     const scalar dt,
     const label cellI,
+    const scalar d,
     const scalar T,
+    const vector& U,
     const label idPhase,
     const scalar YPhase,
     const scalarField& YComponents,
-    scalarList& dMass
+    scalarField& dMassPC
 )
 {
     if
@@ -229,16 +262,16 @@ Foam::scalar Foam::ReactingParcel<ParcelType>::calcPhaseChange
     (
         dt,
         cellI,
+        d,
         min(T, td.constProps().Tbp()), // Limiting to boiling temperature
         pc_,
-        this->d_,
         this->Tc_,
         this->muc_/this->rhoc_,
-        this->U_ - this->Uc_,
-        dMass
+        U - this->Uc_,
+        dMassPC
     );
 
-    scalar dMassTot = sum(dMass);
+    scalar dMassTot = sum(dMassPC);
 
     // Add to cumulative phase change mass
     td.cloud().addToMassPhaseChange(dMassTot);
@@ -246,10 +279,7 @@ Foam::scalar Foam::ReactingParcel<ParcelType>::calcPhaseChange
     // Effective latent heat of vaporisation
     scalar LEff = td.cloud().composition().L(idPhase, YComponents, pc_, T);
 
-    // Effective heat of vaporised components
-    scalar HEff = td.cloud().composition().H(idPhase, YComponents, pc_, T);
-
-    return dMassTot*(HEff - LEff);
+    return -dMassTot*LEff;
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index bc38527efb..52b9c881e7 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -169,7 +169,7 @@ protected:
             scalar mass0_;
 
             //- Mass fractions of mixture []
-            scalarList Y_;
+            scalarField Y_;
 
 
         // Cell-based quantities
@@ -185,20 +185,22 @@ protected:
         scalar calcPhaseChange
         (
             TrackData& td,
-            const scalar dt,
-            const label cellI,
-            const scalar T,
-            const label idPhase,
-            const scalar YPhase,
-            const scalarField& YComponents,
-            scalarList& dMass
+            const scalar dt,           // timestep
+            const label cellI,         // owner cell
+            const scalar d,            // diameter
+            const scalar T,            // temperature
+            const vector& U,           // velocity
+            const label idPhase,       // id of phase involved in phase change
+            const scalar YPhase,       // total mass fraction
+            const scalarField& YComponents, // component mass fractions
+            scalarField& dMassPC       // mass transfer - local to particle
         );
 
         //- Update mass fraction
         void updateMassFraction
         (
             const scalar mass0,
-            const scalarList& dMass,
+            const scalarField& dMass,
             scalarField& Y
         );
 
@@ -217,12 +219,12 @@ public:
         inline ReactingParcel
         (
             ReactingCloud<ParcelType>& owner,
-            const label typeId,
             const vector& position,
             const label cellI,
+            const label typeId,
+            const scalar nParticle0,
             const scalar d0,
             const vector& U0,
-            const scalar nParticle0,
             const scalarField& Y0,
             const constantProperties& constProps
         );
@@ -250,7 +252,7 @@ public:
             inline scalar mass0() const;
 
             //- Return const access to mass fractions of mixture
-            inline const scalarList& Y() const;
+            inline const scalarField& Y() const;
 
             //- Return the owner cell pressure
             inline scalar pc() const;
@@ -262,7 +264,7 @@ public:
             inline scalar& mass0();
 
             //- Return access to mass fractions of mixture
-            inline scalarList& Y();
+            inline scalarField& Y();
 
 
         // Main calculation loop
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
index aeb38c9c5c..da808caee8 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
@@ -74,12 +74,12 @@ template<class ParcelType>
 inline Foam::ReactingParcel<ParcelType>::ReactingParcel
 (
     ReactingCloud<ParcelType>& owner,
-    const label typeId,
     const vector& position,
     const label cellI,
+    const label typeId,
+    const scalar nParticle0,
     const scalar d0,
     const vector& U0,
-    const scalar nParticle0,
     const scalarField& Y0,
     const constantProperties& constProps
 )
@@ -87,12 +87,12 @@ inline Foam::ReactingParcel<ParcelType>::ReactingParcel
     ThermoParcel<ParcelType>
     (
         owner,
-        typeId,
         position,
         cellI,
+        typeId,
+        nParticle0,
         d0,
         U0,
-        nParticle0,
         constProps
     ),
     mass0_(0.0),
@@ -166,7 +166,7 @@ inline Foam::scalar Foam::ReactingParcel<ParcelType>::mass0() const
 
 
 template<class ParcelType>
-inline const Foam::scalarList& Foam::ReactingParcel<ParcelType>::Y() const
+inline const Foam::scalarField& Foam::ReactingParcel<ParcelType>::Y() const
 {
     return Y_;
 }
@@ -187,7 +187,7 @@ inline Foam::scalar& Foam::ReactingParcel<ParcelType>::mass0()
 
 
 template<class ParcelType>
-inline Foam::scalarList& Foam::ReactingParcel<ParcelType>::Y()
+inline Foam::scalarField& Foam::ReactingParcel<ParcelType>::Y()
 {
     return Y_;
 }
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
index eacf49b112..968c608d7e 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
@@ -45,7 +45,7 @@ Foam::ReactingParcel<ParcelType>::ReactingParcel
     if (readFields)
     {
         const ReactingCloud<ParcelType>& cR =
-            dynamic_cast<const ReactingCloud<ParcelType>& >(cloud);
+            dynamic_cast<const ReactingCloud<ParcelType>&>(cloud);
 
         const label nMixture = cR.composition().phaseTypes().size();
         Y_.setSize(nMixture);
@@ -206,13 +206,13 @@ Foam::Ostream& Foam::operator<<
 {
     if (os.format() == IOstream::ASCII)
     {
-        os  << static_cast<const ThermoParcel<ParcelType>& >(p)
+        os  << static_cast<const ThermoParcel<ParcelType>&>(p)
             << token::SPACE << p.mass0()
             << token::SPACE << p.Y();
     }
     else
     {
-        os  << static_cast<const ThermoParcel<ParcelType>& >(p);
+        os  << static_cast<const ThermoParcel<ParcelType>&>(p);
         os.write
         (
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
index 276fcd0b59..e13420e56d 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -68,9 +68,13 @@ void Foam::ThermoParcel<ParcelType>::calc
 {
     // Define local properties at beginning of time step
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    const vector U0 = this->U_;
-    const scalar mass0 = this->mass();
     const scalar np0 = this->nParticle_;
+    const scalar d0 = this->d_;
+    const vector U0 = this->U_;
+    const scalar rho0 = this->rho_;
+    const scalar T0 = this->T_;
+    const scalar cp0 = this->cp_;
+    const scalar mass0 = this->mass();
 
 
     // Initialise transfer terms
@@ -84,11 +88,25 @@ void Foam::ThermoParcel<ParcelType>::calc
     // ~~~~~~~~~~~~~
 
     // No additional enthalpy sources
-    vector Sh = 0.0;
+    scalar Sh = 0.0;
 
     // Calculate new particle velocity
     scalar htc = 0.0;
-    scalar T1 = calcHeatTransfer(td, dt, cellI, Sh, htc, dhTrans);
+    scalar T1 =
+        calcHeatTransfer
+        (
+            td,
+            dt,
+            cellI,
+            d0,
+            U0,
+            rho0,
+            T0,
+            cp0,
+            Sh,
+            htc,
+            dhTrans
+        );
 
 
     // Motion
@@ -99,7 +117,8 @@ void Foam::ThermoParcel<ParcelType>::calc
 
     // Calculate new particle velocity
     scalar Cud = 0.0;
-    vector U1 = calcVelocity(td, dt, cellI, Fx, Cud, mass0, dUTrans);
+    vector U1 =
+        calcVelocity(td, dt, cellI, d0, U0, rho0, mass0, Fx, Cud, dUTrans);
 
 
     //  Accumulate carrier phase source terms
@@ -133,6 +152,11 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
     TrackData& td,
     const scalar dt,
     const label cellI,
+    const scalar d,
+    const vector& U,
+    const scalar rho,
+    const scalar T,
+    const scalar cp,
     const scalar Sh,
     scalar& htc,
     scalar& dhTrans
@@ -141,31 +165,31 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
     if (!td.cloud().heatTransfer().active())
     {
         htc = 0.0;
-        return T_;
+        return T;
     }
 
     // Calc heat transfer coefficient
     htc = td.cloud().heatTransfer().h
     (
-        this->d_,
-        this->U_ - this->Uc_,
+        d,
+        U - this->Uc_,
         this->rhoc_,
-        this->rho_,
+        rho,
         cpc_,
-        cp_,
+        cp,
         this->muc_
     );
 
 
-    // Set new particle temperature
-    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Determine new particle temperature
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    // Assuming diameter = diameter at start of time step
-    scalar Ap = this->areasS();
+    // Particle area
+    scalar Ap = this->areaS(d);
 
     // Determine ap and bp coefficients
     scalar ap = Tc_ + Sh/(htc*Ap + ROOTVSMALL);
-    scalar bp = 6.0*htc/(this->rho_*this->d_*cp_);
+    scalar bp = 6.0*htc/(rho*d*cp);
     if (td.cloud().radiation())
     {
         // Carrier phase incident radiation field
@@ -177,7 +201,7 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
         // Helper variables
         const scalar sigma = radiation::sigmaSB.value();
         const scalar epsilon = td.constProps().epsilon0();
-        const scalar D = epsilon*sigma*pow3(T_)/(htc + ROOTVSMALL) + 1.0;
+        const scalar D = epsilon*sigma*pow3(T)/(htc + ROOTVSMALL) + 1.0;
         ap += 0.25*epsilon*G[cellI]/(htc + ROOTVSMALL);
         ap /= D;
         bp *= D;
@@ -185,7 +209,7 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
 
     // Integrate to find the new parcel temperature
     IntegrationScheme<scalar>::integrationResult Tres =
-        td.cloud().TIntegrator().integrate(T_, dt, ap, bp);
+        td.cloud().TIntegrator().integrate(T, dt, ap, bp);
 
     // Enthalpy transfer
     // - Using average particle temperature
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
index 8506bb7c0a..4bc5180eff 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
@@ -208,11 +208,16 @@ protected:
         scalar calcHeatTransfer
         (
             TrackData& td,
-            const scalar dt,
-            const label cellI,
-            const scalar Sh,
-            scalar& htc,
-            scalar& dhTrans
+            const scalar dt,           // timestep
+            const label cellI,         // owner cell
+            const scalar d,            // diameter
+            const vector& U,           // velocity
+            const scalar rho,          // density
+            const scalar T,            // temperature
+            const scalar cp,           // specific heat capacity
+            const scalar Sh,           // additional enthalpy sources
+            scalar& htc,               // heat transfer coeff
+            scalar& dhTrans            // enthalpy transfer to carrier phase
         );
 
 
@@ -230,12 +235,12 @@ public:
         inline ThermoParcel
         (
             ThermoCloud<ParcelType>& owner,
-            const label typeId,
             const vector& position,
             const label cellI,
+            const label typeId,
+            const scalar nParticle0,
             const scalar d0,
             const vector& U0,
-            const scalar nParticle0,
             const constantProperties& constProps
         );
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
index c6f0f2b816..c14f1891b4 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
@@ -73,24 +73,24 @@ template<class ParcelType>
 inline Foam::ThermoParcel<ParcelType>::ThermoParcel
 (
     ThermoCloud<ParcelType>& owner,
-    const label typeId,
     const vector& position,
     const label cellI,
+    const label typeId,
+    const scalar nParticle0,
     const scalar d0,
     const vector& U0,
-    const scalar nParticle0,
     const constantProperties& constProps
 )
 :
     KinematicParcel<ParcelType>
     (
         owner,
-        typeId,
         position,
         cellI,
+        typeId,
+        nParticle0,
         d0,
         U0,
-        nParticle0,
         constProps
     ),
     T_(constProps.T0()),
@@ -178,16 +178,16 @@ inline Foam::scalar Foam::ThermoParcel<ParcelType>::T() const
 
 
 template<class ParcelType>
-inline Foam::scalar& Foam::ThermoParcel<ParcelType>::T()
+inline Foam::scalar Foam::ThermoParcel<ParcelType>::cp() const
 {
-    return T_;
+    return cp_;
 }
 
 
 template<class ParcelType>
-inline Foam::scalar Foam::ThermoParcel<ParcelType>::cp() const
+inline Foam::scalar& Foam::ThermoParcel<ParcelType>::T()
 {
-    return cp_;
+    return T_;
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
index 08433679bb..d4f30ce917 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
@@ -140,13 +140,13 @@ Foam::Ostream& Foam::operator<<
 {
     if (os.format() == IOstream::ASCII)
     {
-        os  << static_cast<const KinematicParcel<ParcelType>& >(p)
+        os  << static_cast<const KinematicParcel<ParcelType>&>(p)
             << token::SPACE << p.T()
             << token::SPACE << p.cp();
     }
     else
     {
-        os  << static_cast<const KinematicParcel<ParcelType>& >(p);
+        os  << static_cast<const KinematicParcel<ParcelType>&>(p);
         os.write
         (
             reinterpret_cast<const char*>(&p.T_),
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C
index c0d438df24..d207887826 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C
@@ -41,24 +41,24 @@ namespace Foam
 Foam::basicKinematicParcel::basicKinematicParcel
 (
     KinematicCloud<basicKinematicParcel>& owner,
-    const label typeId,
     const vector& position,
     const label cellI,
+    const label typeId,
+    const scalar nParticle0,
     const scalar d0,
     const vector& U0,
-    const scalar nParticle0,
     const constantProperties& constProps
 )
 :
     KinematicParcel<basicKinematicParcel>
     (
         owner,
-        typeId,
         position,
         cellI,
+        typeId,
+        nParticle0,
         d0,
         U0,
-        nParticle0,
         constProps
     )
 {}
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H
index b5da2267e7..0e5733870f 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H
@@ -44,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                         Class basicKinematicParcel Declaration
+                   Class basicKinematicParcel Declaration
 \*---------------------------------------------------------------------------*/
 
 class basicKinematicParcel
@@ -64,12 +64,12 @@ public:
         basicKinematicParcel
         (
             KinematicCloud<basicKinematicParcel>& owner,
-            const label typeId,
             const vector& position,
             const label cellI,
+            const label typeId,
+            const scalar nParticle0,
             const scalar d0,
             const vector& U0,
-            const scalar nParticle0,
             const constantProperties& constProps
         );
 
@@ -90,8 +90,7 @@ public:
 
 
     //- Destructor
-
-        virtual ~basicKinematicParcel();
+    virtual ~basicKinematicParcel();
 };
 
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C
index 0f7ce9173f..d200738319 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C
@@ -41,12 +41,12 @@ namespace Foam
 Foam::basicReactingMultiphaseParcel::basicReactingMultiphaseParcel
 (
     ReactingMultiphaseCloud<basicReactingMultiphaseParcel>& owner,
-    const label typeId,
     const vector& position,
     const label cellI,
+    const label typeId,
+    const scalar nParticle0,
     const scalar d0,
     const vector& U0,
-    const scalar nParticle0,
     const scalarField& YGas0,
     const scalarField& YLiquid0,
     const scalarField& YSolid0,
@@ -57,12 +57,12 @@ Foam::basicReactingMultiphaseParcel::basicReactingMultiphaseParcel
     ReactingMultiphaseParcel<basicReactingMultiphaseParcel>
     (
         owner,
-        typeId,
         position,
         cellI,
+        typeId,
+        nParticle0,
         d0,
         U0,
-        nParticle0,
         YGas0,
         YLiquid0,
         YSolid0,
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H
index bb5053ff74..cc537e5638 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H
@@ -64,12 +64,12 @@ public:
         basicReactingMultiphaseParcel
         (
              ReactingMultiphaseCloud<basicReactingMultiphaseParcel>& owner,
-             const label typeId,
              const vector& position,
              const label cellI,
+             const label typeId,
+             const scalar nParticle0,
              const scalar d0,
              const vector& U0,
-             const scalar nParticle0,
              const scalarField& YGas0,
              const scalarField& YLiquid0,
              const scalarField& YSolid0,
@@ -93,7 +93,7 @@ public:
         }
 
 
-    // Destructor
+    //- Destructor
     virtual ~basicReactingMultiphaseParcel();
 };
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.C
index 722c572e43..72ac1f4842 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.C
@@ -41,12 +41,12 @@ namespace Foam
 Foam::basicReactingParcel::basicReactingParcel
 (
     ReactingCloud<basicReactingParcel>& owner,
-    const label typeId,
     const vector& position,
     const label cellI,
+    const label typeId,
+    const scalar nParticle0,
     const scalar d0,
     const vector& U0,
-    const scalar nParticle0,
     const scalarField& Y0,
     const constantProperties& constProps
 )
@@ -54,12 +54,12 @@ Foam::basicReactingParcel::basicReactingParcel
     ReactingParcel<basicReactingParcel>
     (
         owner,
-        typeId,
         position,
         cellI,
+        typeId,
+        nParticle0,
         d0,
         U0,
-        nParticle0,
         Y0,
         constProps
     )
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H
index 008a33b25b..fae88a2da7 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H
@@ -64,12 +64,12 @@ public:
         basicReactingParcel
         (
             ReactingCloud<basicReactingParcel>& owner,
-            const label typeId,
             const vector& position,
             const label cellI,
+            const label typeId,
+            const scalar nParticle0,
             const scalar d0,
             const vector& U0,
-            const scalar nParticle0,
             const scalarField& Y0,
             const constantProperties& constProps
         );
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C
index 76a575d1de..095b217aca 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C
@@ -41,24 +41,24 @@ namespace Foam
 Foam::basicThermoParcel::basicThermoParcel
 (
     ThermoCloud<basicThermoParcel>& owner,
-    const label typeId,
     const vector position,
     const label cellI,
+    const label typeId,
+    const scalar nParticle0,
     const scalar d0,
     const vector U0,
-    const scalar nParticle0,
     const constantProperties& constProps
 )
 :
     ThermoParcel<basicThermoParcel>
     (
         owner,
-        typeId,
         position,
         cellI,
+        typeId,
+        nParticle0,
         d0,
         U0,
-        nParticle0,
         constProps
     )
 {}
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
index c55471d3d1..ec74d2add8 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
@@ -44,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                         Class basicThermoParcel Declaration
+                      Class basicThermoParcel Declaration
 \*---------------------------------------------------------------------------*/
 
 class basicThermoParcel
@@ -63,12 +63,12 @@ public:
        basicThermoParcel
        (
             ThermoCloud<basicThermoParcel>& owner,
-            const label typeId,
             const vector position,
             const label cellI,
+            const label typeId,
+            const scalar nParticle0,
             const scalar d0,
             const vector U0,
-            const scalar nParticle0,
             const constantProperties& constProps
         );
 
@@ -87,9 +87,8 @@ public:
         }
 
 
-    // Destructors
-
-        virtual ~basicThermoParcel();
+    //- Destructor
+    virtual ~basicThermoParcel();
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
index f405b9c54e..6d3cd51f65 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
@@ -26,7 +26,7 @@ Class
     Foam::polynomial
 
 Description
-    Templated polynomial container data entry. Items are stored in a list of
+    Polynomial container data entry for scalars. Items are stored in a list of
     Tuple2's. Data is input in the form, e.g. for an entry <entryName> that
     describes y = x^2 + 2x^3
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
index 4bc06eaf84..d71e98d2b3 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
@@ -241,7 +241,7 @@ Foam::label Foam::CompositionModel<CloudType>::localId
 
 
 template<class CloudType>
-Foam::label Foam::CompositionModel<CloudType>::localToGlobalGaslId
+Foam::label Foam::CompositionModel<CloudType>::localToGlobalGasId
 (
     const label phaseI,
     const label id
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
index fc01732314..f6a41acf0b 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
@@ -188,7 +188,7 @@ public:
                 label localId(const label phaseI, const word& cmptName) const;
 
                 //- Return global gas id of component given local id
-                label localToGlobalGaslId
+                label localToGlobalGasId
                 (
                     const label phaseI,
                     const label id
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
index 830c4d7f1d..d1c3e8b8a8 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
@@ -135,13 +135,13 @@ void Foam::LiquidEvaporation<CloudType>::calculate
 (
     const scalar dt,
     const label cellI,
+    const scalar d,
     const scalar T,
     const scalar pc,
-    const scalar d,
     const scalar Tc,
     const scalar nuc,
     const vector& Ur,
-    scalarList& dMass
+    scalarField& dMassPC
 ) const
 {
     // construct carrier phase species volume fractions for cell, cellI
@@ -184,7 +184,7 @@ void Foam::LiquidEvaporation<CloudType>::calculate
         scalar Ni = max(kc*(Cs - Cinf), 0.0);
 
         // mass transfer [kg]
-        dMass[lid] += Ni*A*liquids_->properties()[lid].W()*dt;
+        dMassPC[lid] += Ni*A*liquids_->properties()[lid].W()*dt;
     }
 }
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
index c70c081e90..408fb3d06b 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
@@ -41,7 +41,7 @@ Description
 namespace Foam
 {
 /*---------------------------------------------------------------------------*\
-                       Class LiquidEvaporation Declaration
+                     Class LiquidEvaporation Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class CloudType>
@@ -105,13 +105,13 @@ public:
         (
             const scalar dt,
             const label cellI,
+            const scalar d,
             const scalar T,
             const scalar pc,
-            const scalar d,
             const scalar Tc,
             const scalar nuc,
             const vector& Ur,
-            scalarList& dMass
+            scalarField& dMassPC
         ) const;
 };
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
index 7ecb03c773..ee3779b22e 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
@@ -66,7 +66,7 @@ void Foam::NoPhaseChange<CloudType>::calculate
     const scalar,
     const scalar,
     const vector&,
-    scalarList&
+    scalarField&
 ) const
 {
     // Nothing to do...
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
index e1ec25dd5e..6419f127ff 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
@@ -74,13 +74,13 @@ public:
         (
             const scalar dt,
             const label cellI,
+            const scalar d,
             const scalar T,
             const scalar pc,
-            const scalar d,
             const scalar Tc,
             const scalar nuc,
             const vector& Ur,
-            scalarList& dMass
+            scalarField& dMassPC
         ) const;
 };
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
index 32e44a960f..b8ebc644b0 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
@@ -140,13 +140,13 @@ public:
         (
             const scalar dt,
             const label cellI,
+            const scalar d,
             const scalar T,
             const scalar pc,
-            const scalar d,
             const scalar Tc,
             const scalar nuc,
             const vector& Ur,
-            scalarList& dMass
+            scalarField& dMassPC
         ) const = 0;
 };
 
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C
index 0630158e28..53eecf01f9 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C
@@ -69,12 +69,12 @@ Foam::scalar Foam::NoSurfaceReaction<CloudType>::calculate
     const scalarField&,
     const scalarField&,
     const scalarField&,
-    const scalarList&,
-    const scalarList&,
+    const scalarField&,
+    const scalarField&,
     scalarField&,
     scalarField&,
     scalarField&,
-    scalarList&
+    scalarField&
 ) const
 {
     // do nothing
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
index 6566f60456..d3c99ebd5d 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
@@ -87,12 +87,12 @@ public:
             const scalarField& YGas,
             const scalarField& YLiquid,
             const scalarField& YSolid,
-            const scalarList& YMixture,
-            const scalarList& dMassVolatile,
+            const scalarField& YMixture,
+            const scalarField& dMassVolatile,
             scalarField& dMassGas,
             scalarField& dMassLiquid,
             scalarField& dMassSolid,
-            scalarList& dMassSRCarrier
+            scalarField& dMassSRCarrier
         ) const;
 };
 
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
index 269c37de37..2deacb3465 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
@@ -42,7 +42,6 @@ SourceFiles
 #include "runTimeSelectionTables.H"
 
 #include "scalarField.H"
-#include "scalarList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -146,12 +145,12 @@ public:
             const scalarField& YGas,
             const scalarField& YLiquid,
             const scalarField& YSolid,
-            const scalarList& YMixture,
-            const scalarList& dMassVolatile,
+            const scalarField& YMixture,
+            const scalarField& dMassVolatile,
             scalarField& dMassGas,
             scalarField& dMassLiquid,
             scalarField& dMassSolid,
-            scalarList& dMassSRCarrier
+            scalarField& dMassSRCarrier
         ) const = 0;
 };
 

From ad350c504faa99d5fabd39c7de818ef1f1cbc5c4 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 6 Apr 2009 16:32:45 +0100
Subject: [PATCH 044/175] cosmetics

---
 .../combustion/dieselFoam/aachenBomb/system/fvSchemes  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes
index 5ed3bb30fa..fa4f6b47e3 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes
+++ b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes
@@ -35,7 +35,12 @@ divSchemes
     div(phi,k)      Gauss limitedLinear 1;
     div(phi,epsilon) Gauss limitedLinear 1;
     div(phi,Yi_h)   Gauss upwind;
-    div(phi,fu_ft_h) Gauss multivariateSelection { fu limitedLinear 1 ; ft limitedLinear 1 ; h limitedLinear 1 ; };
+    div(phi,fu_ft_h) Gauss multivariateSelection
+    {
+        fu limitedLinear 1;
+        ft limitedLinear 1;
+        h limitedLinear 1;
+    };
     div((muEff*dev2(grad(U).T()))) Gauss linear;
 }
 
@@ -64,7 +69,8 @@ snGradSchemes
 
 fluxRequired
 {
-    p               ;
+    default         no;
+    p;
 }
 
 

From 26aef1ae5a33e6caad74e0250bed8ad41184c66c Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 14 Apr 2009 12:48:02 +0100
Subject: [PATCH 045/175] bugfix: missed cloud() when referencing composition()

---
 .../parcels/Templates/ReactingParcel/ReactingParcel.C           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index 66bc6242b1..e7a2a71152 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -200,7 +200,7 @@ void Foam::ReactingParcel<ParcelType>::calc
             // Absorb parcel into carrier phase
             forAll(Y_, i)
             {
-                label id = td.composition().localToGlobalGasId(0, i);
+                label id = td.cloud().composition().localToGlobalGasId(0, i);
                 td.cloud().rhoTrans(id)[cellI] += np0*mass1*Y_[i];
             }
             td.cloud().UTrans()[cellI] += np0*mass1*U1;

From a1000b51b115a7d206a74e19caf2ba4f28c97234 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 14 Apr 2009 12:57:27 +0100
Subject: [PATCH 046/175] improved error handling

---
 .../SinglePhaseMixture/SinglePhaseMixture.C              | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.C
index bed2f1f94b..a2ae2053d1 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.C
@@ -31,7 +31,14 @@ License
 template<class CloudType>
 void Foam::SinglePhaseMixture<CloudType>::constructIds()
 {
-    if (this->phaseProps().size() != 1)
+    if (this->phaseProps().size() == 0)
+    {
+        FatalErrorIn
+        (
+            "void Foam::SinglePhaseMixture<CloudType>::constructIds()"
+        )   << "Phase list is empty" << nl << exit(FatalError);
+    }
+    else if (this->phaseProps().size() > 1)
     {
         FatalErrorIn
         (

From 37aec66281563e17124b888fcd3b5057d5f65834 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 14 Apr 2009 13:11:43 +0100
Subject: [PATCH 047/175] formatting

---
 .../SurfaceReactionModel/SurfaceReactionModel.C                  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C
index c9fa9c4fce..79e953e873 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C
@@ -62,6 +62,7 @@ Foam::SurfaceReactionModel<CloudType>::~SurfaceReactionModel()
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
 template<class CloudType>
 const CloudType& Foam::SurfaceReactionModel<CloudType>::owner() const
 {

From e1cb1a379d89b44d0765eebc7d435326391aba07 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 14 Apr 2009 14:05:47 +0100
Subject: [PATCH 048/175] better error messages

---
 .../phaseProperties/phasePropertiesIO.C         | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
index 776a9b4d57..3858f69b12 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
@@ -42,11 +42,13 @@ Foam::phaseProperties::phaseProperties(Istream& is)
 
     dictionaryEntry phaseInfo(dictionary::null, is);
 
-    if (!phaseInfo.isDict())
+    if (phaseInfo.size() == 0)
     {
-        FatalErrorIn("Foam::phaseProperties::phaseProperties(Istream& is)")
-            << "Phase properties should be given in dictionary entries"
-            << nl << exit(FatalError);
+        FatalErrorIn
+        (
+            "Foam::Istream& Foam::operator>>(Istream& is, phaseProperties& pp)"
+        )   << "No phases identified. Please define each phase property as "
+            << "a dictionary entry" << nl << exit(FatalError);
     }
 
     label nComponents = phaseInfo.size();
@@ -85,16 +87,17 @@ Foam::Istream& Foam::operator>>(Istream& is, phaseProperties& pp)
 
     dictionaryEntry phaseInfo(dictionary::null, is);
 
-    if (!phaseInfo.isDict())
+    if (phaseInfo.size() == 0)
     {
         FatalErrorIn
         (
             "Foam::Istream& Foam::operator>>(Istream& is, phaseProperties& pp)"
-        )   << "Phase properties should be given in dictionary entries"
-            << nl << exit(FatalError);
+        )   << "No phases identified. Please define each phase property as "
+            << "a dictionary entry" << nl << exit(FatalError);
     }
 
     label nComponents = phaseInfo.size();
+
     pp.names_.setSize(nComponents);
     pp.Y_.setSize(nComponents);
 

From 79488f6df8be52f702d4b7e7579e6a1d2be2dc74 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 14 Apr 2009 14:06:45 +0100
Subject: [PATCH 049/175] added missing globalGasIds_ in constructor
 initialisers + error msg

---
 .../phaseProperties/phaseProperties.C         | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
index 99d6fcfd0d..c753d31d56 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
@@ -128,6 +128,25 @@ void Foam::phaseProperties::setGlobalGasIds
                 break;
             }
         }
+        if (globalGasIds_[i] == -1)
+        {
+            wordList gasNames(YGas.size());
+            forAll(YGas, gasI)
+            {
+                gasNames[gasI] = YGas[gasI].name();
+            }
+
+            FatalErrorIn
+            (
+                "void Foam::phaseProperties::setGlobalGasIds"
+                "("
+                    "const PtrList<volScalarField>&"
+                ")"
+            )   << "Could not find gas specie " << names_[i]
+                << " in species list" <<  nl
+                << "Available species are: " << nl << gasNames << nl
+                << exit(FatalError);
+        }
     }
 }
 
@@ -195,7 +214,8 @@ Foam::phaseProperties::phaseProperties()
     stateLabel_("(unknown)"),
     names_(0),
     Y_(0),
-    globalIds_(0)
+    globalIds_(0),
+    globalGasIds_(0)
 {}
 
 
@@ -205,7 +225,8 @@ Foam::phaseProperties::phaseProperties(const phaseProperties& pp)
     stateLabel_(pp.stateLabel_),
     names_(pp.names_),
     Y_(pp.Y_),
-    globalIds_(pp.globalIds_)
+    globalIds_(pp.globalIds_),
+    globalGasIds_(pp.globalGasIds_)
 {}
 
 

From 66c2cfa1b6cd7446a11a6242dd9a3fe437ebad1c Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 14 Apr 2009 15:28:10 +0100
Subject: [PATCH 050/175] moved constant properties to be read from their own
 sub-dict

---
 .../KinematicParcel/KinematicParcel.H         |  8 +++++++-
 .../KinematicParcel/KinematicParcelI.H        | 20 +++++++++++++++----
 .../ReactingMultiphaseParcel.H                |  2 +-
 .../ReactingMultiphaseParcelI.H               | 11 ++++++----
 .../Templates/ReactingParcel/ReactingParcel.H |  2 +-
 .../ReactingParcel/ReactingParcelI.H          | 10 +++++-----
 .../Templates/ThermoParcel/ThermoParcel.H     |  2 +-
 .../Templates/ThermoParcel/ThermoParcelI.H    | 12 +++++------
 8 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index 1717ee1feb..2e816bd6ad 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -86,6 +86,9 @@ public:
     {
         // Private data
 
+            //- Constant properties dictionary
+            const dictionary dict_;
+
             //- Particle density [kg/m3] (constant)
             const scalar rho0_;
 
@@ -99,10 +102,13 @@ public:
     public:
 
         //- Constructor
-        constantProperties(const dictionary& dict);
+        constantProperties(const dictionary& parentDict);
 
         // Member functions
 
+            //- Return const access to the constant properties dictionary
+            inline const dictionary& dict() const;
+
             //- Return const access to the particle density
             inline scalar rho0() const;
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
index 8582792460..ca3e5015d0 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
@@ -29,12 +29,16 @@ License
 template <class ParcelType>
 inline Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties
 (
-    const dictionary& dict
+    const dictionary& parentDict
 )
 :
-    rho0_(dimensionedScalar(dict.lookup("rho0")).value()),
-    minParticleMass_(dimensionedScalar(dict.lookup("minParticleMass")).value()),
-    Cvm_(dimensionedScalar(dict.lookup("Cvm")).value())
+    dict_(parentDict.subDict("constantProperties")),
+    rho0_(dimensionedScalar(dict_.lookup("rho0")).value()),
+    minParticleMass_
+    (
+        dimensionedScalar(dict_.lookup("minParticleMass")).value()
+    ),
+    Cvm_(dimensionedScalar(dict_.lookup("Cvm")).value())
 {}
 
 
@@ -88,6 +92,14 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
 
 // * * * * * * * * * constantProperties Member Functions * * * * * * * * * * //
 
+template <class ParcelType>
+inline const Foam::dictionary&
+Foam::KinematicParcel<ParcelType>::constantProperties::dict() const
+{
+    return dict_;
+}
+
+
 template <class ParcelType>
 inline Foam::scalar
 Foam::KinematicParcel<ParcelType>::constantProperties::rho0() const
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
index 5053c106b4..f1bace3a8b 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -93,7 +93,7 @@ public:
     public:
 
         //- Constructor
-        constantProperties(const dictionary& dict);
+        constantProperties(const dictionary& parentDict);
 
         // Access
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
index d7d3cf1781..9709da663d 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
@@ -30,12 +30,15 @@ template<class ParcelType>
 inline Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::
 constantProperties
 (
-    const dictionary& dict
+    const dictionary& parentDict
 )
 :
-    ReactingParcel<ParcelType>::constantProperties(dict),
-    LDevol_(dimensionedScalar(dict.lookup("LDevol")).value()),
-    hRetentionCoeff_(dimensionedScalar(dict.lookup("hRetentionCoeff")).value())
+    ReactingParcel<ParcelType>::constantProperties(parentDict),
+    LDevol_(dimensionedScalar(this->dict().lookup("LDevol")).value()),
+    hRetentionCoeff_
+    (
+        dimensionedScalar(this->dict().lookup("hRetentionCoeff")).value()
+    )
 {}
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index 52b9c881e7..f876fa6401 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -93,7 +93,7 @@ public:
     public:
 
         //- Constructor
-        constantProperties(const dictionary& dict);
+        constantProperties(const dictionary& parentDict);
 
         // Access
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
index da808caee8..0cc40887d4 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
@@ -29,13 +29,13 @@ License
 template<class ParcelType>
 inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties
 (
-    const dictionary& dict
+    const dictionary& parentDict
 )
 :
-    ThermoParcel<ParcelType>::constantProperties(dict),
-    constantVolume_(dict.lookup("constantVolume")),
-    Tbp_(dimensionedScalar(dict.lookup("Tbp")).value()),
-    Tvap_(dimensionedScalar(dict.lookup("Tvap")).value())
+    ThermoParcel<ParcelType>::constantProperties(parentDict),
+    constantVolume_(this->dict().lookup("constantVolume")),
+    Tbp_(dimensionedScalar(this->dict().lookup("Tbp")).value()),
+    Tvap_(dimensionedScalar(this->dict().lookup("Tvap")).value())
 {}
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
index 4bc5180eff..c7ba92ab84 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
@@ -98,7 +98,7 @@ public:
     public:
 
         // Constructors
-        constantProperties(const dictionary& dict);
+        constantProperties(const dictionary& parentDict);
 
         // Member functions
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
index c14f1891b4..1a2c0326d3 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
@@ -29,14 +29,14 @@ License
 template<class ParcelType>
 inline Foam::ThermoParcel<ParcelType>::constantProperties::constantProperties
 (
-    const dictionary& dict
+    const dictionary& parentDict
 )
 :
-    KinematicParcel<ParcelType>::constantProperties(dict),
-    T0_(dimensionedScalar(dict.lookup("T0")).value()),
-    cp0_(dimensionedScalar(dict.lookup("cp0")).value()),
-    epsilon0_(dimensionedScalar(dict.lookup("epsilon0")).value()),
-    f0_(dimensionedScalar(dict.lookup("f0")).value())
+    KinematicParcel<ParcelType>::constantProperties(parentDict),
+    T0_(dimensionedScalar(this->dict().lookup("T0")).value()),
+    cp0_(dimensionedScalar(this->dict().lookup("cp0")).value()),
+    epsilon0_(dimensionedScalar(this->dict().lookup("epsilon0")).value()),
+    f0_(dimensionedScalar(this->dict().lookup("f0")).value())
 {}
 
 

From ef39baacfc59f80c78acba8169efbe961188b05a Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 14 Apr 2009 17:06:44 +0100
Subject: [PATCH 051/175] re-packaged particle forces into class

---
 src/lagrangian/intermediate/Make/files        |   4 +
 .../Templates/KinematicCloud/KinematicCloud.C |   5 +-
 .../Templates/KinematicCloud/KinematicCloud.H |  24 +--
 .../KinematicCloud/KinematicCloudI.H          |  32 ++--
 .../KinematicParcel/KinematicParcel.C         |  23 +--
 .../KinematicParcel/KinematicParcel.H         |   6 -
 .../KinematicParcel/KinematicParcelI.H        |  11 +-
 .../particleForces/particleForces.C           | 156 ++++++++++++++++++
 .../particleForces/particleForces.H           | 156 ++++++++++++++++++
 9 files changed, 338 insertions(+), 79 deletions(-)
 create mode 100644 src/lagrangian/intermediate/particleForces/particleForces.C
 create mode 100644 src/lagrangian/intermediate/particleForces/particleForces.H

diff --git a/src/lagrangian/intermediate/Make/files b/src/lagrangian/intermediate/Make/files
index 93572202fc..4b371547f8 100644
--- a/src/lagrangian/intermediate/Make/files
+++ b/src/lagrangian/intermediate/Make/files
@@ -76,6 +76,10 @@ submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C
 IntegrationScheme/makeIntegrationSchemes.C
 
 
+/* particle forces */
+particleForces/particleForces.C
+
+
 /* phase properties */
 phaseProperties/phaseProperties/phaseProperties.C
 phaseProperties/phaseProperties/phasePropertiesIO.C
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index eeee670009..ecbb926651 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -101,11 +101,8 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
     U_(U),
     mu_(mu),
     g_(g),
+    forces_(mesh_, particleProperties_, g_.value()),
     interpolationSchemes_(particleProperties_.subDict("interpolationSchemes")),
-    forcesDict_(particleProperties_.subDict("forces")),
-    forceGravity_(forcesDict_.lookup("gravity")),
-    forceVirtualMass_(forcesDict_.lookup("virtualMass")),
-    forcePressureGradient_(forcesDict_.lookup("pressureGradient")),
     dispersionModel_
     (
         DispersionModel<KinematicCloud<ParcelType> >::New
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index 7f39808f83..785b981919 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -51,7 +51,7 @@ SourceFiles
 #include "fvMesh.H"
 #include "volFields.H"
 #include "fvMatrices.H"
-#include "fvm.H"
+#include "particleForces.H"
 
 #include "IntegrationSchemesFwd.H"
 
@@ -129,25 +129,13 @@ class KinematicCloud
             const dimensionedVector& g_;
 
 
+        //- Optional particle forces
+        particleForces forces_;
+
         //- Interpolation schemes dictionary
         dictionary interpolationSchemes_;
 
 
-        // Forces to include in particle motion evaluation
-
-            //- Dictionary of forces
-            dictionary forcesDict_;
-
-            //- Gravity
-            Switch forceGravity_;
-
-            //- Virtual mass
-            Switch forceVirtualMass_;
-
-            //- Pressure gradient
-            Switch forcePressureGradient_;
-
-
         // References to the cloud sub-models
 
             //- Dispersion model
@@ -261,6 +249,10 @@ public:
                 inline const dimensionedVector& g() const;
 
 
+            //- Optional particle forces
+            inline const particleForces& forces() const;
+
+
             // Interpolations
 
                 //- Return reference to the interpolation dictionary
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index adae027b87..dde35a4298 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -24,6 +24,8 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "fvmSup.H"
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class ParcelType>
@@ -100,6 +102,14 @@ Foam::KinematicCloud<ParcelType>::g() const
 }
 
 
+template<class ParcelType>
+inline const Foam::particleForces&
+Foam::KinematicCloud<ParcelType>::forces() const
+{
+    return forces_;
+}
+
+
 template<class ParcelType>
 inline const Foam::dictionary&
 Foam::KinematicCloud<ParcelType>::interpolationSchemes() const
@@ -108,28 +118,6 @@ Foam::KinematicCloud<ParcelType>::interpolationSchemes() const
 }
 
 
-template<class ParcelType>
-inline Foam::Switch Foam::KinematicCloud<ParcelType>::forceGravity() const
-{
-    return forceGravity_;
-}
-
-
-template<class ParcelType>
-inline Foam::Switch Foam::KinematicCloud<ParcelType>::forceVirtualMass() const
-{
-    return forceVirtualMass_;
-}
-
-
-template<class ParcelType>
-inline Foam::Switch Foam::KinematicCloud<ParcelType>::
-forcePressureGradient() const
-{
-    return forcePressureGradient_;
-}
-
-
 template<class ParcelType>
 inline const Foam::DispersionModel<Foam::KinematicCloud<ParcelType> >&
 Foam::KinematicCloud<ParcelType>::dispersion() const
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index 007e5aac47..f318c5c73d 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -142,27 +142,8 @@ const Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
     // Return linearised term from drag model
     Cud = td.cloud().drag().Cu(U - Uc_, d, rhoc_, rho, muc_);
 
-    // Initialise total force (per unit mass)
-    vector Ftot = vector::zero;
-
-    // Gravity force
-    if (td.cloud().forceGravity())
-    {
-        Ftot += td.g()*(1 - rhoc_/rho);
-    }
-
-    // Virtual mass force
-    if (td.cloud().forceVirtualMass())
-    {
-//        Ftot += td.constProps().Cvm()*rhoc_/rho*d(Uc - U)/dt;
-    }
-
-    // Pressure gradient force
-    if (td.cloud().forcePressureGradient())
-    {
-//        const vector& delta = td.cloud().mesh().deltaCoeffs()[cellI];
-//        Ftot += rhoc_/rho*(U & (delta^Uc_));
-    }
+    // Calculate particle forces
+    vector Ftot = td.cloud().forces().calc(cellI, dt, rhoc_, rho, Uc_, U);
 
 
     // New particle velocity
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index 2e816bd6ad..c2ed55c2c0 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -95,9 +95,6 @@ public:
             //- Minimum particle mass [kg]
             const scalar minParticleMass_;
 
-            //- Virtual mass coefficient []
-            const scalar Cvm_;
-
 
     public:
 
@@ -114,9 +111,6 @@ public:
 
             //- Return const access to the minimum particle mass
             inline scalar minParticleMass() const;
-
-            //- Return const access to the virtual mass coefficient
-            inline scalar Cvm() const;
     };
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
index ca3e5015d0..edf4b0771e 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
@@ -37,8 +37,7 @@ inline Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties
     minParticleMass_
     (
         dimensionedScalar(dict_.lookup("minParticleMass")).value()
-    ),
-    Cvm_(dimensionedScalar(dict_.lookup("Cvm")).value())
+    )
 {}
 
 
@@ -116,14 +115,6 @@ Foam::KinematicParcel<ParcelType>::constantProperties::minParticleMass() const
 }
 
 
-template <class ParcelType>
-inline Foam::scalar
-Foam::KinematicParcel<ParcelType>::constantProperties::Cvm() const
-{
-    return Cvm_;
-}
-
-
 // * * * * * * * * * * * trackData Member Functions  * * * * * * * * * * * * //
 
 template <class ParcelType>
diff --git a/src/lagrangian/intermediate/particleForces/particleForces.C b/src/lagrangian/intermediate/particleForces/particleForces.C
new file mode 100644
index 0000000000..44d758351f
--- /dev/null
+++ b/src/lagrangian/intermediate/particleForces/particleForces.C
@@ -0,0 +1,156 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "particleForces.H"
+#include "fvMesh.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::particleForces::particleForces
+(
+    const fvMesh& mesh,
+    const dictionary& dict,
+    const vector& g
+)
+:
+    mesh_(mesh),
+    dict_(dict.subDict("particleForces")),
+    g_(g),
+    gravity_(dict_.lookup("gravity")),
+    virtualMass_(dict_.lookup("virtualMass")),
+    Cvm_(0.0),
+    pressureGradient_(dict_.lookup("pressureGradient")),
+    gradUName_("unknown_gradUName")
+{
+    if (gravity_)
+    {
+        dict_.lookup("Cvm") >> Cvm_;
+    }
+
+    if (pressureGradient_)
+    {
+        dict_.lookup("gradU") >> gradUName_;
+    }
+}
+
+
+Foam::particleForces::particleForces(const particleForces& f)
+:
+    mesh_(f.mesh_),
+    dict_(f.dict_),
+    g_(f.g_),
+    gravity_(f.gravity_),
+    virtualMass_(f.virtualMass_),
+    Cvm_(f.Cvm_),
+    pressureGradient_(f.pressureGradient_),
+    gradUName_(f.gradUName_)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::particleForces::~particleForces()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+const Foam::dictionary& Foam::particleForces::dict() const
+{
+    return dict_;
+}
+
+
+const Foam::vector& Foam::particleForces::g() const
+{
+    return g_;
+}
+
+
+Foam::Switch Foam::particleForces::gravity() const
+{
+    return gravity_;
+}
+
+
+Foam::Switch Foam::particleForces::virtualMass() const
+{
+    return virtualMass_;
+}
+
+
+Foam::Switch Foam::particleForces::pressureGradient() const
+{
+    return pressureGradient_;
+}
+
+
+const Foam::word& Foam::particleForces::gradUName() const
+{
+    return gradUName_;
+}
+
+
+Foam::vector Foam::particleForces::calc
+(
+    const label cellI,
+    const scalar dt,
+    const scalar rhoc,
+    const scalar rho,
+    const vector& Uc,
+    const vector& U
+) const
+{
+    vector Ftot = vector::zero;
+
+    // Gravity force
+    if (gravity_)
+    {
+        Ftot += g_*(1.0 - rhoc/rho);
+    }
+
+    // Virtual mass force
+    if (virtualMass_)
+    {
+        notImplemented("Foam::particleForces::calc(...) - virtualMass force");
+//        Ftot += Cvm_*rhoc/rho*d(Uc - U)/dt;
+    }
+
+    // Pressure gradient force
+    if (pressureGradient_)
+    {
+        const volSymmTensorField& gradU =
+            mesh_.lookupObject<volSymmTensorField>(gradUName_);
+        Ftot += rhoc/rho*(U & gradU[cellI]);
+    }
+
+    return Ftot;
+}
+
+
+// ************************************************************************* //
+
diff --git a/src/lagrangian/intermediate/particleForces/particleForces.H b/src/lagrangian/intermediate/particleForces/particleForces.H
new file mode 100644
index 0000000000..8258e35be2
--- /dev/null
+++ b/src/lagrangian/intermediate/particleForces/particleForces.H
@@ -0,0 +1,156 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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::particleForces
+
+Description
+    Particle forces
+
+SourceFiles
+    particleForces.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef particleForces_H
+#define particleForces_H
+
+#include "dictionary.H"
+#include "Switch.H"
+#include "vector.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward class declarations
+class fvMesh;
+
+/*---------------------------------------------------------------------------*\
+                      Class particleForces Declaration
+\*---------------------------------------------------------------------------*/
+
+class particleForces
+{
+    // Private data
+
+        //- Reference to the mesh database
+        const fvMesh& mesh_;
+
+        //- The particleForces dictionary
+        const dictionary& dict_;
+
+        //- Gravity
+        const vector g_;
+
+
+        // Forces to include in particle motion evaluation
+
+            //- Gravity
+            Switch gravity_;
+
+            //- Virtual mass
+            Switch virtualMass_;
+
+            //- Virtual mass force coefficient
+            scalar Cvm_;
+
+            //- Pressure gradient
+            Switch pressureGradient_;
+
+            //- Name of velocity gradient field for pressure gradient force
+            word gradUName_;
+
+
+public:
+
+    // Constructors
+
+        //- Construct from mesh, dictionary and gravity
+        particleForces
+        (
+            const fvMesh& mesh,
+            const dictionary& dict,
+            const vector& g
+        );
+
+        //- Construct copy
+        particleForces(const particleForces& f);
+
+
+    //- Destructor
+    ~particleForces();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return the particleForces dictionary
+            const dictionary& dict() const;
+
+            //- Return the gravity vector
+            const vector& g() const;
+
+            //- Return gravity force activate switch
+            Switch gravity() const;
+
+            //- Return virtual mass force activate switch
+            Switch virtualMass() const;
+
+            //- Return virtual mass force coefficient
+            Switch Cvm() const;
+
+            //- Return pressure gradient force activate switch
+            Switch pressureGradient() const;
+
+            //- Return the name of the velocity gradient field
+            const word& gradUName() const;
+
+
+       // Evaluation
+
+            //- Calculate the net particle force
+            vector calc
+            (
+                const label cellI,
+                const scalar dt,
+                const scalar rhoc,
+                const scalar rho,
+                const vector& Uc,
+                const vector& U
+            ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 3f4dae4695b6115e697c3e3985ca90d3cbbc60f6 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Thu, 16 Apr 2009 19:37:52 +0100
Subject: [PATCH 052/175] bugfix: added missing multiply by nParticle

---
 .../ReactingMultiphaseParcel/ReactingMultiphaseParcel.C      | 5 +++--
 .../parcels/Templates/ReactingParcel/ReactingParcel.C        | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 70d04a910e..7692c2011f 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -453,7 +453,7 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
         dMassDV[i] = YVolatile[i]*dMassTot;
     }
 
-    td.cloud().addToMassDevolatilisation(dMassTot);
+    td.cloud().addToMassDevolatilisation(this->nParticle_*dMassTot);
 
     return -dMassTot*td.constProps().LDevol();
 }
@@ -515,7 +515,8 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
 
     td.cloud().addToMassSurfaceReaction
     (
-        sum(dMassSRGas) + sum(dMassSRLiquid) + sum(dMassSRSolid)
+        this->nParticle_
+       *(sum(dMassSRGas) + sum(dMassSRLiquid) + sum(dMassSRSolid))
     );
 
     // Add enthalpy of consumed components to the carrier phase enthalpy
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index e7a2a71152..237b0dda39 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -274,7 +274,7 @@ Foam::scalar Foam::ReactingParcel<ParcelType>::calcPhaseChange
     scalar dMassTot = sum(dMassPC);
 
     // Add to cumulative phase change mass
-    td.cloud().addToMassPhaseChange(dMassTot);
+    td.cloud().addToMassPhaseChange(this->nParticle_*dMassTot);
 
     // Effective latent heat of vaporisation
     scalar LEff = td.cloud().composition().L(idPhase, YComponents, pc_, T);

From 2d96e32b1317d65d122765dc83bb05fe007d2a6a Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Sat, 25 Apr 2009 14:46:03 +0100
Subject: [PATCH 053/175] add region option

---
 .../utilities/postProcessing/sampling/sample/sample.C     | 3 ++-
 .../utilities/postProcessing/sampling/sample/sampleDict   | 8 ++++++++
 src/sampling/sampledSet/sampledSets/sampledSets.C         | 6 ++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/applications/utilities/postProcessing/sampling/sample/sample.C b/applications/utilities/postProcessing/sampling/sample/sample.C
index 2451522ffe..12864fdceb 100644
--- a/applications/utilities/postProcessing/sampling/sample/sample.C
+++ b/applications/utilities/postProcessing/sampling/sample/sample.C
@@ -97,10 +97,11 @@ using namespace Foam;
 int main(int argc, char *argv[])
 {
     timeSelector::addOptions();
+#   include "addRegionOption.H"
 #   include "setRootCase.H"
 #   include "createTime.H"
     instantList timeDirs = timeSelector::select0(runTime, args);
-#   include "createMesh.H"
+#   include "createNamedMesh.H"
 
     IOsampledSets sSets
     (
diff --git a/applications/utilities/postProcessing/sampling/sample/sampleDict b/applications/utilities/postProcessing/sampling/sample/sampleDict
index 559eb28436..4284b2878c 100644
--- a/applications/utilities/postProcessing/sampling/sample/sampleDict
+++ b/applications/utilities/postProcessing/sampling/sample/sampleDict
@@ -105,6 +105,14 @@ sets
         end         (2 0.51  0.005);
         nPoints     10;
     }
+
+    somePoints
+    {
+        type    cloud;
+        axis    xyz;
+        points  ((0.049 0.049 0.005)(0.051 0.049 0.005));
+    }
+
 );
 
 
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.C b/src/sampling/sampledSet/sampledSets/sampledSets.C
index 3f7b7a3323..4d71403277 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.C
@@ -236,8 +236,6 @@ Foam::sampledSets::sampledSets
     loadFromFiles_(loadFromFiles),
     outputPath_(fileName::null),
     searchEngine_(mesh_, true),
-//    pMeshPtr_(NULL),
-//    pInterpPtr_(NULL),
     fieldNames_(),
     interpolationScheme_(word::null),
     writeFormat_(word::null)
@@ -250,6 +248,10 @@ Foam::sampledSets::sampledSets
     {
         outputPath_ = mesh_.time().path()/name_;
     }
+    if (mesh_.name() != fvMesh::defaultRegion)
+    {
+        outputPath_ = outputPath_/mesh_.name();
+    }
 
     read(dict);
 }

From 48247a3d625c4b43960648c43559fcac6bfb38c6 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Mon, 27 Apr 2009 10:08:29 +0200
Subject: [PATCH 054/175] consistency update

- DynamicList gets append methods as per List
- misc cosmetic changes
---
 .../test/DynamicList/DynamicListTest.C        | 23 ++++++--
 applications/test/HashTable/hashTableTest.C   | 24 +++++---
 .../StaticHashTable/staticHashTableTest.C     | 25 ++++++---
 .../UIndirectListTest/UIndirectListTest.C     | 24 +++++---
 .../HashTables/HashPtrTable/HashPtrTableIO.C  |  4 +-
 .../HashTables/HashTable/HashTable.H          |  7 +++
 .../HashTables/HashTable/HashTableIO.C        | 18 ++++--
 .../StaticHashTable/StaticHashTableIO.C       |  4 +-
 .../LinkedLists/accessTypes/ILList/ILListIO.C |  4 +-
 .../LinkedLists/accessTypes/LList/LListIO.C   |  4 +-
 .../accessTypes/LPtrList/LPtrListIO.C         |  4 +-
 .../Lists/DynamicList/DynamicList.H           | 14 +++--
 .../Lists/DynamicList/DynamicListI.H          | 34 ++++++++++--
 .../containers/Lists/FixedList/FixedListIO.C  |  4 +-
 src/OpenFOAM/containers/Lists/List/List.C     | 55 -------------------
 src/OpenFOAM/containers/Lists/List/List.H     | 13 ++---
 src/OpenFOAM/containers/Lists/List/ListI.H    | 36 +++++++++++-
 src/OpenFOAM/containers/Lists/List/ListIO.C   |  4 +-
 .../containers/Lists/PtrList/PtrListIO.C      |  4 +-
 .../SphericalTensor/SphericalTensorI.H        |  2 +-
 .../primitives/SymmTensor/SymmTensorI.H       | 28 +++-------
 .../SymmTensor/symmTensor/symmTensor.C        |  9 ++-
 src/OpenFOAM/primitives/Tensor/TensorI.H      | 30 +++-------
 .../primitives/Tensor/tensor/tensor.H         | 12 ++--
 24 files changed, 210 insertions(+), 176 deletions(-)

diff --git a/applications/test/DynamicList/DynamicListTest.C b/applications/test/DynamicList/DynamicListTest.C
index 324c5361bb..355c65605f 100644
--- a/applications/test/DynamicList/DynamicListTest.C
+++ b/applications/test/DynamicList/DynamicListTest.C
@@ -160,18 +160,33 @@ int main(int argc, char *argv[])
         << " " << lstB.size() << endl;
     Info<< "<dlD>" << dlD << "</dlD>" << nl << "sizes: "
         << " " << dlD.size() << "/" << dlD.capacity() << endl;
-    
+
     DynamicList<label,10> dlE1(10);
-    DynamicList<label> dlE2(dlE1);
+    DynamicList<label> dlE2(dlE1);   // construct dissimilar
 
     Info<< "<dlE1>" << dlE1 << "</dlE1>" << nl << "sizes: "
         << " " << dlE1.size() << "/" << dlE1.capacity() << endl;
     Info<< "<dlE2>" << dlE2 << "</dlE2>" << nl << "sizes: "
         << " " << dlE2.size() << "/" << dlE2.capacity() << endl;
 
-    dlE2.append(100);
+    for (label elemI=0; elemI < 5; ++elemI)
+    {
+        dlE1.append(4 - elemI);
+        dlE2.append(elemI);
+    }
+
     Info<< "<dlE2>" << dlE2 << "</dlE2>" << endl;
-    
+
+    DynamicList<label> dlE3(dlE2);   // construct identical
+    Info<< "<dlE3>" << dlE3 << "</dlE3>" << endl;
+
+    dlE3 = dlE1;   // assign dissimilar
+    Info<< "<dlE3>" << dlE3 << "</dlE3>" << endl;
+
+    dlE3 = dlE2;   // assign identical
+    Info<< "<dlE3>" << dlE3 << "</dlE3>" << endl;
+
+
     Info<< "\nEnd\n";
 
     return 0;
diff --git a/applications/test/HashTable/hashTableTest.C b/applications/test/HashTable/hashTableTest.C
index 8e3db2c9d7..25338a2bb7 100644
--- a/applications/test/HashTable/hashTableTest.C
+++ b/applications/test/HashTable/hashTableTest.C
@@ -39,7 +39,7 @@ using namespace Foam;
 
 int main()
 {
-    HASHTABLE_CLASS<double> table1(100);
+    HASHTABLE_CLASS<double> table1(13);
 
     table1.insert("aaa", 1.0);
     table1.insert("aba", 2.0);
@@ -56,7 +56,8 @@ int main()
     table1.erase("abs");
 
     Info<< "\ntable1 toc: " << table1.toc() << endl;
-    Info<< "\ntable1 [" << table1.size() << "] " << endl;
+    table1.printInfo(Info)
+        << "table1 [" << table1.size() << "] " << endl;
     forAllIter(HASHTABLE_CLASS<double>, table1, iter)
     {
         Info<< iter.key() << " => " << iter() << nl;
@@ -97,7 +98,7 @@ int main()
         << "transfer table1 -> table3 via the xfer() method" << nl;
 
     Info<< "\ntable1" << table1 << nl
-        << "\ntable2" << table1 << nl
+        << "\ntable2" << table2 << nl
         << "\ntable3" << table3 << nl;
 
     Info<< "\nerase table2 by iterator" << nl;
@@ -113,10 +114,14 @@ int main()
         << "\ntable3" << table3 << nl;
 
     table3.resize(1);
-    Info<< "\nresize(1) table3" << table3 << nl;
+    Info<< "\nresize(1) table3" << nl;
+    table3.printInfo(Info)
+        << table3 << nl;
 
     table3.resize(10000);
-    Info<< "\nresize(10000) table3" << table3 << nl;
+    Info<< "\nresize(10000) table3" << nl;
+    table3.printInfo(Info)
+        << table3 << nl;
 
     HASHTABLE_CLASS<double> table4;
 
@@ -134,26 +139,27 @@ int main()
     table1.erase(table1.begin());
     Info<< "removed an element - test table1 != table3 : "
         << (table1 != table3) << nl;
-    
+
     // insert a few things into table2
     table2.set("ada", 14.0);
     table2.set("aeq", 15.0);
     table2.set("aaw", 16.0);
     table2.set("abs", 17.0);
     table2.set("adx", 20.0);
-    
+
     Info<< "\ntable1" << table1 << nl
         << "\ntable2" << table2 << nl;
 
     label nErased = table1.erase(table2);
-    
+
     Info<< "\nerase table2 keys from table1 (removed "
         << nErased << " elements)" << nl
         << "\ntable1" << table1 << nl
         << "\ntable2" << table2 << nl;
 
 
-    Info<< "\nclearStorage table3 ... ";
+    Info<< "\ntable3" << table3
+        << "\nclearStorage table3 ... ";
     table3.clearStorage();
     Info<< table3 << nl;
 
diff --git a/applications/test/StaticHashTable/staticHashTableTest.C b/applications/test/StaticHashTable/staticHashTableTest.C
index 2060ec582c..c283fe9ba5 100644
--- a/applications/test/StaticHashTable/staticHashTableTest.C
+++ b/applications/test/StaticHashTable/staticHashTableTest.C
@@ -39,7 +39,7 @@ using namespace Foam;
 
 int main()
 {
-    HASHTABLE_CLASS<double> table1(100);
+    HASHTABLE_CLASS<double> table1(13);
 
     table1.insert("aaa", 1.0);
     table1.insert("aba", 2.0);
@@ -56,7 +56,8 @@ int main()
     table1.erase("abs");
 
     Info<< "\ntable1 toc: " << table1.toc() << endl;
-    Info<< "\ntable1 [" << table1.size() << "] " << endl;
+    table1.printInfo(Info)
+        << "table1 [" << table1.size() << "] " << endl;
     forAllIter(HASHTABLE_CLASS<double>, table1, iter)
     {
         Info<< iter.key() << " => " << iter() << nl;
@@ -97,7 +98,7 @@ int main()
         << "transfer table1 -> table3 via the xfer() method" << nl;
 
     Info<< "\ntable1" << table1 << nl
-        << "\ntable2" << table1 << nl
+        << "\ntable2" << table2 << nl
         << "\ntable3" << table3 << nl;
 
     Info<< "\nerase table2 by iterator" << nl;
@@ -113,10 +114,14 @@ int main()
         << "\ntable3" << table3 << nl;
 
     table3.resize(1);
-    Info<< "\nresize(1) table3" << table3 << nl;
+    Info<< "\nresize(1) table3" << nl;
+    table3.printInfo(Info)
+        << table3 << nl;
 
     table3.resize(10000);
-    Info<< "\nresize(10000) table3" << table3 << nl;
+    Info<< "\nresize(10000) table3" << nl;
+    table3.printInfo(Info)
+        << table3 << nl;
 
     HASHTABLE_CLASS<double> table4;
 
@@ -134,26 +139,27 @@ int main()
     table1.erase(table1.begin());
     Info<< "removed an element - test table1 != table3 : "
         << (table1 != table3) << nl;
-    
+
     // insert a few things into table2
     table2.set("ada", 14.0);
     table2.set("aeq", 15.0);
     table2.set("aaw", 16.0);
     table2.set("abs", 17.0);
     table2.set("adx", 20.0);
-    
+
     Info<< "\ntable1" << table1 << nl
         << "\ntable2" << table2 << nl;
 
     label nErased = table1.erase(table2);
-    
+
     Info<< "\nerase table2 keys from table1 (removed "
         << nErased << " elements)" << nl
         << "\ntable1" << table1 << nl
         << "\ntable2" << table2 << nl;
 
 
-    Info<< "\nclearStorage table3 ... ";
+    Info<< "\ntable3" << table3
+        << "\nclearStorage table3 ... ";
     table3.clearStorage();
     Info<< table3 << nl;
 
@@ -162,4 +168,5 @@ int main()
     return 0;
 }
 
+
 // ************************************************************************* //
diff --git a/applications/test/UIndirectListTest/UIndirectListTest.C b/applications/test/UIndirectListTest/UIndirectListTest.C
index 9c619a4b99..6902f47eea 100644
--- a/applications/test/UIndirectListTest/UIndirectListTest.C
+++ b/applications/test/UIndirectListTest/UIndirectListTest.C
@@ -27,6 +27,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "UIndirectList.H"
+#include "DynamicList.H"
 #include "IOstreams.H"
 #include "ListOps.H"
 #include "OFstream.H"
@@ -58,11 +59,11 @@ int main(int argc, char *argv[])
 
     idl[1] = -666;
 
-    Info<< "idl[1] changed:" << idl << endl;
+    Info<< "idl[1] changed: " << idl << endl;
 
     idl = -999;
 
-    Info<< "idl changed:" << idl << endl;
+    Info<< "idl changed: " << idl << endl;
 
     UIndirectList<double> idl2(idl);
 
@@ -79,17 +80,26 @@ int main(int argc, char *argv[])
         idl = ident;
     }
 
-    Info<< "idl assigned from UList:" << idl << endl;
+    Info<< "idl assigned from UList: " << idl << endl;
 
-    List<double> realList = UIndirectList<double>(completeList, addresses);
+    // test List operations
 
-    Info<< "realList:" << realList << endl;
+    List<double> flatList = UIndirectList<double>(completeList, addresses);
+    Info<< "List assigned from UIndirectList: " << flatList << endl;
 
-    List<double> realList2(UIndirectList<double>(completeList, addresses));
+    List<double> flatList2(UIndirectList<double>(completeList, addresses));
+    Info<< "List constructed from UIndirectList: " << flatList2 << endl;
 
-    Info<< "realList2:" << realList2 << endl;
+    flatList.append(UIndirectList<double>(completeList, addresses));
+    Info<< "List::append(UIndirectList): " << flatList << endl;
 
 
+    DynamicList<double> dynList(UIndirectList<double>(completeList, addresses));
+    Info<< "DynamicList constructed from UIndirectList: " << dynList << endl;
+
+    dynList.append(UIndirectList<double>(completeList, addresses));
+    Info<< "DynamicList::append(UIndirectList): " << dynList << endl;
+
     Info << "\nEnd\n" << endl;
 
     return 0;
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C
index d113a99ee1..e4eb63f06e 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C
@@ -50,7 +50,7 @@ void Foam::HashPtrTable<T, Key, Hash>::read(Istream& is, const INew& inewt)
         label s = firstToken.labelToken();
 
         // Read beginning of contents
-        char listDelimiter = is.readBeginList("HashPtrTable<T, Key, Hash>");
+        char delimiter = is.readBeginList("HashPtrTable<T, Key, Hash>");
 
         if (s)
         {
@@ -59,7 +59,7 @@ void Foam::HashPtrTable<T, Key, Hash>::read(Istream& is, const INew& inewt)
                 this->resize(2*s);
             }
 
-            if (listDelimiter == token::BEGIN_LIST)
+            if (delimiter == token::BEGIN_LIST)
             {
                 for (label i=0; i<s; i++)
                 {
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
index 5112f6fb7d..826bb95741 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
@@ -28,6 +28,13 @@ Class
 Description
     An STL-conforming hash table.
 
+Note
+    Hashing index collisions are handled via chaining using a singly-linked
+    list with the colliding entry being added to the head of the linked
+    list. Thus copying the hash table (or indeed even resizing it) will
+    often result in a different hash order. Use a sorted table-of-contents
+    when the hash order is important.
+
 SourceFiles
     HashTableI.H
     HashTable.C
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTableIO.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTableIO.C
index 2a407b44a5..bef0cf50bc 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTableIO.C
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTableIO.C
@@ -81,7 +81,7 @@ Foam::HashTable<T, Key, Hash>::printInfo(Ostream& os) const
 
     os  << "HashTable<T,Key,Hash>"
         << " elements:" << size() << " slots:" << used << "/" << tableSize_
-        << " chaining(avg/max):" << (used ? float(avgChain/used) : 0)
+        << " chaining(avg/max):" << (used ? (float(avgChain)/used) : 0)
         << "/" << maxChain << endl;
 
     return os;
@@ -91,7 +91,11 @@ Foam::HashTable<T, Key, Hash>::printInfo(Ostream& os) const
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 template<class T, class Key, class Hash>
-Foam::Istream& Foam::operator>>(Istream& is, HashTable<T, Key, Hash>& L)
+Foam::Istream& Foam::operator>>
+(
+    Istream& is,
+    HashTable<T, Key, Hash>& L
+)
 {
     is.fatalCheck("operator>>(Istream&, HashTable<T, Key, Hash>&)");
 
@@ -113,7 +117,7 @@ Foam::Istream& Foam::operator>>(Istream& is, HashTable<T, Key, Hash>& L)
         label s = firstToken.labelToken();
 
         // Read beginning of contents
-        char listDelimiter = is.readBeginList("HashTable<T, Key, Hash>");
+        char delimiter = is.readBeginList("HashTable<T, Key, Hash>");
 
         if (s)
         {
@@ -122,7 +126,7 @@ Foam::Istream& Foam::operator>>(Istream& is, HashTable<T, Key, Hash>& L)
                 L.resize(2*s);
             }
 
-            if (listDelimiter == token::BEGIN_LIST)
+            if (delimiter == token::BEGIN_LIST)
             {
                 for (label i=0; i<s; i++)
                 {
@@ -209,7 +213,11 @@ Foam::Istream& Foam::operator>>(Istream& is, HashTable<T, Key, Hash>& L)
 
 
 template<class T, class Key, class Hash>
-Foam::Ostream& Foam::operator<<(Ostream& os, const HashTable<T, Key, Hash>& L)
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const HashTable<T, Key, Hash>& L
+)
 {
     // Write size and start delimiter
     os << nl << L.size() << nl << token::BEGIN_LIST << nl;
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableIO.C b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableIO.C
index 3939851fc5..3280ad7389 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableIO.C
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableIO.C
@@ -117,7 +117,7 @@ Foam::Istream& Foam::operator>>(Istream& is, StaticHashTable<T, Key, Hash>& L)
         label s = firstToken.labelToken();
 
         // Read beginning of contents
-        char listDelimiter = is.readBeginList("StaticHashTable<T, Key, Hash>");
+        char delimiter = is.readBeginList("StaticHashTable<T, Key, Hash>");
 
         if (s)
         {
@@ -126,7 +126,7 @@ Foam::Istream& Foam::operator>>(Istream& is, StaticHashTable<T, Key, Hash>& L)
                 L.resize(2*s);
             }
 
-            if (listDelimiter == token::BEGIN_LIST)
+            if (delimiter == token::BEGIN_LIST)
             {
                 for (label i=0; i<s; i++)
                 {
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILListIO.C b/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILListIO.C
index 18ad4c0f20..e9c489169c 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILListIO.C
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILListIO.C
@@ -50,11 +50,11 @@ void Foam::ILList<LListBase, T>::read(Istream& is, const INew& iNew)
         label s = firstToken.labelToken();
 
         // Read beginning of contents
-        char listDelimiter = is.readBeginList("ILList<LListBase, T>");
+        char delimiter = is.readBeginList("ILList<LListBase, T>");
 
         if (s)
         {
-            if (listDelimiter == token::BEGIN_LIST)
+            if (delimiter == token::BEGIN_LIST)
             {
                 for (label i=0; i<s; i++)
                 {
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LListIO.C b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LListIO.C
index 1fed57da16..eba21661ea 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LListIO.C
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LListIO.C
@@ -61,11 +61,11 @@ Foam::Istream& Foam::operator>>(Istream& is, LList<LListBase, T>& L)
         label s = firstToken.labelToken();
 
         // Read beginning of contents
-        char listDelimiter = is.readBeginList("LList<LListBase, T>");
+        char delimiter = is.readBeginList("LList<LListBase, T>");
 
         if (s)
         {
-            if (listDelimiter == token::BEGIN_LIST)
+            if (delimiter == token::BEGIN_LIST)
             {
                 for (register label i=0; i<s; i++)
                 {
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrListIO.C b/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrListIO.C
index 588da22cc9..735dd8d31b 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrListIO.C
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrListIO.C
@@ -53,11 +53,11 @@ void Foam::LPtrList<LListBase, T>::read(Istream& is, const INew& iNew)
         label s = firstToken.labelToken();
 
         // Read beginning of contents
-        char listDelimiter = is.readBeginList("LPtrList<LListBase, T>");
+        char delimiter = is.readBeginList("LPtrList<LListBase, T>");
 
         if (s)
         {
-            if (listDelimiter == token::BEGIN_LIST)
+            if (delimiter == token::BEGIN_LIST)
             {
                 for (label i=0; i<s; i++)
                 {
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
index 6ad83c809a..460d325006 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
@@ -111,8 +111,11 @@ public:
         //  Also constructs from DynamicList with different sizing parameters.
         explicit inline DynamicList(const UList<T>&);
 
+        //- Construct from UIndirectList. Size set to UIndirectList size.
+        explicit inline DynamicList(const UIndirectList<T>&);
+
         //- Construct by transferring the parameter contents
-        explicit inline DynamicList(const Xfer<List<T> >&);
+        explicit inline DynamicList(const Xfer< List<T> >&);
 
         //- Construct from Istream. Size set to size of read list.
         explicit DynamicList(Istream&);
@@ -173,16 +176,19 @@ public:
         inline void transfer(DynamicList<T, SizeInc, SizeMult, SizeDiv>&);
 
         //- Transfer contents to the Xfer container as a plain List
-        inline Xfer<List<T> > xfer();
+        inline Xfer< List<T> > xfer();
 
     // Member Operators
 
         //- Append an element at the end of the list
-        inline void append(const T& e);
+        inline void append(const T&);
 
         //- Append a List at the end of this list
         inline void append(const UList<T>&);
 
+        //- Append a UIndirectList at the end of this list
+        inline void append(const UIndirectList<T>&);
+
         //- Remove and return the top element
         inline T remove();
 
@@ -198,7 +204,7 @@ public:
             const DynamicList<T, SizeInc, SizeMult, SizeDiv>&
         );
 
-        //- Assignment from List<T>.
+        //- Assignment from UList
         inline void operator=(const UList<T>&);
 
     // IOstream operators
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
index 5ee9a3ce87..4e0ffbd1fd 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
@@ -72,6 +72,17 @@ inline Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::DynamicList
 {}
 
 
+template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
+inline Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::DynamicList
+(
+    const UIndirectList<T>& lst
+)
+:
+    List<T>(lst),
+    capacity_(lst.size())
+{}
+
+
 template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
 inline Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::DynamicList
 (
@@ -287,10 +298,10 @@ Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::transfer
 
 
 template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
-inline Foam::Xfer<Foam::List<T> >
+inline Foam::Xfer< Foam::List<T> >
 Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::xfer()
 {
-    return xferMoveTo<List<T> >(*this);
+    return xferMoveTo< List<T> >(*this);
 }
 
 
@@ -313,8 +324,6 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::append
     const UList<T>& lst
 )
 {
-    label nextFree = List<T>::size();
-
     if (this == &lst)
     {
         FatalErrorIn
@@ -324,6 +333,23 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::append
         )   << "attempted appending to self" << abort(FatalError);
     }
 
+    label nextFree = List<T>::size();
+    setSize(nextFree + lst.size());
+
+    forAll(lst, elemI)
+    {
+        this->operator[](nextFree++) = lst[elemI];
+    }
+}
+
+
+template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
+inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::append
+(
+    const UIndirectList<T>& lst
+)
+{
+    label nextFree = List<T>::size();
     setSize(nextFree + lst.size());
 
     forAll(lst, elemI)
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C b/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C
index aab7376e05..77e8ebab6a 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C
@@ -82,9 +82,9 @@ Foam::Istream& Foam::operator>>(Foam::Istream& is, FixedList<T, Size>& L)
         }
 
         // Read beginning of contents
-        char listDelimiter = is.readBeginList("FixedList");
+        char delimiter = is.readBeginList("FixedList");
 
-        if (listDelimiter == token::BEGIN_LIST)
+        if (delimiter == token::BEGIN_LIST)
         {
             for (register unsigned i=0; i<Size; i++)
             {
diff --git a/src/OpenFOAM/containers/Lists/List/List.C b/src/OpenFOAM/containers/Lists/List/List.C
index 429c91f820..3fa3dcc874 100644
--- a/src/OpenFOAM/containers/Lists/List/List.C
+++ b/src/OpenFOAM/containers/Lists/List/List.C
@@ -404,61 +404,6 @@ void Foam::List<T>::clear()
 }
 
 
-template<class T>
-void Foam::List<T>::append(const UList<T>& lst)
-{
-    if (this == &lst)
-    {
-        FatalErrorIn
-        (
-            "List<T>::append(const UList<T>&)"
-        )   << "attempted appending to self" << abort(FatalError);
-    }
-
-    label nextFree = this->size_;
-    setSize(nextFree + lst.size());
-
-    forAll(lst, elemI)
-    {
-        this->operator[](nextFree++) = lst[elemI];
-    }
-}
-
-
-template<class T>
-void Foam::List<T>::append(const UIndirectList<T>& lst)
-{
-    label nextFree = this->size_;
-    setSize(nextFree + lst.size());
-
-    forAll(lst, elemI)
-    {
-        this->operator[](nextFree++) = lst[elemI];
-    }
-}
-
-
-template<class T>
-void Foam::List<T>::append(const SLList<T>& lst)
-{
-    if (lst.size())
-    {
-        label nextFree = this->size_;
-        setSize(nextFree + lst.size());
-
-        for
-        (
-            typename SLList<T>::const_iterator iter = lst.begin();
-            iter != lst.end();
-            ++iter
-        )
-        {
-            this->operator[](nextFree++) = iter();
-        }
-    }
-}
-
-
 // Transfer the contents of the argument List into this List
 // and anull the argument list
 template<class T>
diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H
index 5961ff1747..639db9bbd2 100644
--- a/src/OpenFOAM/containers/Lists/List/List.H
+++ b/src/OpenFOAM/containers/Lists/List/List.H
@@ -182,24 +182,21 @@ public:
             void clear();
 
             //- Append a List at the end of this list
-            void append(const UList<T>&);
+            inline void append(const UList<T>&);
 
             //- Append a UIndirectList at the end of this list
-            void append(const UIndirectList<T>&);
+            inline void append(const UIndirectList<T>&);
 
-            //- Append a SLList at the end of this list
-            void append(const SLList<T>&);
-
-            //- Transfer the contents of the argument List into this List
+            //- Transfer the contents of the argument List into this list
             //  and annull the argument list.
             void transfer(List<T>&);
 
-            //- Transfer the contents of the argument List into this List
+            //- Transfer the contents of the argument List into this list
             //  and annull the argument list.
             template<unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
             void transfer(DynamicList<T, SizeInc, SizeMult, SizeDiv>&);
 
-            //- Transfer the contents of the argument List into this List
+            //- Transfer the contents of the argument List into this list
             //  and annull the argument list.
             void transfer(SortableList<T>&);
 
diff --git a/src/OpenFOAM/containers/Lists/List/ListI.H b/src/OpenFOAM/containers/Lists/List/ListI.H
index c3c6ebe4fb..58e5576f30 100644
--- a/src/OpenFOAM/containers/Lists/List/ListI.H
+++ b/src/OpenFOAM/containers/Lists/List/ListI.H
@@ -88,12 +88,46 @@ inline Foam::label Foam::List<T>::size() const
 
 
 template<class T>
-inline Foam::Xfer<Foam::List<T> > Foam::List<T>::xfer()
+inline Foam::Xfer< Foam::List<T> > Foam::List<T>::xfer()
 {
     return xferMove(*this);
 }
 
 
+template<class T>
+inline void Foam::List<T>::append(const UList<T>& lst)
+{
+    if (this == &lst)
+    {
+        FatalErrorIn
+        (
+            "List<T>::append(const UList<T>&)"
+        )   << "attempted appending to self" << abort(FatalError);
+    }
+
+    label nextFree = this->size();
+    setSize(nextFree + lst.size());
+
+    forAll(lst, elemI)
+    {
+        this->operator[](nextFree++) = lst[elemI];
+    }
+}
+
+
+template<class T>
+inline void Foam::List<T>::append(const UIndirectList<T>& lst)
+{
+    label nextFree = this->size();
+    setSize(nextFree + lst.size());
+
+    forAll(lst, elemI)
+    {
+        this->operator[](nextFree++) = lst[elemI];
+    }
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class T>
diff --git a/src/OpenFOAM/containers/Lists/List/ListIO.C b/src/OpenFOAM/containers/Lists/List/ListIO.C
index 7cfdfb0397..d6238ae091 100644
--- a/src/OpenFOAM/containers/Lists/List/ListIO.C
+++ b/src/OpenFOAM/containers/Lists/List/ListIO.C
@@ -76,11 +76,11 @@ Foam::Istream& Foam::operator>>(Istream& is, List<T>& L)
         if (is.format() == IOstream::ASCII || !contiguous<T>())
         {
             // Read beginning of contents
-            char listDelimiter = is.readBeginList("List");
+            char delimiter = is.readBeginList("List");
 
             if (s)
             {
-                if (listDelimiter == token::BEGIN_LIST)
+                if (delimiter == token::BEGIN_LIST)
                 {
                     for (register label i=0; i<s; i++)
                     {
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrListIO.C b/src/OpenFOAM/containers/Lists/PtrList/PtrListIO.C
index e427f68d8d..564b22c2bc 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrListIO.C
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrListIO.C
@@ -54,11 +54,11 @@ void Foam::PtrList<T>::read(Istream& is, const INew& inewt)
         setSize(s);
 
         // Read beginning of contents
-        char listDelimiter = is.readBeginList("PtrList");
+        char delimiter = is.readBeginList("PtrList");
 
         if (s)
         {
-            if (listDelimiter == token::BEGIN_LIST)
+            if (delimiter == token::BEGIN_LIST)
             {
                 forAll(*this, i)
                 {
diff --git a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
index 5768717db4..28b7b8b9d3 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
+++ b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
@@ -177,7 +177,7 @@ inline Cmpt det(const SphericalTensor<Cmpt>& st)
 }
 
 
-//- Return the inverse of a symmetric tensor
+//- Return the inverse of a spherical tensor
 template <class Cmpt>
 inline SphericalTensor<Cmpt> inv(const SphericalTensor<Cmpt>& st)
 {
diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
index f59dd16754..5a2de5dbbd 100644
--- a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
+++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
@@ -256,7 +256,7 @@ inline Cmpt magSqr(const SymmTensor<Cmpt>& st)
 }
 
 
-//- Return the strace of a symmetric tensor
+//- Return the trace of a symmetric tensor
 template <class Cmpt>
 inline Cmpt tr(const SymmTensor<Cmpt>& st)
 {
@@ -280,7 +280,7 @@ inline const SymmTensor<Cmpt>& symm(const SymmTensor<Cmpt>& st)
 }
 
 
-//- Return the stwice the symmetric part of a symmetric tensor
+//- Return twice the symmetric part of a symmetric tensor
 template <class Cmpt>
 inline SymmTensor<Cmpt> twoSymm(const SymmTensor<Cmpt>& st)
 {
@@ -361,7 +361,7 @@ inline SymmTensor<Cmpt> inv(const SymmTensor<Cmpt>& st)
 }
 
 
-//- Return the 1spt invariant of a symmetric tensor
+//- Return the 1st invariant of a symmetric tensor
 template <class Cmpt>
 inline Cmpt invariantI(const SymmTensor<Cmpt>& st)
 {
@@ -453,14 +453,9 @@ operator&(const SphericalTensor<Cmpt>& spt1, const SymmTensor<Cmpt>& st2)
 {
     return SymmTensor<Cmpt>
     (
-        spt1.ii()*st2.xx(),
-        spt1.ii()*st2.xy(),
-        spt1.ii()*st2.xz(),
-
-                          spt1.ii()*st2.yy(),
-                          spt1.ii()*st2.yz(),
-
-                                            spt1.ii()*st2.zz()
+        spt1.ii()*st2.xx(), spt1.ii()*st2.xy(), spt1.ii()*st2.xz(),
+                            spt1.ii()*st2.yy(), spt1.ii()*st2.yz(),
+                                                spt1.ii()*st2.zz()
     );
 }
 
@@ -472,14 +467,9 @@ operator&(const SymmTensor<Cmpt>& st1, const SphericalTensor<Cmpt>& spt2)
 {
     return SymmTensor<Cmpt>
     (
-        st1.xx()*spt2.ii(),
-                          st1.xy()*spt2.ii(),
-                                            st1.xz()*spt2.ii(),
-
-                          st1.yy()*spt2.ii(),
-                                            st1.yz()*spt2.ii(),
-
-                                            st1.zz()*spt2.ii()
+        st1.xx()*spt2.ii(), st1.xy()*spt2.ii(), st1.xz()*spt2.ii(),
+                            st1.yy()*spt2.ii(), st1.yz()*spt2.ii(),
+                                                st1.zz()*spt2.ii()
     );
 }
 
diff --git a/src/OpenFOAM/primitives/SymmTensor/symmTensor/symmTensor.C b/src/OpenFOAM/primitives/SymmTensor/symmTensor/symmTensor.C
index f5a56a3d86..730d728f71 100644
--- a/src/OpenFOAM/primitives/SymmTensor/symmTensor/symmTensor.C
+++ b/src/OpenFOAM/primitives/SymmTensor/symmTensor/symmTensor.C
@@ -25,7 +25,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "symmTensor.H"
-#include "mathematicalConstants.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -65,16 +64,16 @@ template<>
 const symmTensor symmTensor::max
 (
     VGREAT, VGREAT, VGREAT,
-       VGREAT, VGREAT,
-          VGREAT
+            VGREAT, VGREAT,
+                    VGREAT
 );
 
 template<>
 const symmTensor symmTensor::min
 (
     -VGREAT, -VGREAT, -VGREAT,
-       -VGREAT, -VGREAT,
-          -VGREAT
+             -VGREAT, -VGREAT,
+                      -VGREAT
 );
 
 
diff --git a/src/OpenFOAM/primitives/Tensor/TensorI.H b/src/OpenFOAM/primitives/Tensor/TensorI.H
index 453f79185c..7ca9958aa1 100644
--- a/src/OpenFOAM/primitives/Tensor/TensorI.H
+++ b/src/OpenFOAM/primitives/Tensor/TensorI.H
@@ -402,7 +402,7 @@ inline SymmTensor<Cmpt> symm(const Tensor<Cmpt>& t)
 }
 
 
-//- Return the twice the symmetric part of a tensor
+//- Return twice the symmetric part of a tensor
 template <class Cmpt>
 inline SymmTensor<Cmpt> twoSymm(const Tensor<Cmpt>& t)
 {
@@ -609,17 +609,9 @@ operator&(const SphericalTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
 {
     return Tensor<Cmpt>
     (
-        st1.ii()*t2.xx(),
-        st1.ii()*t2.xy(),
-        st1.ii()*t2.xz(),
-
-                          st1.ii()*t2.yx(),
-                          st1.ii()*t2.yy(),
-                          st1.ii()*t2.yz(),
-
-                                            st1.ii()*t2.zx(),
-                                            st1.ii()*t2.zy(),
-                                            st1.ii()*t2.zz()
+        st1.ii()*t2.xx(), st1.ii()*t2.xy(), st1.ii()*t2.xz(),
+        st1.ii()*t2.yx(), st1.ii()*t2.yy(), st1.ii()*t2.yz(),
+        st1.ii()*t2.zx(), st1.ii()*t2.zy(), st1.ii()*t2.zz()
     );
 }
 
@@ -631,17 +623,9 @@ operator&(const Tensor<Cmpt>& t1, const SphericalTensor<Cmpt>& st2)
 {
     return Tensor<Cmpt>
     (
-        t1.xx()*st2.ii(),
-                          t1.xy()*st2.ii(),
-                                            t1.xz()*st2.ii(),
-
-        t1.yx()*st2.ii(),
-                          t1.yy()*st2.ii(),
-                                            t1.yz()*st2.ii(),
-
-        t1.zx()*st2.ii(),
-                          t1.zy()*st2.ii(),
-                                            t1.zz()*st2.ii()
+        t1.xx()*st2.ii(), t1.xy()*st2.ii(), t1.xz()*st2.ii(),
+        t1.yx()*st2.ii(), t1.yy()*st2.ii(), t1.yz()*st2.ii(),
+        t1.zx()*st2.ii(), t1.zy()*st2.ii(), t1.zz()*st2.ii()
     );
 }
 
diff --git a/src/OpenFOAM/primitives/Tensor/tensor/tensor.H b/src/OpenFOAM/primitives/Tensor/tensor/tensor.H
index 297b8b47b9..36ed4df029 100644
--- a/src/OpenFOAM/primitives/Tensor/tensor/tensor.H
+++ b/src/OpenFOAM/primitives/Tensor/tensor/tensor.H
@@ -51,13 +51,13 @@ namespace Foam
 
 typedef Tensor<scalar> tensor;
 
-vector eigenValues(const tensor& t);
-vector eigenVector(const tensor& t, const scalar lambda);
-tensor eigenVectors(const tensor& t);
+vector eigenValues(const tensor&);
+vector eigenVector(const tensor&, const scalar lambda);
+tensor eigenVectors(const tensor&);
 
-vector eigenValues(const symmTensor& t);
-vector eigenVector(const symmTensor& t, const scalar lambda);
-tensor eigenVectors(const symmTensor& t);
+vector eigenValues(const symmTensor&);
+vector eigenVector(const symmTensor&, const scalar lambda);
+tensor eigenVectors(const symmTensor&);
 
 //- Data associated with tensor type are contiguous
 template<>

From e41ae7eb92f6a11e944ea12358108c44e19e267a Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 27 Apr 2009 10:47:10 +0100
Subject: [PATCH 055/175] bugfix: incorrect type checking

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

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/directMappedVelocityFluxFixedValue/directMappedVelocityFluxFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/directMappedVelocityFluxFixedValue/directMappedVelocityFluxFixedValueFvPatchField.C
index 5ac329fe31..526ee95639 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/directMappedVelocityFluxFixedValue/directMappedVelocityFluxFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/directMappedVelocityFluxFixedValue/directMappedVelocityFluxFixedValueFvPatchField.C
@@ -62,7 +62,7 @@ directMappedVelocityFluxFixedValueFvPatchField
     fixedValueFvPatchVectorField(ptf, p, iF, mapper),
     phiName_(ptf.phiName_)
 {
-    if (!isType<directMappedPatchBase>(this->patch().patch()))
+    if (!isA<directMappedPatchBase>(this->patch().patch()))
     {
         FatalErrorIn
         (
@@ -95,7 +95,7 @@ directMappedVelocityFluxFixedValueFvPatchField
     fixedValueFvPatchVectorField(p, iF, dict),
     phiName_(dict.lookup("phi"))
 {
-    if (!isType<directMappedPatchBase>(this->patch().patch()))
+    if (!isA<directMappedPatchBase>(this->patch().patch()))
     {
         FatalErrorIn
         (
@@ -207,7 +207,7 @@ void directMappedVelocityFluxFixedValueFvPatchField::updateCoeffs()
                 allUValues
             );
             newUValues = patch().patchSlice(newUValues);
-            
+
             mapDistribute::distribute
             (
                 Pstream::defaultCommsType,

From f57c22bb460325fe2389d373c1419377df2b2910 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 28 Apr 2009 10:04:58 +0200
Subject: [PATCH 056/175] set floatTransfer off in code

---
 src/OpenFOAM/db/IOstreams/Pstreams/Pstream.C                  | 2 +-
 .../lduInterface/processorLduInterfaceTemplates.C             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.C
index 531b15b8fc..bdb31516ba 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.C
@@ -230,7 +230,7 @@ Foam::List<Foam::Pstream::commsStruct> Foam::Pstream::treeCommunication_(0);
 // in accuracy
 bool Foam::Pstream::floatTransfer
 (
-    debug::optimisationSwitch("floatTransfer", 1)
+    debug::optimisationSwitch("floatTransfer", 0)
 );
 
 // Number of processors at which the reduce algorithm changes from linear to
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C
index 61c5d2f612..d9380bcca5 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C
@@ -129,7 +129,7 @@ void Foam::processorLduInterface::compressedSend
     const UList<Type>& f
 ) const
 {
-    if (sizeof(scalar) != sizeof(float) && f.size() && Pstream::floatTransfer)
+    if (sizeof(scalar) != sizeof(float) && Pstream::floatTransfer && f.size())
     {
         static const label nCmpts = sizeof(Type)/sizeof(scalar);
         label nm1 = (f.size() - 1)*nCmpts;
@@ -199,7 +199,7 @@ void Foam::processorLduInterface::compressedReceive
     UList<Type>& f
 ) const
 {
-    if (sizeof(scalar) != sizeof(float) && f.size() && Pstream::floatTransfer)
+    if (sizeof(scalar) != sizeof(float) && Pstream::floatTransfer && f.size())
     {
         static const label nCmpts = sizeof(Type)/sizeof(scalar);
         label nm1 = (f.size() - 1)*nCmpts;

From 3ce125ff487a16929970df856b2c6e2e70cd4974 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 28 Apr 2009 10:18:34 +0200
Subject: [PATCH 057/175] minor build fix

- createBaffles used List::append(const T&), changed to DynamicList
---
 .../mesh/manipulation/createBaffles/createBaffles.C          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
index 051f74968b..bd88570d94 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
@@ -227,10 +227,10 @@ int main(int argc, char *argv[])
 
 
     // Patches to put baffles into
-    labelList newPatches(1);
+    DynamicList<label> newPatches(1);
 
     word patchName(args.additionalArgs()[1]);
-    newPatches[0] = patches.findPatchID(patchName);
+    newPatches.append(patches.findPatchID(patchName));
     Pout<< "Using patch " << patchName
         << " at index " << newPatches[0] << endl;
 
@@ -250,6 +250,7 @@ int main(int argc, char *argv[])
             IStringStream(args.options()["additionalPatches"])()
         );
 
+        newPatches.reserve(patchNames.size() + 1);
         forAll(patchNames, i)
         {
             label patchI = patches.findPatchID(patchNames[i]);

From bfc3a6961eed270d60d02b710a51b936a2148d27 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Tue, 28 Apr 2009 12:14:05 +0100
Subject: [PATCH 058/175] use relaxed mesh checks in shrinking as well as
 layering

---
 .../autoHexMeshDriver/autoLayerDriver.C       | 30 +++++++++++--------
 .../autoHexMeshDriver/autoLayerDriver.H       |  1 +
 .../autoHexMeshDriver/autoLayerDriverShrink.C | 20 ++++++++++---
 .../motionSmoother/motionSmoother.C           |  6 ++++
 .../motionSmoother/motionSmoother.H           |  2 ++
 5 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
index ee6cea3e12..01ab952c16 100644
--- a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
+++ b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
@@ -2804,6 +2804,22 @@ void Foam::autoLayerDriver::addLayers
             << "Layer addition iteration " << iteration << nl
             << "--------------------------" << endl;
 
+
+        // Unset the extrusion at the pp.
+        const dictionary& meshQualityDict =
+        (
+            iteration < layerParams.nRelaxedIter()
+          ? motionDict
+          : motionDict.subDict("relaxed")
+        );
+
+        if (iteration >= layerParams.nRelaxedIter())
+        {
+            Info<< "Switched to relaxed meshQuality constraints." << endl;
+        }
+
+
+
         // Make sure displacement is equal on both sides of coupled patches.
         syncPatchDisplacement
         (
@@ -2845,6 +2861,7 @@ void Foam::autoLayerDriver::addLayers
             shrinkMeshMedialDistance
             (
                 meshMover,
+                meshQualityDict,
 
                 layerParams.nSmoothThickness(),
                 layerParams.maxThicknessToMedialRatio(),
@@ -3044,19 +3061,6 @@ void Foam::autoLayerDriver::addLayers
             layerFacesSet.write();
         }
 
-        // Unset the extrusion at the pp.
-        const dictionary& meshQualityDict =
-        (
-            iteration < layerParams.nRelaxedIter()
-          ? motionDict
-          : motionDict.subDict("relaxed")
-        );
-
-        if (iteration >= layerParams.nRelaxedIter())
-        {
-            Info<< "Switched to relaxed meshQuality constraints." << endl;
-        }
-
 
         label nTotChanged = checkAndUnmark
         (
diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
index 6cdec2004b..164fd88ce0 100644
--- a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
+++ b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
@@ -473,6 +473,7 @@ class autoLayerDriver
                 void shrinkMeshMedialDistance
                 (
                     motionSmoother& meshMover,
+                    const dictionary& meshQualityDict,
                     const label nSmoothThickness,
                     const scalar maxThicknessToMedialRatio,
                     const label nAllowableErrors,
diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
index 615978a308..cc88231b74 100644
--- a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
+++ b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
@@ -792,7 +792,7 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
             wallInfo,
             pointWallDist,
             edgeWallDist,
-            mesh.nPoints()  // max iterations
+            mesh.globalData().nTotalPoints()    // max iterations
         );
     }
 
@@ -897,7 +897,7 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
 
             pointMedialDist,
             edgeMedialDist,
-            mesh.nPoints()  // max iterations
+            mesh.globalData().nTotalPoints()    // max iterations
         );
 
         // Extract medial axis distance as pointScalarField
@@ -953,6 +953,7 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
 void Foam::autoLayerDriver::shrinkMeshMedialDistance
 (
     motionSmoother& meshMover,
+    const dictionary& meshQualityDict,
     const label nSmoothThickness,
     const scalar maxThicknessToMedialRatio,
     const label nAllowableErrors,
@@ -1103,7 +1104,7 @@ void Foam::autoLayerDriver::shrinkMeshMedialDistance
             wallInfo,
             pointWallDist,
             edgeWallDist,
-            mesh.nPoints()  // max iterations
+            mesh.globalData().nTotalPoints()    // max iterations
         );
     }
 
@@ -1138,7 +1139,18 @@ void Foam::autoLayerDriver::shrinkMeshMedialDistance
             oldErrorReduction = meshMover.setErrorReduction(0.0);
         }
 
-        if (meshMover.scaleMesh(checkFaces, true, nAllowableErrors))
+        if
+        (
+            meshMover.scaleMesh
+            (
+                checkFaces,
+                List<labelPair>(0),
+                meshMover.paramDict(),
+                meshQualityDict,
+                true,
+                nAllowableErrors
+            )
+        )
         {
             Info<< "shrinkMeshMedialDistance : Successfully moved mesh" << endl;
             break;
diff --git a/src/dynamicMesh/motionSmoother/motionSmoother.C b/src/dynamicMesh/motionSmoother/motionSmoother.C
index 4f40827f4b..d780ec79dd 100644
--- a/src/dynamicMesh/motionSmoother/motionSmoother.C
+++ b/src/dynamicMesh/motionSmoother/motionSmoother.C
@@ -502,6 +502,12 @@ const Foam::labelList& Foam::motionSmoother::adaptPatchIDs() const
 }
 
 
+const Foam::dictionary& Foam::motionSmoother::paramDict() const
+{
+    return paramDict_;
+}
+
+
 Foam::pointVectorField& Foam::motionSmoother::displacement()
 {
     return displacement_;
diff --git a/src/dynamicMesh/motionSmoother/motionSmoother.H b/src/dynamicMesh/motionSmoother/motionSmoother.H
index e4aeac6f50..3d853e476d 100644
--- a/src/dynamicMesh/motionSmoother/motionSmoother.H
+++ b/src/dynamicMesh/motionSmoother/motionSmoother.H
@@ -327,6 +327,8 @@ public:
             //- Patch labels that are being adapted
             const labelList& adaptPatchIDs() const;
 
+            const dictionary& paramDict() const;
+
             //- Reference to displacement field
             pointVectorField& displacement();
 

From 5bc9d3f3f8b91616347fab110c5489af8179d227 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Tue, 28 Apr 2009 12:14:59 +0100
Subject: [PATCH 059/175] stabilise interpolation on zero area faces

---
 .../pointPatchInterpolation.C                       | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/finiteVolume/interpolation/volPointInterpolation/pointPatchInterpolation/pointPatchInterpolation.C b/src/finiteVolume/interpolation/volPointInterpolation/pointPatchInterpolation/pointPatchInterpolation.C
index f9ebc6b8ce..16cd028f72 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/pointPatchInterpolation/pointPatchInterpolation.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/pointPatchInterpolation/pointPatchInterpolation.C
@@ -213,13 +213,12 @@ void pointPatchInterpolation::makePatchPatchWeights()
 
                 if (!isA<emptyFvPatch>(bm[patchi]) && !bm[patchi].coupled())
                 {
-                    pw[nFacesAroundPoint] =
-                        1.0/mag
-                        (
-                            pointLoc
-                          - centres.boundaryField()[patchi]
-                                [bm[patchi].patch().whichFace(curFaces[facei])]
-                        );
+                    vector d =
+                        pointLoc
+                      - centres.boundaryField()[patchi]
+                            [bm[patchi].patch().whichFace(curFaces[facei])];
+
+                    pw[nFacesAroundPoint] = 1.0/(mag(d)+VSMALL);
 
                     nFacesAroundPoint++;
                 }

From b3b650fa9807b2b2c579eccf83f9ab8feb780ee3 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Tue, 28 Apr 2009 13:17:37 +0100
Subject: [PATCH 060/175] Added free stream velocity components to tangential
 velocities.

---
 .../dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
index cd18d9064d..9d791a1ed3 100644
--- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
@@ -367,6 +367,8 @@ void Foam::FreeStream<CloudType>::inflow()
                             rndGen.GaussNormal()*t1
                           + rndGen.GaussNormal()*t2
                         )
+                      + (t1 & faceVelocity)*t1
+                      + (t2 & faceVelocity)*t2
                       + mostProbableSpeed*uNormal*n;
 
                     scalar Ei = cloud.equipartitionInternalEnergy

From 4def3721e63aba96cf4de5312e0e0c733938eabb Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Tue, 28 Apr 2009 16:29:20 +0100
Subject: [PATCH 061/175] added dependency

---
 src/thermophysicalModels/radiation/Make/options | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/thermophysicalModels/radiation/Make/options b/src/thermophysicalModels/radiation/Make/options
index 98956f2b6d..2e150f2bf9 100644
--- a/src/thermophysicalModels/radiation/Make/options
+++ b/src/thermophysicalModels/radiation/Make/options
@@ -1,9 +1,8 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
-    -I$(LIB_SRC)/OpenFOAM/lnInclude \
-    -I radiationModel/fvDOM/interpolationLookUpTable
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
 
 LIB_LIBS = \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lbasicThermophysicalModels \
+    -lspecie

From 68e3014f93bc0025c6f0eaf4e8850a27a7800ef5 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Tue, 28 Apr 2009 20:52:18 +0100
Subject: [PATCH 062/175] scoping

---
 .../buoyantSimpleRadiationFoam/hotRadiationRoom/0/epsilon | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/epsilon b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/epsilon
index d9e8b1dc34..d5e7b9cd02 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/epsilon
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/epsilon
@@ -23,25 +23,25 @@ boundaryField
 {
     floor
     {
-        type            epsilonWallFunction;
+        type            compressible::epsilonWallFunction;
         value           uniform 0;
     }
 
     ceiling
     {
-        type            epsilonWallFunction;
+        type            compressible::epsilonWallFunction;
         value           uniform 0;
     }
 
     fixedWalls
     {
-        type            epsilonWallFunction;
+        type            compressible::epsilonWallFunction;
         value           uniform 0;
     }
 
     box
     {
-        type            epsilonWallFunction;
+        type            compressible::epsilonWallFunction;
         value           uniform 0;
     }
 }

From c67b9e677ab3b4a68229aca4453e04eb4aefb6e4 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Tue, 28 Apr 2009 20:52:19 +0100
Subject: [PATCH 063/175] scoping

---
 .../buoyantSimpleRadiationFoam/hotRadiationRoom/0/k       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k
index 0eb1a25c30..5b206f8e4e 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k
@@ -23,25 +23,25 @@ boundaryField
 {
     floor
     {
-        type            kQRWallFunction;
+        type            compressible::kQRWallFunction;
         value           uniform 0;
     }
 
     ceiling
     {
-        type            kQRWallFunction;
+        type            compressible::kQRWallFunction;
         value           uniform 0;
     }
 
     fixedWalls
     {
-        type            kQRWallFunction;
+        type            compressible::kQRWallFunction;
         value           uniform 0;
     }
 
     box
     {
-        type            kQRWallFunction;
+        type            compressible::kQRWallFunction;
         value           uniform 0;
     }
 }

From 4204b4121e30b4f7c61c13e0ff8226bef42aa227 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Tue, 28 Apr 2009 20:52:42 +0100
Subject: [PATCH 064/175] update boudaryfield only

---
 .../radiation/radiationModel/fvDOM/fvDOM/fvDOM.C               | 3 ++-
 .../fvDOM/radiativeIntensityRay/radiativeIntensityRay.C        | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C
index f548d0046a..9183931ba1 100644
--- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C
+++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C
@@ -359,7 +359,8 @@ void Foam::radiation::fvDOM::updateG()
     {
         IRay_[rayI].addIntensity();
         G_ += IRay_[rayI].I()*IRay_[rayI].omega();
-        Qr_ += IRay_[rayI].Qr();
+        //Qr_ += IRay_[rayI].Qr();
+        Qr_.boundaryField() += IRay_[rayI].Qr().boundaryField();
     }
 }
 
diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C b/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
index 6af99c86a4..7441b900d6 100644
--- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
+++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
@@ -187,7 +187,8 @@ Foam::radiation::radiativeIntensityRay::~radiativeIntensityRay()
 Foam::scalar Foam::radiation::radiativeIntensityRay::correct()
 {
     // reset boundary heat flux to zero
-    Qr_ = dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0);
+    //Qr_ = dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0);
+    Qr_.boundaryField() = 0.0;
 
     scalar maxResidual = -GREAT;
 

From 23ef5f08bd1d4b262a0ce9e3ffab5fbbed70d7ab Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Tue, 28 Apr 2009 20:52:56 +0100
Subject: [PATCH 065/175] pruned unused code

---
 .../meshRefinement/meshRefinementBaffles.C    | 24 -------------------
 1 file changed, 24 deletions(-)

diff --git a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
index e154576ad9..3904f96073 100644
--- a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -1522,30 +1522,6 @@ void Foam::meshRefinement::baffleAndSplitMesh
 
         if (debug)
         {
-            //- Note: commented out since not properly parallel yet.
-            //// Dump all these faces to a faceSet.
-            //faceSet problemGeom(mesh_, "problemFacesGeom", 100);
-            //
-            //const labelList facePatchGeom
-            //(
-            //    markFacesOnProblemCellsGeometric
-            //    (
-            //        motionDict,
-            //        globalToPatch
-            //    )
-            //);
-            //forAll(facePatchGeom, faceI)
-            //{
-            //    if (facePatchGeom[faceI] != -1)
-            //    {
-            //        problemGeom.insert(faceI);
-            //    }
-            //}
-            //Pout<< "Dumping " << problemGeom.size()
-            //    << " problem faces to " << problemGeom.objectPath() << endl;
-            //problemGeom.write();
-
-
             faceSet problemTopo(mesh_, "problemFacesTopo", 100);
 
             const labelList facePatchTopo

From b773710d06b7aa92268d34d8f269d80f398b155c Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Tue, 28 Apr 2009 22:20:12 +0100
Subject: [PATCH 066/175] remove opteron and no-gcse switch

	modified:   SiCortex64Gcc/cOpt
	modified:   SunOS64Gcc/cOpt
	modified:   linux64Gcc/c++Opt
	modified:   linux64Gcc/cOpt
	modified:   linux64Gcc/general
	modified:   linux64Gcc42/c++Opt
	modified:   linux64Gcc42/cOpt
	modified:   linuxGcc/c++
	modified:   linuxGcc/cDebug
	modified:   linuxGcc/general
	modified:   linuxIA64Gcc/cOpt
---
 wmake/rules/SiCortex64Gcc/cOpt  | 2 +-
 wmake/rules/SunOS64Gcc/cOpt     | 2 +-
 wmake/rules/linux64Gcc/c++Opt   | 2 +-
 wmake/rules/linux64Gcc/cOpt     | 2 +-
 wmake/rules/linux64Gcc/general  | 2 +-
 wmake/rules/linux64Gcc42/c++Opt | 2 +-
 wmake/rules/linux64Gcc42/cOpt   | 2 +-
 wmake/rules/linuxGcc/c++        | 2 +-
 wmake/rules/linuxGcc/cDebug     | 2 +-
 wmake/rules/linuxGcc/general    | 3 ++-
 wmake/rules/linuxIA64Gcc/cOpt   | 2 +-
 wmake/rules/linuxPPC64Gcc/cOpt  | 2 +-
 12 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/wmake/rules/SiCortex64Gcc/cOpt b/wmake/rules/SiCortex64Gcc/cOpt
index aaaebef3d3..a8b0635478 100644
--- a/wmake/rules/SiCortex64Gcc/cOpt
+++ b/wmake/rules/SiCortex64Gcc/cOpt
@@ -1,2 +1,2 @@
 cDBUG       = 
-cOPT        = -O3 -fno-gcse
+cOPT        = -O3
diff --git a/wmake/rules/SunOS64Gcc/cOpt b/wmake/rules/SunOS64Gcc/cOpt
index aaaebef3d3..a8b0635478 100644
--- a/wmake/rules/SunOS64Gcc/cOpt
+++ b/wmake/rules/SunOS64Gcc/cOpt
@@ -1,2 +1,2 @@
 cDBUG       = 
-cOPT        = -O3 -fno-gcse
+cOPT        = -O3
diff --git a/wmake/rules/linux64Gcc/c++Opt b/wmake/rules/linux64Gcc/c++Opt
index f19996b72d..8ac07d2124 100644
--- a/wmake/rules/linux64Gcc/c++Opt
+++ b/wmake/rules/linux64Gcc/c++Opt
@@ -1,4 +1,4 @@
 c++DBUG     = 
-c++OPT      = -march=opteron -O3
+c++OPT      = -O3
 #c++OPT      = -march=nocona -O3
 # -ftree-vectorize -ftree-vectorizer-verbose=3
diff --git a/wmake/rules/linux64Gcc/cOpt b/wmake/rules/linux64Gcc/cOpt
index 7285a9de96..a8b0635478 100644
--- a/wmake/rules/linux64Gcc/cOpt
+++ b/wmake/rules/linux64Gcc/cOpt
@@ -1,2 +1,2 @@
 cDBUG       = 
-cOPT        = -march=opteron -O3 -fno-gcse
+cOPT        = -O3
diff --git a/wmake/rules/linux64Gcc/general b/wmake/rules/linux64Gcc/general
index 11b48acc3f..3c2e4db2ee 100644
--- a/wmake/rules/linux64Gcc/general
+++ b/wmake/rules/linux64Gcc/general
@@ -1,5 +1,5 @@
 CPP        = /lib/cpp $(GFLAGS)
-LD         = ld -A64
+LD         = ld
 
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
 
diff --git a/wmake/rules/linux64Gcc42/c++Opt b/wmake/rules/linux64Gcc42/c++Opt
index f19996b72d..8ac07d2124 100644
--- a/wmake/rules/linux64Gcc42/c++Opt
+++ b/wmake/rules/linux64Gcc42/c++Opt
@@ -1,4 +1,4 @@
 c++DBUG     = 
-c++OPT      = -march=opteron -O3
+c++OPT      = -O3
 #c++OPT      = -march=nocona -O3
 # -ftree-vectorize -ftree-vectorizer-verbose=3
diff --git a/wmake/rules/linux64Gcc42/cOpt b/wmake/rules/linux64Gcc42/cOpt
index 7285a9de96..a8b0635478 100644
--- a/wmake/rules/linux64Gcc42/cOpt
+++ b/wmake/rules/linux64Gcc42/cOpt
@@ -1,2 +1,2 @@
 cDBUG       = 
-cOPT        = -march=opteron -O3 -fno-gcse
+cOPT        = -O3
diff --git a/wmake/rules/linuxGcc/c++ b/wmake/rules/linuxGcc/c++
index ab2410d3d0..64d6797573 100644
--- a/wmake/rules/linuxGcc/c++
+++ b/wmake/rules/linuxGcc/c++
@@ -8,7 +8,7 @@ include $(RULES)/c++$(WM_COMPILE_OPTION)
 
 ptFLAGS     = -DNoRepository -ftemplate-depth-40
 
-c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC -pthread
+c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
 
 Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
 cxxtoo      = $(Ctoo)
diff --git a/wmake/rules/linuxGcc/cDebug b/wmake/rules/linuxGcc/cDebug
index 6c71ed93e8..72b638f458 100644
--- a/wmake/rules/linuxGcc/cDebug
+++ b/wmake/rules/linuxGcc/cDebug
@@ -1,2 +1,2 @@
 cDBUG       = -ggdb -DFULLDEBUG
-cOPT        = -O1 -finline-functions
+cOPT        = -O1 -fdefault-inline -finline-functions
diff --git a/wmake/rules/linuxGcc/general b/wmake/rules/linuxGcc/general
index c300368ee6..d009001a6e 100644
--- a/wmake/rules/linuxGcc/general
+++ b/wmake/rules/linuxGcc/general
@@ -1,10 +1,11 @@
 CPP        = /lib/cpp $(GFLAGS)
 LD         = ld -melf_i386
 
-PROJECT_LIBS = -l$(WM_PROJECT) -ldl
+PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
 
 include $(GENERAL_RULES)/standard
 
 include $(RULES)/X
 include $(RULES)/c
 include $(RULES)/c++
+include $(GENERAL_RULES)/cint
diff --git a/wmake/rules/linuxIA64Gcc/cOpt b/wmake/rules/linuxIA64Gcc/cOpt
index aaaebef3d3..a8b0635478 100644
--- a/wmake/rules/linuxIA64Gcc/cOpt
+++ b/wmake/rules/linuxIA64Gcc/cOpt
@@ -1,2 +1,2 @@
 cDBUG       = 
-cOPT        = -O3 -fno-gcse
+cOPT        = -O3
diff --git a/wmake/rules/linuxPPC64Gcc/cOpt b/wmake/rules/linuxPPC64Gcc/cOpt
index e6512b7aab..17318709f1 100644
--- a/wmake/rules/linuxPPC64Gcc/cOpt
+++ b/wmake/rules/linuxPPC64Gcc/cOpt
@@ -1,2 +1,2 @@
 cDBUG       =
-cOPT        = -O3 -fno-gcse
+cOPT        = -O3

From 80d533325a06cf63ee194f1c3699eb001b70cf12 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Wed, 29 Apr 2009 11:56:08 +0100
Subject: [PATCH 067/175] added comment

---
 .../utilities/parallelProcessing/decomposePar/decomposePar.C   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index 26ee3e062a..644511564e 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -37,6 +37,9 @@ Usage
     Write the cell distribution as a labelList for use with 'manual'
     decomposition method and as a volScalarField for post-processing.
 
+    @param -region regionName \n
+    Decompose named region. Does not check for existence of processor*.
+
     @param -copyUniform \n
     Copy any @a uniform directories too.
 

From 433b209702ca76905a5e4bd4b4cb53cb4abce848 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Thu, 30 Apr 2009 08:32:48 +0200
Subject: [PATCH 068/175] update to openmpi-1.3.2, prepare for newly released
 gcc-4.4

- added rules for gcc-4.3 in preparation for switching to gcc-4.4

- added 'clean' target for wmake/src/Makefile
  It is probably reasonable to separate the binaries from the rules (TODO)
---
 etc/settings.csh                       |  7 ++++++-
 etc/settings.sh                        |  9 +++++++--
 wmake/rules/linux64Gcc43/X             |  3 +++
 wmake/rules/linux64Gcc43/c             | 16 ++++++++++++++++
 wmake/rules/linux64Gcc43/c++           | 21 +++++++++++++++++++++
 wmake/rules/linux64Gcc43/c++Debug      |  2 ++
 wmake/rules/linux64Gcc43/c++Opt        |  4 ++++
 wmake/rules/linux64Gcc43/c++Prof       |  2 ++
 wmake/rules/linux64Gcc43/cDebug        |  2 ++
 wmake/rules/linux64Gcc43/cOpt          |  2 ++
 wmake/rules/linux64Gcc43/cProf         |  2 ++
 wmake/rules/linux64Gcc43/general       | 11 +++++++++++
 wmake/rules/linux64Gcc43/mplib         |  3 +++
 wmake/rules/linux64Gcc43/mplibGAMMA    |  3 +++
 wmake/rules/linux64Gcc43/mplibHPMPI    |  3 +++
 wmake/rules/linux64Gcc43/mplibLAM      |  3 +++
 wmake/rules/linux64Gcc43/mplibMPICH    |  3 +++
 wmake/rules/linux64Gcc43/mplibMPICH-GM |  3 +++
 wmake/rules/linux64Gcc43/mplibOPENMPI  |  3 +++
 wmake/rules/linux64Gcc43/mplibQSMPI    |  4 ++++
 wmake/rules/linuxGcc43/X               |  3 +++
 wmake/rules/linuxGcc43/c               | 16 ++++++++++++++++
 wmake/rules/linuxGcc43/c++             | 21 +++++++++++++++++++++
 wmake/rules/linuxGcc43/c++Debug        |  2 ++
 wmake/rules/linuxGcc43/c++Opt          |  2 ++
 wmake/rules/linuxGcc43/c++Prof         |  2 ++
 wmake/rules/linuxGcc43/cDebug          |  2 ++
 wmake/rules/linuxGcc43/cOpt            |  2 ++
 wmake/rules/linuxGcc43/cProf           |  2 ++
 wmake/rules/linuxGcc43/general         | 10 ++++++++++
 wmake/rules/linuxGcc43/mplib           |  3 +++
 wmake/rules/linuxGcc43/mplibGAMMA      |  3 +++
 wmake/rules/linuxGcc43/mplibHPMPI      |  3 +++
 wmake/rules/linuxGcc43/mplibLAM        |  3 +++
 wmake/rules/linuxGcc43/mplibMPICH      |  3 +++
 wmake/rules/linuxGcc43/mplibMPICH-GM   |  3 +++
 wmake/rules/linuxGcc43/mplibOPENMPI    |  3 +++
 wmake/src/Makefile                     |  8 +++++++-
 38 files changed, 193 insertions(+), 4 deletions(-)
 create mode 100644 wmake/rules/linux64Gcc43/X
 create mode 100644 wmake/rules/linux64Gcc43/c
 create mode 100644 wmake/rules/linux64Gcc43/c++
 create mode 100644 wmake/rules/linux64Gcc43/c++Debug
 create mode 100644 wmake/rules/linux64Gcc43/c++Opt
 create mode 100644 wmake/rules/linux64Gcc43/c++Prof
 create mode 100644 wmake/rules/linux64Gcc43/cDebug
 create mode 100644 wmake/rules/linux64Gcc43/cOpt
 create mode 100644 wmake/rules/linux64Gcc43/cProf
 create mode 100644 wmake/rules/linux64Gcc43/general
 create mode 100644 wmake/rules/linux64Gcc43/mplib
 create mode 100644 wmake/rules/linux64Gcc43/mplibGAMMA
 create mode 100644 wmake/rules/linux64Gcc43/mplibHPMPI
 create mode 100644 wmake/rules/linux64Gcc43/mplibLAM
 create mode 100644 wmake/rules/linux64Gcc43/mplibMPICH
 create mode 100644 wmake/rules/linux64Gcc43/mplibMPICH-GM
 create mode 100644 wmake/rules/linux64Gcc43/mplibOPENMPI
 create mode 100644 wmake/rules/linux64Gcc43/mplibQSMPI
 create mode 100644 wmake/rules/linuxGcc43/X
 create mode 100644 wmake/rules/linuxGcc43/c
 create mode 100644 wmake/rules/linuxGcc43/c++
 create mode 100644 wmake/rules/linuxGcc43/c++Debug
 create mode 100644 wmake/rules/linuxGcc43/c++Opt
 create mode 100644 wmake/rules/linuxGcc43/c++Prof
 create mode 100644 wmake/rules/linuxGcc43/cDebug
 create mode 100644 wmake/rules/linuxGcc43/cOpt
 create mode 100644 wmake/rules/linuxGcc43/cProf
 create mode 100644 wmake/rules/linuxGcc43/general
 create mode 100644 wmake/rules/linuxGcc43/mplib
 create mode 100644 wmake/rules/linuxGcc43/mplibGAMMA
 create mode 100644 wmake/rules/linuxGcc43/mplibHPMPI
 create mode 100644 wmake/rules/linuxGcc43/mplibLAM
 create mode 100644 wmake/rules/linuxGcc43/mplibMPICH
 create mode 100644 wmake/rules/linuxGcc43/mplibMPICH-GM
 create mode 100644 wmake/rules/linuxGcc43/mplibOPENMPI

diff --git a/etc/settings.csh b/etc/settings.csh
index d0a1e99665..639f2eac63 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -83,6 +83,11 @@ case OpenFOAM:
         _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
         _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
     breaksw
+    case Gcc43:
+        setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.3.3/platforms/$WM_ARCH$WM_COMPILER_ARCH
+        _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
+        _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
+    breaksw
     case Gcc42:
         setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH
     breaksw
@@ -113,7 +118,7 @@ unset MPI_ARCH_PATH
 
 switch ("$WM_MPLIB")
 case OPENMPI:
-    set mpi_version=openmpi-1.3
+    set mpi_version=openmpi-1.3.2
     setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
     setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
 
diff --git a/etc/settings.sh b/etc/settings.sh
index 14258eac67..aacd41f8bc 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -93,7 +93,7 @@ unset compilerBin compilerLib
 # compilerInstall = OpenFOAM | System
 compilerInstall=OpenFOAM
 
-case "$compilerInstall" in
+case "${compilerInstall:-OpenFOAM}" in
 OpenFOAM)
     case "$WM_COMPILER" in
     Gcc)
@@ -101,6 +101,11 @@ OpenFOAM)
         _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
         _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
         ;;
+    Gcc43)
+        export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.3.3/platforms/$WM_ARCH$WM_COMPILER_ARCH
+        _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
+        _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
+        ;;
     Gcc42)
         export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH
         ;;
@@ -137,7 +142,7 @@ unset MPI_ARCH_PATH
 
 case "$WM_MPLIB" in
 OPENMPI)
-    mpi_version=openmpi-1.3
+    mpi_version=openmpi-1.3.2
     export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
     export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
 
diff --git a/wmake/rules/linux64Gcc43/X b/wmake/rules/linux64Gcc43/X
new file mode 100644
index 0000000000..5d1f9c5cc5
--- /dev/null
+++ b/wmake/rules/linux64Gcc43/X
@@ -0,0 +1,3 @@
+XFLAGS     =
+XINC       = $(XFLAGS) -I/usr/X11R6/include
+XLIBS      = -L/usr/X11R6/lib64 -lXext -lX11
diff --git a/wmake/rules/linux64Gcc43/c b/wmake/rules/linux64Gcc43/c
new file mode 100644
index 0000000000..80bb80f32f
--- /dev/null
+++ b/wmake/rules/linux64Gcc43/c
@@ -0,0 +1,16 @@
+.SUFFIXES: .c .h
+
+cWARN        = -Wall
+
+cc          = gcc -m64
+
+include $(RULES)/c$(WM_COMPILE_OPTION)
+
+cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
+
+ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
+
+LINK_LIBS   = $(cDBUG)
+
+LINKLIBSO   = $(cc) -shared
+LINKEXE     = $(cc) -Xlinker -z -Xlinker nodefs
diff --git a/wmake/rules/linux64Gcc43/c++ b/wmake/rules/linux64Gcc43/c++
new file mode 100644
index 0000000000..36b5c29b20
--- /dev/null
+++ b/wmake/rules/linux64Gcc43/c++
@@ -0,0 +1,21 @@
+.SUFFIXES: .C .cxx .cc .cpp
+
+c++WARN     = -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wold-style-cast
+
+CC          = g++ -m64
+
+include $(RULES)/c++$(WM_COMPILE_OPTION)
+
+ptFLAGS     = -DNoRepository -ftemplate-depth-40
+
+c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
+
+Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
+cxxtoo      = $(Ctoo)
+cctoo       = $(Ctoo)
+cpptoo      = $(Ctoo)
+
+LINK_LIBS   = $(c++DBUG)
+
+LINKLIBSO   = $(CC) $(c++FLAGS) -shared
+LINKEXE     = $(CC) $(c++FLAGS)
diff --git a/wmake/rules/linux64Gcc43/c++Debug b/wmake/rules/linux64Gcc43/c++Debug
new file mode 100644
index 0000000000..19bdb9c334
--- /dev/null
+++ b/wmake/rules/linux64Gcc43/c++Debug
@@ -0,0 +1,2 @@
+c++DBUG    = -ggdb3 -DFULLDEBUG
+c++OPT      = -O0 -fdefault-inline
diff --git a/wmake/rules/linux64Gcc43/c++Opt b/wmake/rules/linux64Gcc43/c++Opt
new file mode 100644
index 0000000000..f19996b72d
--- /dev/null
+++ b/wmake/rules/linux64Gcc43/c++Opt
@@ -0,0 +1,4 @@
+c++DBUG     = 
+c++OPT      = -march=opteron -O3
+#c++OPT      = -march=nocona -O3
+# -ftree-vectorize -ftree-vectorizer-verbose=3
diff --git a/wmake/rules/linux64Gcc43/c++Prof b/wmake/rules/linux64Gcc43/c++Prof
new file mode 100644
index 0000000000..3bda4dad55
--- /dev/null
+++ b/wmake/rules/linux64Gcc43/c++Prof
@@ -0,0 +1,2 @@
+c++DBUG    = -pg
+c++OPT     = -O2
diff --git a/wmake/rules/linux64Gcc43/cDebug b/wmake/rules/linux64Gcc43/cDebug
new file mode 100644
index 0000000000..72b638f458
--- /dev/null
+++ b/wmake/rules/linux64Gcc43/cDebug
@@ -0,0 +1,2 @@
+cDBUG       = -ggdb -DFULLDEBUG
+cOPT        = -O1 -fdefault-inline -finline-functions
diff --git a/wmake/rules/linux64Gcc43/cOpt b/wmake/rules/linux64Gcc43/cOpt
new file mode 100644
index 0000000000..7285a9de96
--- /dev/null
+++ b/wmake/rules/linux64Gcc43/cOpt
@@ -0,0 +1,2 @@
+cDBUG       = 
+cOPT        = -march=opteron -O3 -fno-gcse
diff --git a/wmake/rules/linux64Gcc43/cProf b/wmake/rules/linux64Gcc43/cProf
new file mode 100644
index 0000000000..ca3ac9bf5f
--- /dev/null
+++ b/wmake/rules/linux64Gcc43/cProf
@@ -0,0 +1,2 @@
+cDBUG       = -pg
+cOPT        = -O2
diff --git a/wmake/rules/linux64Gcc43/general b/wmake/rules/linux64Gcc43/general
new file mode 100644
index 0000000000..11b48acc3f
--- /dev/null
+++ b/wmake/rules/linux64Gcc43/general
@@ -0,0 +1,11 @@
+CPP        = /lib/cpp $(GFLAGS)
+LD         = ld -A64
+
+PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
+
+include $(GENERAL_RULES)/standard
+
+include $(RULES)/X
+include $(RULES)/c
+include $(RULES)/c++
+include $(GENERAL_RULES)/cint
diff --git a/wmake/rules/linux64Gcc43/mplib b/wmake/rules/linux64Gcc43/mplib
new file mode 100644
index 0000000000..8a84b40146
--- /dev/null
+++ b/wmake/rules/linux64Gcc43/mplib
@@ -0,0 +1,3 @@
+PFLAGS     = 
+PINC       = 
+PLIBS      = 
diff --git a/wmake/rules/linux64Gcc43/mplibGAMMA b/wmake/rules/linux64Gcc43/mplibGAMMA
new file mode 100644
index 0000000000..d62c6250ff
--- /dev/null
+++ b/wmake/rules/linux64Gcc43/mplibGAMMA
@@ -0,0 +1,3 @@
+PFLAGS     = 
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linux64Gcc43/mplibHPMPI b/wmake/rules/linux64Gcc43/mplibHPMPI
new file mode 100644
index 0000000000..574492a236
--- /dev/null
+++ b/wmake/rules/linux64Gcc43/mplibHPMPI
@@ -0,0 +1,3 @@
+PFLAGS     =
+PINC       = -I$(MPI_ARCH_PATH)/include -D_MPICC_H
+PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_amd64 -lmpi
diff --git a/wmake/rules/linux64Gcc43/mplibLAM b/wmake/rules/linux64Gcc43/mplibLAM
new file mode 100644
index 0000000000..6762b843c1
--- /dev/null
+++ b/wmake/rules/linux64Gcc43/mplibLAM
@@ -0,0 +1,3 @@
+PFLAGS     = 
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
diff --git a/wmake/rules/linux64Gcc43/mplibMPICH b/wmake/rules/linux64Gcc43/mplibMPICH
new file mode 100644
index 0000000000..ac17f7c1d2
--- /dev/null
+++ b/wmake/rules/linux64Gcc43/mplibMPICH
@@ -0,0 +1,3 @@
+PFLAGS     = 
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linux64Gcc43/mplibMPICH-GM b/wmake/rules/linux64Gcc43/mplibMPICH-GM
new file mode 100644
index 0000000000..88493ebc70
--- /dev/null
+++ b/wmake/rules/linux64Gcc43/mplibMPICH-GM
@@ -0,0 +1,3 @@
+PFLAGS     =
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/linux64Gcc43/mplibOPENMPI b/wmake/rules/linux64Gcc43/mplibOPENMPI
new file mode 100644
index 0000000000..834d2d3e22
--- /dev/null
+++ b/wmake/rules/linux64Gcc43/mplibOPENMPI
@@ -0,0 +1,3 @@
+PFLAGS     = -DOMPI_SKIP_MPICXX
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linux64Gcc43/mplibQSMPI b/wmake/rules/linux64Gcc43/mplibQSMPI
new file mode 100644
index 0000000000..95ea327379
--- /dev/null
+++ b/wmake/rules/linux64Gcc43/mplibQSMPI
@@ -0,0 +1,4 @@
+PFLAGS     =
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
+
diff --git a/wmake/rules/linuxGcc43/X b/wmake/rules/linuxGcc43/X
new file mode 100644
index 0000000000..bed8bfeddf
--- /dev/null
+++ b/wmake/rules/linuxGcc43/X
@@ -0,0 +1,3 @@
+XFLAGS     =
+XINC       = $(XFLAGS) -I/usr/X11R6/include
+XLIBS      = -L/usr/X11R6/lib -lXext -lX11
diff --git a/wmake/rules/linuxGcc43/c b/wmake/rules/linuxGcc43/c
new file mode 100644
index 0000000000..8db5da1047
--- /dev/null
+++ b/wmake/rules/linuxGcc43/c
@@ -0,0 +1,16 @@
+.SUFFIXES: .c .h
+
+cWARN        = -Wall
+
+cc          = gcc -m32
+
+include $(RULES)/c$(WM_COMPILE_OPTION)
+
+cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
+
+ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
+
+LINK_LIBS   = $(cDBUG)
+
+LINKLIBSO   = $(cc) -shared
+LINKEXE     = $(cc) -Xlinker -z -Xlinker nodefs
diff --git a/wmake/rules/linuxGcc43/c++ b/wmake/rules/linuxGcc43/c++
new file mode 100644
index 0000000000..ab2410d3d0
--- /dev/null
+++ b/wmake/rules/linuxGcc43/c++
@@ -0,0 +1,21 @@
+.SUFFIXES: .C .cxx .cc .cpp
+
+c++WARN     = -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wold-style-cast
+
+CC          = g++ -m32
+
+include $(RULES)/c++$(WM_COMPILE_OPTION)
+
+ptFLAGS     = -DNoRepository -ftemplate-depth-40
+
+c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC -pthread
+
+Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
+cxxtoo      = $(Ctoo)
+cctoo       = $(Ctoo)
+cpptoo      = $(Ctoo)
+
+LINK_LIBS   = $(c++DBUG)
+
+LINKLIBSO   = $(CC) $(c++FLAGS) -shared
+LINKEXE     = $(CC) $(c++FLAGS)
diff --git a/wmake/rules/linuxGcc43/c++Debug b/wmake/rules/linuxGcc43/c++Debug
new file mode 100644
index 0000000000..19bdb9c334
--- /dev/null
+++ b/wmake/rules/linuxGcc43/c++Debug
@@ -0,0 +1,2 @@
+c++DBUG    = -ggdb3 -DFULLDEBUG
+c++OPT      = -O0 -fdefault-inline
diff --git a/wmake/rules/linuxGcc43/c++Opt b/wmake/rules/linuxGcc43/c++Opt
new file mode 100644
index 0000000000..4cb95b5b3a
--- /dev/null
+++ b/wmake/rules/linuxGcc43/c++Opt
@@ -0,0 +1,2 @@
+c++DBUG     = 
+c++OPT      = -O3
diff --git a/wmake/rules/linuxGcc43/c++Prof b/wmake/rules/linuxGcc43/c++Prof
new file mode 100644
index 0000000000..3bda4dad55
--- /dev/null
+++ b/wmake/rules/linuxGcc43/c++Prof
@@ -0,0 +1,2 @@
+c++DBUG    = -pg
+c++OPT     = -O2
diff --git a/wmake/rules/linuxGcc43/cDebug b/wmake/rules/linuxGcc43/cDebug
new file mode 100644
index 0000000000..6c71ed93e8
--- /dev/null
+++ b/wmake/rules/linuxGcc43/cDebug
@@ -0,0 +1,2 @@
+cDBUG       = -ggdb -DFULLDEBUG
+cOPT        = -O1 -finline-functions
diff --git a/wmake/rules/linuxGcc43/cOpt b/wmake/rules/linuxGcc43/cOpt
new file mode 100644
index 0000000000..a8b0635478
--- /dev/null
+++ b/wmake/rules/linuxGcc43/cOpt
@@ -0,0 +1,2 @@
+cDBUG       = 
+cOPT        = -O3
diff --git a/wmake/rules/linuxGcc43/cProf b/wmake/rules/linuxGcc43/cProf
new file mode 100644
index 0000000000..ca3ac9bf5f
--- /dev/null
+++ b/wmake/rules/linuxGcc43/cProf
@@ -0,0 +1,2 @@
+cDBUG       = -pg
+cOPT        = -O2
diff --git a/wmake/rules/linuxGcc43/general b/wmake/rules/linuxGcc43/general
new file mode 100644
index 0000000000..c300368ee6
--- /dev/null
+++ b/wmake/rules/linuxGcc43/general
@@ -0,0 +1,10 @@
+CPP        = /lib/cpp $(GFLAGS)
+LD         = ld -melf_i386
+
+PROJECT_LIBS = -l$(WM_PROJECT) -ldl
+
+include $(GENERAL_RULES)/standard
+
+include $(RULES)/X
+include $(RULES)/c
+include $(RULES)/c++
diff --git a/wmake/rules/linuxGcc43/mplib b/wmake/rules/linuxGcc43/mplib
new file mode 100644
index 0000000000..8a84b40146
--- /dev/null
+++ b/wmake/rules/linuxGcc43/mplib
@@ -0,0 +1,3 @@
+PFLAGS     = 
+PINC       = 
+PLIBS      = 
diff --git a/wmake/rules/linuxGcc43/mplibGAMMA b/wmake/rules/linuxGcc43/mplibGAMMA
new file mode 100644
index 0000000000..d62c6250ff
--- /dev/null
+++ b/wmake/rules/linuxGcc43/mplibGAMMA
@@ -0,0 +1,3 @@
+PFLAGS     = 
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linuxGcc43/mplibHPMPI b/wmake/rules/linuxGcc43/mplibHPMPI
new file mode 100644
index 0000000000..8aff40632b
--- /dev/null
+++ b/wmake/rules/linuxGcc43/mplibHPMPI
@@ -0,0 +1,3 @@
+PFLAGS     =
+PINC       = -I$(MPI_ARCH_PATH)/include -D_MPICC_H
+PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi
diff --git a/wmake/rules/linuxGcc43/mplibLAM b/wmake/rules/linuxGcc43/mplibLAM
new file mode 100644
index 0000000000..6762b843c1
--- /dev/null
+++ b/wmake/rules/linuxGcc43/mplibLAM
@@ -0,0 +1,3 @@
+PFLAGS     = 
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
diff --git a/wmake/rules/linuxGcc43/mplibMPICH b/wmake/rules/linuxGcc43/mplibMPICH
new file mode 100644
index 0000000000..ac17f7c1d2
--- /dev/null
+++ b/wmake/rules/linuxGcc43/mplibMPICH
@@ -0,0 +1,3 @@
+PFLAGS     = 
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxGcc43/mplibMPICH-GM b/wmake/rules/linuxGcc43/mplibMPICH-GM
new file mode 100644
index 0000000000..88493ebc70
--- /dev/null
+++ b/wmake/rules/linuxGcc43/mplibMPICH-GM
@@ -0,0 +1,3 @@
+PFLAGS     =
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/linuxGcc43/mplibOPENMPI b/wmake/rules/linuxGcc43/mplibOPENMPI
new file mode 100644
index 0000000000..834d2d3e22
--- /dev/null
+++ b/wmake/rules/linuxGcc43/mplibOPENMPI
@@ -0,0 +1,3 @@
+PFLAGS     = -DOMPI_SKIP_MPICXX
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/src/Makefile b/wmake/src/Makefile
index 798c5503f3..11900fd6a0 100644
--- a/wmake/src/Makefile
+++ b/wmake/src/Makefile
@@ -29,7 +29,9 @@
 #     Makefile used to compile wmake utilities.
 #
 #------------------------------------------------------------------------------
-# Set shell the Makefile uses to the Bourne shell
+
+#------------------------------------------------------------------------------
+# The Makefile use a POSIX shell
 #------------------------------------------------------------------------------
 
 SHELL      = /bin/sh
@@ -45,6 +47,10 @@ RULES_DIR = $(WM_DIR)/rules/$(WM_ARCH)$(WM_COMPILER)
 
 all:  $(RULES_DIR)/dirToString $(RULES_DIR)/wmkdep
 
+clean:
+	rm -f $(RULES_DIR)/dirToString $(RULES_DIR)/wmkdep 2>/dev/null
+
+
 $(RULES_DIR)/dirToString: dirToString.c
 	$(cc) $(cFLAGS) dirToString.c -o $(RULES_DIR)/dirToString
 

From fd44798f82391208ac6a36c4b6cce5101cea44e4 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Thu, 30 Apr 2009 09:45:03 +0200
Subject: [PATCH 069/175] avoid persistent settings and spurious messages when
 re-reading fvSchemes

- emit warning for deprecated timeScheme entry
---
 .../finiteVolume/fvSchemes/fvSchemes.C        | 140 ++++++++++++------
 .../finiteVolume/fvSchemes/fvSchemes.H        |   7 +-
 2 files changed, 101 insertions(+), 46 deletions(-)

diff --git a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
index b66d628cae..f9354e3d84 100644
--- a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
+++ b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
@@ -27,10 +27,34 @@ License
 #include "fvSchemes.H"
 #include "Time.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
 
 int Foam::fvSchemes::debug(Foam::debug::debugSwitch("fvSchemes", false));
 
+// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
+
+void Foam::fvSchemes::clear()
+{
+    ddtSchemes_.clear();
+    defaultDdtScheme_.clear();
+    d2dt2Schemes_.clear();
+    defaultD2dt2Scheme_.clear();
+    interpolationSchemes_.clear();
+    defaultInterpolationScheme_.clear();
+    divSchemes_.clear(); // optional
+    defaultDivScheme_.clear();
+    gradSchemes_.clear(); // optional
+    defaultGradScheme_.clear();
+    snGradSchemes_.clear();
+    defaultSnGradScheme_.clear();
+    laplacianSchemes_.clear(); // optional
+    defaultLaplacianScheme_.clear();
+    fluxRequired_.clear();
+    defaultFluxRequired_ = false;
+    cacheFields_.clear();
+}
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::fvSchemes::fvSchemes(const objectRegistry& obr)
@@ -48,8 +72,11 @@ Foam::fvSchemes::fvSchemes(const objectRegistry& obr)
     ),
     ddtSchemes_
     (
-        ITstream(objectPath() + "::ddtSchemes",
-        tokenList())()
+        ITstream
+        (
+            objectPath() + "::ddtSchemes",
+            tokenList()
+        )()
     ),
     defaultDdtScheme_
     (
@@ -58,8 +85,11 @@ Foam::fvSchemes::fvSchemes(const objectRegistry& obr)
     ),
     d2dt2Schemes_
     (
-        ITstream(objectPath() + "::d2dt2Schemes",
-        tokenList())()
+        ITstream
+        (
+            objectPath() + "::d2dt2Schemes",
+            tokenList()
+        )()
     ),
     defaultD2dt2Scheme_
     (
@@ -68,8 +98,11 @@ Foam::fvSchemes::fvSchemes(const objectRegistry& obr)
     ),
     interpolationSchemes_
     (
-        ITstream(objectPath() + "::interpolationSchemes",
-        tokenList())()
+        ITstream
+        (
+            objectPath() + "::interpolationSchemes",
+            tokenList()
+        )()
     ),
     defaultInterpolationScheme_
     (
@@ -78,8 +111,11 @@ Foam::fvSchemes::fvSchemes(const objectRegistry& obr)
     ),
     divSchemes_
     (
-        ITstream(objectPath() + "::divSchemes",
-        tokenList())()
+        ITstream
+        (
+            objectPath() + "::divSchemes",
+            tokenList()
+        )()
     ),
     defaultDivScheme_
     (
@@ -88,8 +124,11 @@ Foam::fvSchemes::fvSchemes(const objectRegistry& obr)
     ),
     gradSchemes_
     (
-        ITstream(objectPath() + "::gradSchemes",
-        tokenList())()
+        ITstream
+        (
+            objectPath() + "::gradSchemes",
+            tokenList()
+        )()
     ),
     defaultGradScheme_
     (
@@ -98,8 +137,11 @@ Foam::fvSchemes::fvSchemes(const objectRegistry& obr)
     ),
     snGradSchemes_
     (
-        ITstream(objectPath() + "::snGradSchemes",
-        tokenList())()
+        ITstream
+        (
+            objectPath() + "::snGradSchemes",
+            tokenList()
+        )()
     ),
     defaultSnGradScheme_
     (
@@ -108,8 +150,11 @@ Foam::fvSchemes::fvSchemes(const objectRegistry& obr)
     ),
     laplacianSchemes_
     (
-        ITstream(objectPath() + "::laplacianSchemes",
-        tokenList())()
+        ITstream
+        (
+            objectPath() + "::laplacianSchemes",
+            tokenList()
+        )()
     ),
     defaultLaplacianScheme_
     (
@@ -118,14 +163,20 @@ Foam::fvSchemes::fvSchemes(const objectRegistry& obr)
     ),
     fluxRequired_
     (
-        ITstream(objectPath() + "::fluxRequired",
-        tokenList())()
+        ITstream
+        (
+            objectPath() + "::fluxRequired",
+            tokenList()
+        )()
     ),
     defaultFluxRequired_(false),
     cacheFields_
     (
-        ITstream(objectPath() + "::cacheFields",
-        tokenList())()
+        ITstream
+        (
+            objectPath() + "::cacheFields",
+            tokenList()
+        )()
     )
 {
     read();
@@ -140,6 +191,9 @@ bool Foam::fvSchemes::read()
     {
         const dictionary& dict = schemesDict();
 
+        // persistent settings across reads is incorrect
+        clear();
+
         if (dict.found("ddtSchemes"))
         {
             ddtSchemes_ = dict.subDict("ddtSchemes");
@@ -148,20 +202,23 @@ bool Foam::fvSchemes::read()
         {
             // For backward compatibility.
             // The timeScheme will be deprecated with warning or removed
+            WarningIn("fvSchemes::read()")
+                << "Using deprecated 'timeScheme' instead of 'ddtSchemes'"
+                << nl << endl;
 
-            word timeSchemeName(dict.lookup("timeScheme"));
+            word schemeName(dict.lookup("timeScheme"));
 
-            if (timeSchemeName == "EulerImplicit")
+            if (schemeName == "EulerImplicit")
             {
-                timeSchemeName = "Euler";
+                schemeName = "Euler";
             }
-            else if (timeSchemeName == "BackwardDifferencing")
+            else if (schemeName == "BackwardDifferencing")
             {
-                timeSchemeName = "backward";
+                schemeName = "backward";
             }
-            else if (timeSchemeName == "SteadyState")
+            else if (schemeName == "SteadyState")
             {
-                timeSchemeName = "steadyState";
+                schemeName = "steadyState";
             }
             else
             {
@@ -172,19 +229,14 @@ bool Foam::fvSchemes::read()
                     << exit(FatalIOError);
             }
 
-            if (ddtSchemes_.found("default"))
-            {
-                ddtSchemes_.remove("default");
-            }
-
-            ddtSchemes_.add("default", timeSchemeName);
+            ddtSchemes_.set("default", schemeName);
 
             ddtSchemes_.lookup("default")[0].lineNumber() =
                 dict.lookup("timeScheme").lineNumber();
         }
         else
         {
-            ddtSchemes_.add("default", "none");
+            ddtSchemes_.set("default", "none");
         }
 
         if
@@ -205,31 +257,29 @@ bool Foam::fvSchemes::read()
         {
             // For backward compatibility.
             // The timeScheme will be deprecated with warning or removed
+            WarningIn("fvSchemes::read()")
+                << "Using deprecated 'timeScheme' instead of 'd2dt2Schemes'"
+                << nl << endl;
 
-            word timeSchemeName(dict.lookup("timeScheme"));
+            word schemeName(dict.lookup("timeScheme"));
 
-            if (timeSchemeName == "EulerImplicit")
+            if (schemeName == "EulerImplicit")
             {
-                timeSchemeName = "Euler";
+                schemeName = "Euler";
             }
-            else if (timeSchemeName == "SteadyState")
+            else if (schemeName == "SteadyState")
             {
-                timeSchemeName = "steadyState";
+                schemeName = "steadyState";
             }
 
-            if (d2dt2Schemes_.found("default"))
-            {
-                d2dt2Schemes_.remove("default");
-            }
-
-            d2dt2Schemes_.add("default", timeSchemeName);
+            d2dt2Schemes_.set("default", schemeName);
 
             d2dt2Schemes_.lookup("default")[0].lineNumber() =
                 dict.lookup("timeScheme").lineNumber();
         }
         else
         {
-            d2dt2Schemes_.add("default", "none");
+            d2dt2Schemes_.set("default", "none");
         }
 
         if
diff --git a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H
index 3186085846..25a9da32c9 100644
--- a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H
+++ b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H
@@ -84,8 +84,13 @@ class fvSchemes
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct and assignment
+        //- Clear the dictionaries and streams before reading
+        void clear();
+
+        //- Disallow default bitwise copy construct
         fvSchemes(const fvSchemes&);
+
+        //- Disallow default bitwise assignment
         void operator=(const fvSchemes&);
 
 

From d78cf44114abc8f9ee86db2ec236470192874577 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Thu, 30 Apr 2009 09:23:39 +0100
Subject: [PATCH 070/175] changed error messages

---
 .../surfaceInterpolation/schemes/FitData/FitData.C           | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C
index 28a3c41e64..c1ea44c1e8 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C
@@ -56,7 +56,7 @@ Foam::FitData<Form, extendedStencil, Polynomial>::FitData
     // Check input
     if (linearLimitFactor <= SMALL || linearLimitFactor > 3)
     {
-        FatalErrorIn("FitData<Polynomial>::FitData")
+        FatalErrorIn("FitData<Polynomial>::FitData(..)")
             << "linearLimitFactor requested = " << linearLimitFactor
             << " should be between zero and 3"
             << exit(FatalError);
@@ -264,8 +264,7 @@ void Foam::FitData<FitDataType, ExtendedStencil, Polynomial>::calcFit
         // {
             WarningIn
             (
-                "FitData<Polynomial>::calcFit"
-                "(const List<point>& C, const label facei"
+                "FitData<Polynomial>::calcFit(..)"
             )   << "Could not fit face " << facei
                 << "    Weights = " << coeffsi
                 << ", reverting to linear." << nl

From 6b5f282937774e6a6d0ac68eabbbbdc8d62d76a3 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Thu, 30 Apr 2009 09:24:31 +0100
Subject: [PATCH 071/175] print ray directions

---
 .../radiation/radiationModel/fvDOM/fvDOM/fvDOM.C         | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C
index 9183931ba1..296b99ff9e 100644
--- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C
+++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C
@@ -250,6 +250,15 @@ Foam::radiation::fvDOM::fvDOM(const volScalarField& T)
             )
         );
     }
+
+    Info<< "fvDOM : Allocated " << IRay_.size()
+        << " rays with average orientation:" << nl;
+    forAll (IRay_, i)
+    {
+        Info<< '\t' << IRay_[i].I().name()
+            << '\t' << IRay_[i].dAve() << nl;
+    }
+    Info<< endl;
 }
 
 

From fb1256521ac38cefb19d3c51bc283acf95e95872 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Thu, 30 Apr 2009 15:42:51 +0100
Subject: [PATCH 072/175] added options handling

---
 .../scotchDecomp/scotchDecomp.C               | 128 +++++++++++++++---
 1 file changed, 109 insertions(+), 19 deletions(-)

diff --git a/src/decompositionMethods/decompositionMethods/scotchDecomp/scotchDecomp.C b/src/decompositionMethods/decompositionMethods/scotchDecomp/scotchDecomp.C
index 2746d8f4e9..854172d5e1 100644
--- a/src/decompositionMethods/decompositionMethods/scotchDecomp/scotchDecomp.C
+++ b/src/decompositionMethods/decompositionMethods/scotchDecomp/scotchDecomp.C
@@ -22,7 +22,40 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-S       Strat=b{job=t,map=t,poli=S,sep=(m{asc=b{bnd=d{pass=40,dif=1,rem=1}f{move=80,pass=-1,bal=0.005},org=f{move=80,pass=-1,bal=0.005},width=3},low=h{pass=10}f{move=80,pass=-1,bal=0.0005},type=h,vert=80,rat=0.8}|m{asc=b{bnd=d{pass=40,dif=1,rem=1}f{move=80,pass=-1,bal=0.005},org=f{move=80,pass=-1,bal=0.005},width=3},low=h{pass=10}f{move=80,pass=-1,bal=0.0005},type=h,vert=80,rat=0.8})}
+    Default strategy:
+        Strat=b
+        {
+            job=t,
+            map=t,
+            poli=S,
+            sep=
+            (
+                m
+                {
+                    asc=b
+                    {
+                        bnd=d{pass=40,dif=1,rem=1}f{move=80,pass=-1,bal=0.005},
+                        org=f{move=80,pass=-1,bal=0.005},width=3
+                    },
+                    low=h{pass=10}f{move=80,pass=-1,bal=0.0005},
+                    type=h,
+                    vert=80,
+                    rat=0.8
+                }
+              | m
+                {
+                    asc=b
+                    {
+                        bnd=d{pass=40,dif=1,rem=1}f{move=80,pass=-1,bal=0.005},
+                        org=f{move=80,pass=-1,bal=0.005},
+                        width=3},
+                        low=h{pass=10}f{move=80,pass=-1,bal=0.0005},
+                        type=h,
+                        vert=80,
+                        rat=0.8
+                }
+            )
+        }
 \*---------------------------------------------------------------------------*/
 
 #include "scotchDecomp.H"
@@ -31,6 +64,7 @@ S       Strat=b{job=t,map=t,poli=S,sep=(m{asc=b{bnd=d{pass=40,dif=1,rem=1}f{move
 #include "IFstream.H"
 #include "Time.H"
 #include "cyclicPolyPatch.H"
+#include "OFstream.H"
 
 extern "C"
 {
@@ -113,46 +147,102 @@ Foam::label Foam::scotchDecomp::decompose
     check(SCOTCH_graphCheck(&grafdat), "SCOTCH_graphCheck");
 
 
+    // Dump graph
+    if (decompositionDict_.found("scotchCoeffs"))
+    {
+        const dictionary& scotchCoeffs =
+            decompositionDict_.subDict("scotchCoeffs");
 
-    //// Architecture
-    //// ~~~~~~~~~~~~
-    //// (fully connected network topology since using switch)
-    //
-    //SCOTCH_Arch archdat;
-    //check(SCOTCH_archInit(&archdat), "SCOTCH_archInit");
-    //check
-    //(
-    //    // SCOTCH_archCmpltw for weighted.
-    //    SCOTCH_archCmplt(&archdat, nProcessors_),
-    //    "SCOTCH_archCmplt"
-    //);
+        Switch writeGraph(scotchCoeffs.lookup("writeGraph"));
+
+        if (writeGraph)
+        {
+            OFstream str(mesh_.time().path() / mesh_.name() + ".grf");
+
+            Info<< "Dumping Scotch graph file to " << str.name() << endl
+                << "Use this in combination with gpart." << endl;
+
+            label version = 0;
+            str << version << nl;
+            // Numer of vertices
+            str << xadj.size()-1 << ' ' << adjncy.size() << nl;
+            // Numbering starts from 0
+            label baseval = 0;
+            // Has weights?
+            label hasEdgeWeights = 0;
+            label hasVertexWeights = 0;
+            label numericflag = 10*hasEdgeWeights+hasVertexWeights;
+            str << baseval << ' ' << numericflag << nl;
+            for (label cellI = 0; cellI < xadj.size()-1; cellI++)
+            {
+                label start = xadj[cellI];
+                label end = xadj[cellI+1];
+                str << end-start;
+
+                for (label i = start; i < end; i++)
+                {
+                    str << ' ' << adjncy[i];
+                }
+                str << nl;
+            }
+        }
+    }
 
 
+    // Architecture
+    // ~~~~~~~~~~~~
+    // (fully connected network topology since using switch)
+
+    SCOTCH_Arch archdat;
+    check(SCOTCH_archInit(&archdat), "SCOTCH_archInit");
+    check
+    (
+        // SCOTCH_archCmpltw for weighted.
+        SCOTCH_archCmplt(&archdat, nProcessors_),
+        "SCOTCH_archCmplt"
+    );
 
 
     //SCOTCH_Mapping mapdat;
     //SCOTCH_graphMapInit(&grafdat, &mapdat, &archdat, NULL);
     //SCOTCH_graphMapCompute(&grafdat, &mapdat, &stradat); /* Perform mapping */
+    //SCOTCH_graphMapExit(&grafdat, &mapdat);
 
-
+    
     finalDecomp.setSize(xadj.size()-1);
+    finalDecomp = 0;
     check
     (
-        SCOTCH_graphPart
+        SCOTCH_graphMap
         (
             &grafdat,
-            nProcessors_,       // partnbr
+            &archdat,
             &stradat,           // const SCOTCH_Strat * 
             finalDecomp.begin() // parttab
         ),
-        "SCOTCH_graphPart"
+        "SCOTCH_graphMap"
     );
 
+
+    //finalDecomp.setSize(xadj.size()-1);
+    //check
+    //(
+    //    SCOTCH_graphPart
+    //    (
+    //        &grafdat,
+    //        nProcessors_,       // partnbr
+    //        &stradat,           // const SCOTCH_Strat * 
+    //        finalDecomp.begin() // parttab
+    //    ),
+    //    "SCOTCH_graphPart"
+    //);
+
     // Release storage for graph
     SCOTCH_graphExit(&grafdat);
+    // Release storage for strategy
     SCOTCH_stratExit(&stradat);
-    //// Release storage for network topology
-    //SCOTCH_archExit(&archdat);
+    // Release storage for network topology
+    SCOTCH_archExit(&archdat);
 
     return 0;
 }

From cb97fa675ea65da151b33916fbcde1d11649782f Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Thu, 30 Apr 2009 15:43:20 +0100
Subject: [PATCH 073/175] use total number of cells/points in parallel

---
 src/meshTools/cellClassification/cellClassification.C     | 8 ++++----
 src/meshTools/cellDist/patchWave/patchDataWave.C          | 2 +-
 src/meshTools/cellDist/patchWave/patchWave.C              | 4 ++--
 .../LES/LESdeltas/smoothDelta/smoothDelta.C               | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/meshTools/cellClassification/cellClassification.C b/src/meshTools/cellClassification/cellClassification.C
index 9adf4c6526..f54876c9c5 100644
--- a/src/meshTools/cellClassification/cellClassification.C
+++ b/src/meshTools/cellClassification/cellClassification.C
@@ -323,10 +323,10 @@ void Foam::cellClassification::markCells
     MeshWave<cellInfo> cellInfoCalc
     (
         mesh_,
-        changedFaces,       // Labels of changed faces
-        changedFacesInfo,   // Information on changed faces
-        cellInfoList,       // Information on all cells
-        mesh_.nCells()      // max iterations
+        changedFaces,                       // Labels of changed faces
+        changedFacesInfo,                   // Information on changed faces
+        cellInfoList,                       // Information on all cells
+        mesh_.globalData().nTotalCells()    // max iterations
     );
 
     // Get information out of cellInfoList
diff --git a/src/meshTools/cellDist/patchWave/patchDataWave.C b/src/meshTools/cellDist/patchWave/patchDataWave.C
index 4bd42721ba..b22a110be6 100644
--- a/src/meshTools/cellDist/patchWave/patchDataWave.C
+++ b/src/meshTools/cellDist/patchWave/patchDataWave.C
@@ -226,7 +226,7 @@ void Foam::patchDataWave<TransferType>::correct()
         mesh(),
         changedFaces,
         faceDist,
-        mesh().nCells() // max iterations
+        mesh().globalData().nTotalCells() // max iterations
     );
 
 
diff --git a/src/meshTools/cellDist/patchWave/patchWave.C b/src/meshTools/cellDist/patchWave/patchWave.C
index 7cb3705925..f48d383559 100644
--- a/src/meshTools/cellDist/patchWave/patchWave.C
+++ b/src/meshTools/cellDist/patchWave/patchWave.C
@@ -28,7 +28,7 @@ License
 #include "polyMesh.H"
 #include "wallPoint.H"
 #include "MeshWave.H"
-
+#include "globalMeshData.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -187,7 +187,7 @@ void Foam::patchWave::correct()
         mesh(),
         changedFaces,
         faceDist,
-        mesh().nCells() // max iterations
+        mesh().globalData().nTotalCells()   // max iterations
     );
 
 
diff --git a/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.C b/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.C
index 7b836c60ee..bea05e9973 100644
--- a/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.C
+++ b/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.C
@@ -138,7 +138,7 @@ void smoothDelta::calcDelta()
         changedFacesInfo,
         faceDeltaData,
         cellDeltaData,
-        mesh_.nCells()  // max iterations
+        mesh_.globalData().nTotalCells()    // max iterations
     );
 
     forAll(delta_, cellI)

From 3d88003e77fa2b6df40eb62b44b7a6ae045fd7a2 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Thu, 30 Apr 2009 20:31:13 +0100
Subject: [PATCH 074/175] order of creation consistent with cyclics

---
 .../createBaffles/createBaffles.C             | 357 +++++++++---------
 1 file changed, 170 insertions(+), 187 deletions(-)

diff --git a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
index 051f74968b..c802049f83 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
@@ -48,157 +48,6 @@ using namespace Foam;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-void createBaffles
-(
-    const polyMesh& mesh,
-    const label faceI,
-    const label oldPatchI,
-    const labelList& newPatches,
-    PackedBoolList& doneFace,
-    polyTopoChange& meshMod
-)
-{
-    const polyBoundaryMesh& patches = mesh.boundaryMesh();
-    const faceZoneMesh& faceZones = mesh.faceZones();
-
-    const face& f = mesh.faces()[faceI];
-    label zoneID = faceZones.whichZone(faceI);
-    bool zoneFlip = false;
-    if (zoneID >= 0)
-    {
-        const faceZone& fZone = faceZones[zoneID];
-        zoneFlip = fZone.flipMap()[fZone.whichFace(faceI)];
-    }
-    label nei = -1;
-    if (oldPatchI == -1)
-    {
-        nei = mesh.faceNeighbour()[faceI];
-    }
-
-
-    face revFace(f.reverseFace());
-
-    forAll(newPatches, i)
-    {
-        if (oldPatchI == -1)
-        {
-            // Internal face
-            if (doneFace.set(faceI))
-            {
-                // First usage of face. Modify.
-                meshMod.setAction
-                (
-                    polyModifyFace
-                    (
-                        f,                          // modified face
-                        faceI,                      // label of face
-                        mesh.faceOwner()[faceI],    // owner
-                        -1,                         // neighbour
-                        false,                      // face flip
-                        newPatches[i],              // patch for face
-                        false,                      // remove from zone
-                        zoneID,                     // zone for face
-                        zoneFlip                    // face flip in zone
-                    )
-                );
-            }
-            else
-            {
-                // Second or more usage of face. Add.
-                meshMod.setAction
-                (
-                    polyAddFace
-                    (
-                        f,                          // modified face
-                        mesh.faceOwner()[faceI],    // owner
-                        -1,                         // neighbour
-                        -1,                         // master point
-                        -1,                         // master edge
-                        faceI,                      // master face
-                        false,                      // face flip
-                        newPatches[i],              // patch for face
-                        zoneID,                     // zone for face
-                        zoneFlip                    // face flip in zone
-                    )
-                );
-            }
-
-            meshMod.setAction
-            (
-                polyAddFace
-                (
-                    revFace,                    // modified face
-                    nei,                        // owner
-                    -1,                         // neighbour
-                    -1,                         // masterPointID
-                    -1,                         // masterEdgeID
-                    faceI,                      // masterFaceID,
-                    true,                       // face flip
-                    newPatches[i],              // patch for face
-                    zoneID,                     // zone for face
-                    zoneFlip                    // face flip in zone
-                )
-            );
-        }
-        else if
-        (
-            patches[oldPatchI].coupled()
-         && patches[newPatches[i]].coupled()
-        )
-        {
-            // Do not allow coupled patches to be moved to different coupled
-            // patches.
-            //WarningIn("createBaffles()")
-            //    << "Not moving face from coupled patch "
-            //    << patches[oldPatchI].name()
-            //    << " to another coupled patch " << patches[newPatches[i]]
-            //    << endl;
-        }
-        else
-        {
-            if (doneFace.set(faceI))
-            {
-                meshMod.setAction
-                (
-                    polyModifyFace
-                    (
-                        f,                          // modified face
-                        faceI,                      // label of face
-                        mesh.faceOwner()[faceI],    // owner
-                        -1,                         // neighbour
-                        false,                      // face flip
-                        newPatches[i],              // patch for face
-                        false,                      // remove from zone
-                        zoneID,                     // zone for face
-                        zoneFlip                    // face flip in zone
-                    )
-                );
-            }
-            else
-            {
-                meshMod.setAction
-                (
-                    polyAddFace
-                    (
-                        f,                          // modified face
-                        mesh.faceOwner()[faceI],    // owner
-                        -1,                         // neighbour
-                        -1,                         // master point
-                        -1,                         // master edge
-                        faceI,                      // master face
-                        false,                      // face flip
-                        newPatches[i],              // patch for face
-                        zoneID,                     // zone for face
-                        zoneFlip                    // face flip in zone
-                    )
-                );
-            }
-        }
-    }
-}
-
-
-
 // Main program:
 
 int main(int argc, char *argv[])
@@ -215,15 +64,16 @@ int main(int argc, char *argv[])
     const word oldInstance = mesh.pointsInstance();
 
     const polyBoundaryMesh& patches = mesh.boundaryMesh();
+    const faceZoneMesh& faceZones = mesh.faceZones();
 
     // Faces to baffle
     word setName(args.additionalArgs()[0]);
-    Pout<< "Reading faceSet from " << setName << nl << endl;
+    Info<< "Reading faceSet from " << setName << nl << endl;
     faceSet facesToSplit(mesh, setName);
     // Make sure set is synchronised across couples
     facesToSplit.sync(mesh);
-    Pout<< "Read " << facesToSplit.size() << " faces from " << setName
-        << nl << endl;
+    Info<< "Read " << returnReduce(facesToSplit.size(), sumOp<label>())
+        << " faces from " << setName << nl << endl;
 
 
     // Patches to put baffles into
@@ -231,7 +81,7 @@ int main(int argc, char *argv[])
 
     word patchName(args.additionalArgs()[1]);
     newPatches[0] = patches.findPatchID(patchName);
-    Pout<< "Using patch " << patchName
+    Info<< "Using patch " << patchName
         << " at index " << newPatches[0] << endl;
 
     if (newPatches[0] == -1)
@@ -316,48 +166,181 @@ int main(int argc, char *argv[])
 
 
     // Do the actual changes
+    // Note order in which faces are modified/added is so they end up correctly
+    // for cyclic patches (original faces first and then reversed faces)
+    // since otherwise it will have trouble matching baffles.
 
     label nBaffled = 0;
-    PackedBoolList doneFace(mesh.nFaces());
-
-    for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
+ 
+    forAll(newPatches, i)
     {
-        if (facesToSplit.found(faceI))
-        {
-            createBaffles
-            (
-                mesh,
-                faceI,
-                -1,                             // oldPatchI,
-                newPatches,
-                doneFace,
-                meshMod
-            );
-            nBaffled++;
-        }
-    }
-    forAll(patches, patchI)
-    {
-        const polyPatch& pp = patches[patchI];
+        label newPatchI = newPatches[i];
 
-        forAll(pp, i)
+        for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
         {
-            label faceI = pp.start()+i;
-
             if (facesToSplit.found(faceI))
             {
-                createBaffles
-                (
-                    mesh,
-                    faceI,
-                    patchI,                     // oldPatchI,
-                    newPatches,
-                    doneFace,
-                    meshMod
-                );
+                const face& f = mesh.faces()[faceI];
+                label zoneID = faceZones.whichZone(faceI);
+                bool zoneFlip = false;
+                if (zoneID >= 0)
+                {
+                    const faceZone& fZone = faceZones[zoneID];
+                    zoneFlip = fZone.flipMap()[fZone.whichFace(faceI)];
+                }
+
+                if (i == 0)
+                {
+                    // First usage of face. Modify.
+                    meshMod.setAction
+                    (
+                        polyModifyFace
+                        (
+                            f,                          // modified face
+                            faceI,                      // label of face
+                            mesh.faceOwner()[faceI],    // owner
+                            -1,                         // neighbour
+                            false,                      // face flip
+                            newPatchI,                  // patch for face
+                            false,                      // remove from zone
+                            zoneID,                     // zone for face
+                            zoneFlip                    // face flip in zone
+                        )
+                    );
+                }
+                else
+                {
+                    // Second or more usage of face. Add.
+                    meshMod.setAction
+                    (
+                        polyAddFace
+                        (
+                            f,                          // modified face
+                            mesh.faceOwner()[faceI],    // owner
+                            -1,                         // neighbour
+                            -1,                         // master point
+                            -1,                         // master edge
+                            faceI,                      // master face
+                            false,                      // face flip
+                            newPatchI,                  // patch for face
+                            zoneID,                     // zone for face
+                            zoneFlip                    // face flip in zone
+                        )
+                    );
+                }
+
                 nBaffled++;
             }
         }
+
+        // Add the reversed face.
+        for (label faceI = 0; faceI < mesh.nInternalFaces(); faceI++)
+        {
+            if (facesToSplit.found(faceI))
+            {
+                const face& f = mesh.faces()[faceI];
+                label zoneID = faceZones.whichZone(faceI);
+                bool zoneFlip = false;
+                if (zoneID >= 0)
+                {
+                    const faceZone& fZone = faceZones[zoneID];
+                    zoneFlip = fZone.flipMap()[fZone.whichFace(faceI)];
+                }
+                label nei = mesh.faceNeighbour()[faceI];
+
+                meshMod.setAction
+                (
+                    polyAddFace
+                    (
+                        f.reverseFace(),            // modified face
+                        nei,                        // owner
+                        -1,                         // neighbour
+                        -1,                         // masterPointID
+                        -1,                         // masterEdgeID
+                        faceI,                      // masterFaceID,
+                        true,                       // face flip
+                        newPatchI,                  // patch for face
+                        zoneID,                     // zone for face
+                        zoneFlip                    // face flip in zone
+                    )
+                );
+
+                nBaffled++;
+            }
+        }
+
+        // Modify any boundary faces
+        forAll(patches, patchI)
+        {
+            const polyPatch& pp = patches[patchI];
+
+            if (patches[newPatchI].coupled() && pp.coupled())
+            {
+                // Do not allow coupled faces to be moved to different coupled
+                // patches.
+            }
+            else
+            {
+                forAll(pp, i)
+                {
+                    label faceI = pp.start()+i;
+
+                    if (facesToSplit.found(faceI))
+                    {
+                        const face& f = mesh.faces()[faceI];
+                        label zoneID = faceZones.whichZone(faceI);
+                        bool zoneFlip = false;
+                        if (zoneID >= 0)
+                        {
+                            const faceZone& fZone = faceZones[zoneID];
+                            zoneFlip = fZone.flipMap()[fZone.whichFace(faceI)];
+                        }
+
+                        if (i == 0)
+                        {
+                            // First usage of face. Modify.
+                            meshMod.setAction
+                            (
+                                polyModifyFace
+                                (
+                                    f,                      // modified face
+                                    faceI,                  // label of face
+                                    mesh.faceOwner()[faceI],// owner
+                                    -1,                     // neighbour
+                                    false,                  // face flip
+                                    newPatchI,              // patch for face
+                                    false,                  // remove from zone
+                                    zoneID,                 // zone for face
+                                    zoneFlip                // face flip in zone
+                                )
+                            );
+                        }
+                        else
+                        {
+                            // Second or more usage of face. Add.
+                            meshMod.setAction
+                            (
+                                polyAddFace
+                                (
+                                    f,                      // modified face
+                                    mesh.faceOwner()[faceI],// owner
+                                    -1,                     // neighbour
+                                    -1,                     // master point
+                                    -1,                     // master edge
+                                    faceI,                  // master face
+                                    false,                  // face flip
+                                    newPatchI,              // patch for face
+                                    zoneID,                 // zone for face
+                                    zoneFlip                // face flip in zone
+                                )
+                            );
+                        }
+
+                        nBaffled++;
+                    }
+                }
+            }
+        }
     }
 
 

From 3f41f77db3b1417aaf1e4a3c375bdc16d8560e90 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Fri, 1 May 2009 12:57:47 +0100
Subject: [PATCH 075/175] tolerance tightened

---
 src/meshTools/triSurface/triangleFuncs/triangleFuncs.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/meshTools/triSurface/triangleFuncs/triangleFuncs.C b/src/meshTools/triSurface/triangleFuncs/triangleFuncs.C
index 1bef529b03..dab51b4714 100644
--- a/src/meshTools/triSurface/triangleFuncs/triangleFuncs.C
+++ b/src/meshTools/triSurface/triangleFuncs/triangleFuncs.C
@@ -132,7 +132,7 @@ bool Foam::triangleFuncs::intersectAxesBundle
         scalar beta = 0;
         bool inter = false;
 
-        if (Foam::mag(u1) < SMALL)
+        if (Foam::mag(u1) < ROOTVSMALL)
         {
             beta = u0/u2;
             if ((beta >= 0) && (beta <= 1))

From f9869e00442acbc35833e5ac8e332625d2119079 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Fri, 1 May 2009 12:58:08 +0100
Subject: [PATCH 076/175] changed message for if cell not found

---
 .../cfdTools/general/findRefCell/findRefCell.C   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C b/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C
index 1926889955..d815b809a3 100644
--- a/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C
+++ b/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C
@@ -90,10 +90,10 @@ void Foam::setRefCell
                      "    bool\n"
                      ")",
                     dict
-                )
-                  << "Unable to set reference cell for field " << field.name()
-                  << nl << "    Reference point " << refPointName
-                  << " found on multiple domains" << nl << exit(FatalIOError);
+                )   << "Unable to set reference cell for field " << field.name()
+                    << nl << "    Reference point " << refPointName
+                    << " found on " << sumHasRef << " domains (should be one)"
+                    << nl << exit(FatalIOError);
             }
         }
         else
@@ -108,10 +108,10 @@ void Foam::setRefCell
                  "    bool\n"
                  ")",
                 dict
-            )
-              << "Unable to set reference cell for field" << field.name() << nl
-              << "    Please supply either " << refCellName
-              << " or " << refPointName << nl << exit(FatalIOError);
+            )   << "Unable to set reference cell for field" << field.name()
+                << nl
+                << "    Please supply either " << refCellName
+                << " or " << refPointName << nl << exit(FatalIOError);
         }
 
         refValue = readScalar(dict.lookup(refValueName));

From 0be0e96fb9f5eb8420075965ebdc6d89fc684901 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Mon, 4 May 2009 16:28:07 +0200
Subject: [PATCH 077/175] added 'fixedBlended' scheme - uses a single global
 blending factor

- fixed misc. copyright dates, other cosmetics
---
 src/finiteVolume/Make/files                   |   1 +
 .../cfdTools/general/MRF/MRFZone.C            |   2 +-
 .../cfdTools/general/MRF/MRFZone.H            |   2 +-
 .../fixedInternalValueFvPatchField.C          |   2 +-
 .../fixedInternalValueFvPatchField.H          |   2 +-
 .../fixedInternalValueFvPatchFields.C         |   2 +-
 .../fixedInternalValueFvPatchFields.H         |   2 +-
 .../rotatingWallVelocityFvPatchVectorField.C  |   2 +-
 .../extendedLeastSquaresGrad.H                |   2 +-
 .../cellLimitedGrad/cellLimitedGrad.H         |   4 +-
 .../cellMDLimitedGrad/cellMDLimitedGrad.H     |   5 +-
 .../faceLimitedGrad/faceLimitedGrad.H         |   4 +-
 .../faceMDLimitedGrad/faceMDLimitedGrad.H     |   4 +-
 .../quadraticFitSnGrad/quadraticFitSnGrad.H   |   2 +-
 .../quadraticFitSnGradData.C                  |   2 +-
 .../quadraticFitSnGradData.H                  |   2 +-
 .../quadraticFitSnGrad/quadraticFitSnGrads.C  |   2 +-
 .../extendedStencil/extendedCentredStencil.C  |   2 +-
 .../extendedStencil/extendedCentredStencil.H  |   2 +-
 .../fvMesh/extendedStencil/extendedStencil.C  |   2 +-
 .../fvMesh/extendedStencil/extendedStencil.H  |   2 +-
 .../centredCECStencilObject.C                 |   2 +-
 .../centredCECStencilObject.H                 |   2 +-
 .../centredCFCStencilObject.C                 |   2 +-
 .../centredCFCStencilObject.H                 |   2 +-
 .../centredCPCStencilObject.C                 |   2 +-
 .../centredCPCStencilObject.H                 |   2 +-
 .../centredFECStencilObject.C                 |   2 +-
 .../centredFECStencilObject.H                 |   2 +-
 .../upwindCECStencilObject.C                  |   2 +-
 .../upwindCECStencilObject.H                  |   2 +-
 .../upwindCFCStencilObject.C                  |   2 +-
 .../upwindCFCStencilObject.H                  |   2 +-
 .../upwindCPCStencilObject.C                  |   2 +-
 .../upwindCPCStencilObject.H                  |   2 +-
 .../upwindFECStencilObject.C                  |   2 +-
 .../upwindFECStencilObject.H                  |   2 +-
 .../extendedStencilTemplates.C                |   2 +-
 .../extendedStencil/extendedUpwindStencil.C   |   2 +-
 .../extendedStencil/extendedUpwindStencil.H   |   2 +-
 .../extendedUpwindStencilTemplates.C          |   2 +-
 .../faceStencil/cellEdgeCellStencil.C         |   2 +-
 .../faceStencil/cellEdgeCellStencil.H         |   2 +-
 .../faceStencil/cellFaceCellStencil.C         |   2 +-
 .../faceStencil/cellFaceCellStencil.H         |   2 +-
 .../faceStencil/cellPointCellStencil.C        |   2 +-
 .../faceStencil/cellPointCellStencil.H        |   2 +-
 .../faceStencil/faceEdgeCellStencil.C         |   2 +-
 .../faceStencil/faceEdgeCellStencil.H         |   2 +-
 .../extendedStencil/faceStencil/faceStencil.C |   2 +-
 .../extendedStencil/faceStencil/faceStencil.H |   2 +-
 .../schemes/CentredFitScheme/CentredFitData.C |   2 +-
 .../schemes/CentredFitScheme/CentredFitData.H |   2 +-
 .../CentredFitScheme/CentredFitScheme.H       |   2 +-
 .../schemes/FitData/FitData.C                 |   2 +-
 .../schemes/FitData/FitData.H                 |   2 +-
 .../schemes/UpwindFitScheme/UpwindFitData.C   |   2 +-
 .../schemes/UpwindFitScheme/UpwindFitData.H   |   2 +-
 .../schemes/UpwindFitScheme/UpwindFitScheme.H |  20 +-
 .../schemes/biLinearFit/biLinearFit.C         |   2 +-
 .../schemes/cubicUpwindFit/cubicUpwindFit.C   |   2 +-
 .../schemes/fixedBlended/fixedBlended.C       |  37 ++++
 .../schemes/fixedBlended/fixedBlended.H       | 198 ++++++++++++++++++
 .../schemes/linearFit/linearFit.C             |   2 +-
 .../schemes/quadraticFit/quadraticFit.C       |   2 +-
 .../quadraticLinearFit/quadraticLinearFit.C   |   2 +-
 .../quadraticLinearUpwindFit.C                |   2 +-
 .../quadraticUpwindFit/quadraticUpwindFit.C   |   2 +-
 .../surfaceInterpolationScheme.C              |  33 +--
 69 files changed, 332 insertions(+), 94 deletions(-)
 create mode 100644 src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.C
 create mode 100644 src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H

diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 1ad24ecd16..ddd50de180 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -187,6 +187,7 @@ $(schemes)/outletStabilised/outletStabilised.C
 $(schemes)/reverseLinear/reverseLinear.C
 $(schemes)/clippedLinear/clippedLinear.C
 $(schemes)/harmonic/harmonic.C
+$(schemes)/fixedBlended/fixedBlended.C
 $(schemes)/localBlended/localBlended.C
 $(schemes)/localMax/localMax.C
 $(schemes)/localMin/localMin.C
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
index 7808ef5362..ce32ad5b84 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
index f394edf510..9fa3085914 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchField.C
index 1cbd6fd72d..558484f3ed 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchField.H
index 99cfeb72f3..d79672dd50 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchFields.C
index cd6d5d4901..55daddf704 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchFields.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchFields.H
index 779339f443..3b6f58992f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchFields.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedInternalValueFvPatchField/fixedInternalValueFvPatchFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
index 7b5a1dbc45..9000fb51c2 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresGrad.H
index ab91298298..e8da1ca92f 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresGrad.H
@@ -91,7 +91,7 @@ public:
                 FatalIOErrorIn
                 (
                     "extendedLeastSquaresGrad"
-                    "(const fvMesh& mesh, Istream& schemeData)",
+                    "(const fvMesh&, Istream& schemeData)",
                     schemeData
                 )   << "Minimum determinant = " << minDet_
                     << " should be >= 0 and <= 8"
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H
index 90af1a835f..4599902885 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrad.H
@@ -67,7 +67,7 @@ class cellLimitedGrad
         tmp<fv::gradScheme<Type> > basicGradScheme_;
 
         //- Limiter coefficient
-        scalar k_;
+        const scalar k_;
 
 
     // Private Member Functions
@@ -98,7 +98,7 @@ public:
             {
                 FatalIOErrorIn
                 (
-                    "cellLimitedGrad(const fvMesh& mesh, Istream& schemeData)",
+                    "cellLimitedGrad(const fvMesh&, Istream& schemeData)",
                     schemeData
                 )   << "coefficient = " << k_
                     << " should be >= 0 and <= 1"
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H
index 2c4592c691..05953638b2 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrad.H
@@ -67,7 +67,7 @@ class cellMDLimitedGrad
         tmp<fv::gradScheme<Type> > basicGradScheme_;
 
         //- Limiter coefficient
-        scalar k_;
+        const scalar k_;
 
 
     // Private Member Functions
@@ -98,8 +98,7 @@ public:
             {
                 FatalIOErrorIn
                 (
-                    "cellMDLimitedGrad"
-                    "(const fvMesh& mesh, Istream& schemeData)",
+                    "cellMDLimitedGrad(const fvMesh&, Istream& schemeData)",
                     schemeData
                 )   << "coefficient = " << k_
                     << " should be >= 0 and <= 1"
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H
index 07b65b818e..8af5298f42 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrad.H
@@ -67,7 +67,7 @@ class faceLimitedGrad
         tmp<fv::gradScheme<Type> > basicGradScheme_;
 
         //- Limiter coefficient
-        scalar k_;
+        const scalar k_;
 
 
     // Private Member Functions
@@ -107,7 +107,7 @@ public:
             {
                 FatalIOErrorIn
                 (
-                    "faceLimitedGrad(const fvMesh& mesh, Istream& schemeData)",
+                    "faceLimitedGrad(const fvMesh&, Istream& schemeData)",
                     schemeData
                 )   << "coefficient = " << k_
                     << " should be >= 0 and <= 1"
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H
index 8034cbcb89..f9c826452a 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrad.H
@@ -67,7 +67,7 @@ class faceMDLimitedGrad
         tmp<fv::gradScheme<Type> > basicGradScheme_;
 
         //- Limiter coefficient
-        scalar k_;
+        const scalar k_;
 
 
     // Private Member Functions
@@ -107,7 +107,7 @@ public:
             {
                 FatalIOErrorIn
                 (
-                    "faceMDLimitedGrad(const fvMesh& mesh, Istream& schemeData)",
+                    "faceMDLimitedGrad(const fvMesh&, Istream& schemeData)",
                     schemeData
                 )   << "coefficient = " << k_
                     << " should be >= 0 and <= 1"
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrad.H
index b74c3d2f20..bc170c1466 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrad.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.C b/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.C
index 6bef8de896..2b938b0d0e 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.H b/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.H
index 0f5fda5ce6..12d5c90f54 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrads.C b/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrads.C
index aee4af29e3..c368d0b85a 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrads.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrads.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedCentredStencil.C b/src/finiteVolume/fvMesh/extendedStencil/extendedCentredStencil.C
index 956e796e18..252357a5f2 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedCentredStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedCentredStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedCentredStencil.H b/src/finiteVolume/fvMesh/extendedStencil/extendedCentredStencil.H
index 0ae37d5eb6..edbf5ea485 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedCentredStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedCentredStencil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedStencil.C b/src/finiteVolume/fvMesh/extendedStencil/extendedStencil.C
index 79e1de2ea1..1ff00db7ba 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedStencil.H b/src/finiteVolume/fvMesh/extendedStencil/extendedStencil.H
index 25ba241f1e..6faff8f3a6 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedStencil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCECStencilObject.C b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCECStencilObject.C
index 2c5333bd92..6a1e250065 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCECStencilObject.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCECStencilObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCECStencilObject.H b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCECStencilObject.H
index adbc9ec5b3..29ece11951 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCECStencilObject.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCECStencilObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCFCStencilObject.C b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCFCStencilObject.C
index e55e3ed2c1..e7ebaa389b 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCFCStencilObject.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCFCStencilObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCFCStencilObject.H b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCFCStencilObject.H
index e36be07993..43b87a31f0 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCFCStencilObject.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCFCStencilObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCPCStencilObject.C b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCPCStencilObject.C
index 09af9fb3ef..db5bf143ae 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCPCStencilObject.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCPCStencilObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCPCStencilObject.H b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCPCStencilObject.H
index 049d214437..183c0808cc 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCPCStencilObject.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredCPCStencilObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredFECStencilObject.C b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredFECStencilObject.C
index f589b90ff1..ba7351994a 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredFECStencilObject.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredFECStencilObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredFECStencilObject.H b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredFECStencilObject.H
index 6f7acf78ad..8ce7efcaca 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredFECStencilObject.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/centredFECStencilObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindCECStencilObject.C b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindCECStencilObject.C
index a869b71d7e..f27e24118f 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindCECStencilObject.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindCECStencilObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindCECStencilObject.H b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindCECStencilObject.H
index f964faf9d0..dc4544e9b3 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindCECStencilObject.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindCECStencilObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindCFCStencilObject.C b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindCFCStencilObject.C
index 5637b4f9ea..81292b002e 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindCFCStencilObject.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindCFCStencilObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindCFCStencilObject.H b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindCFCStencilObject.H
index a38d274b48..de8972c112 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindCFCStencilObject.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindCFCStencilObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindCPCStencilObject.C b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindCPCStencilObject.C
index f75571f3e7..36f0c19b34 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindCPCStencilObject.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindCPCStencilObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindCPCStencilObject.H b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindCPCStencilObject.H
index 0d86ef6422..b73d258205 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindCPCStencilObject.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindCPCStencilObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindFECStencilObject.C b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindFECStencilObject.C
index 43b71817c2..d9202eaa6d 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindFECStencilObject.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindFECStencilObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindFECStencilObject.H b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindFECStencilObject.H
index 5b2627ebbe..478774013a 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindFECStencilObject.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilMeshObjects/upwindFECStencilObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilTemplates.C
index ec024775d3..537b7520d8 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedStencilTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedUpwindStencil.C b/src/finiteVolume/fvMesh/extendedStencil/extendedUpwindStencil.C
index 64991775ba..b7fa870cf7 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedUpwindStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedUpwindStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedUpwindStencil.H b/src/finiteVolume/fvMesh/extendedStencil/extendedUpwindStencil.H
index 62976f893d..174eb27a9d 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedUpwindStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedUpwindStencil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedUpwindStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/extendedUpwindStencilTemplates.C
index 5c18329044..5482261df8 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedUpwindStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedUpwindStencilTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellEdgeCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellEdgeCellStencil.C
index a7189c44ed..034106f13a 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellEdgeCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellEdgeCellStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellEdgeCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellEdgeCellStencil.H
index 7022e88a4d..2cc8b21e33 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellEdgeCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellEdgeCellStencil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellFaceCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellFaceCellStencil.C
index cbcc8f1696..263ebf0d04 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellFaceCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellFaceCellStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellFaceCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellFaceCellStencil.H
index 67179e4607..174c4b7fee 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellFaceCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellFaceCellStencil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellPointCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellPointCellStencil.C
index d284c26341..67b5be9a32 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellPointCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellPointCellStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellPointCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellPointCellStencil.H
index 9c3178746a..6bd318338b 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellPointCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceStencil/cellPointCellStencil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceStencil/faceEdgeCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/faceStencil/faceEdgeCellStencil.C
index ac78ba76a4..2d56b1b194 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceStencil/faceEdgeCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceStencil/faceEdgeCellStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceStencil/faceEdgeCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/faceStencil/faceEdgeCellStencil.H
index a69a47d0df..dfbb990fbc 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceStencil/faceEdgeCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceStencil/faceEdgeCellStencil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceStencil/faceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/faceStencil/faceStencil.C
index 1812d2648d..a0dac7b004 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceStencil/faceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceStencil/faceStencil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceStencil/faceStencil.H b/src/finiteVolume/fvMesh/extendedStencil/faceStencil/faceStencil.H
index 8b019a6912..a7e3105bc7 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceStencil/faceStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceStencil/faceStencil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.C
index 7f68499844..2b7bf7be3c 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.H
index cb01840260..3be61503c3 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitData.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitScheme.H
index 6c5ad7aa02..10cea46e3b 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/CentredFitScheme/CentredFitScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C
index 28a3c41e64..5bfdb9b79f 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.H
index 810c8d7e4c..b151a75204 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.C
index fd218100cc..6f0ea20e1b 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.H
index 7f01135b9e..cd52bc8764 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitScheme.H
index 0921dcfea9..67dad671fa 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -159,25 +159,25 @@ public:
 
 #define makeUpwindFitSurfaceInterpolationTypeScheme(SS, POLYNOMIAL, STENCIL, TYPE) \
                                                                               \
-typedef UpwindFitScheme<TYPE, POLYNOMIAL, STENCIL>                           \
-    UpwindFitScheme##TYPE##POLYNOMIAL##STENCIL##_;                           \
+typedef UpwindFitScheme<TYPE, POLYNOMIAL, STENCIL>                            \
+    UpwindFitScheme##TYPE##POLYNOMIAL##STENCIL##_;                            \
 defineTemplateTypeNameAndDebugWithName                                        \
-    (UpwindFitScheme##TYPE##POLYNOMIAL##STENCIL##_, #SS, 0);                 \
+    (UpwindFitScheme##TYPE##POLYNOMIAL##STENCIL##_, #SS, 0);                  \
                                                                               \
 surfaceInterpolationScheme<TYPE>::addMeshConstructorToTable                   \
-<UpwindFitScheme<TYPE, POLYNOMIAL, STENCIL> >                                \
+<UpwindFitScheme<TYPE, POLYNOMIAL, STENCIL> >                                 \
     add##SS##STENCIL##TYPE##MeshConstructorToTable_;                          \
                                                                               \
 surfaceInterpolationScheme<TYPE>::addMeshFluxConstructorToTable               \
-<UpwindFitScheme<TYPE, POLYNOMIAL, STENCIL> >                                \
+<UpwindFitScheme<TYPE, POLYNOMIAL, STENCIL> >                                 \
     add##SS##STENCIL##TYPE##MeshFluxConstructorToTable_;
 
-#define makeUpwindFitSurfaceInterpolationScheme(SS, POLYNOMIAL, STENCIL)     \
+#define makeUpwindFitSurfaceInterpolationScheme(SS, POLYNOMIAL, STENCIL)      \
                                                                               \
-makeUpwindFitSurfaceInterpolationTypeScheme(SS,POLYNOMIAL,STENCIL,scalar)    \
-makeUpwindFitSurfaceInterpolationTypeScheme(SS,POLYNOMIAL,STENCIL,vector)    \
+makeUpwindFitSurfaceInterpolationTypeScheme(SS,POLYNOMIAL,STENCIL,scalar)     \
+makeUpwindFitSurfaceInterpolationTypeScheme(SS,POLYNOMIAL,STENCIL,vector)     \
 makeUpwindFitSurfaceInterpolationTypeScheme(SS,POLYNOMIAL,STENCIL,sphericalTensor) \
-makeUpwindFitSurfaceInterpolationTypeScheme(SS,POLYNOMIAL,STENCIL,symmTensor)\
+makeUpwindFitSurfaceInterpolationTypeScheme(SS,POLYNOMIAL,STENCIL,symmTensor) \
 makeUpwindFitSurfaceInterpolationTypeScheme(SS,POLYNOMIAL,STENCIL,tensor)
 
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/biLinearFit/biLinearFit.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/biLinearFit/biLinearFit.C
index 8d49862a97..0ff394ff82 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/biLinearFit/biLinearFit.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/biLinearFit/biLinearFit.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubicUpwindFit/cubicUpwindFit.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubicUpwindFit/cubicUpwindFit.C
index 63f239f529..02b3a332f0 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubicUpwindFit/cubicUpwindFit.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubicUpwindFit/cubicUpwindFit.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.C
new file mode 100644
index 0000000000..a09d90eacf
--- /dev/null
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.C
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "fvMesh.H"
+#include "fixedBlended.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makeSurfaceInterpolationScheme(fixedBlended);
+}
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H
new file mode 100644
index 0000000000..a3e615cc52
--- /dev/null
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H
@@ -0,0 +1,198 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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::fixedBlended
+
+Description
+    Two-scheme fixed-blending differencing scheme.
+
+    Similar to localBlended but uses a single (global) constant blending
+    factor. The factor applies to the first scheme and 1-factor to the
+    second scheme.
+
+Note
+    Although a blending factor of 0 and 1 is permitted, it is more efficient
+    just to use the underlying scheme directly.
+
+SourceFiles
+    fixedBlended.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef fixedBlended_H
+#define fixedBlended_H
+
+#include "surfaceInterpolationScheme.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                        Class fixedBlended Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class fixedBlended
+:
+    public surfaceInterpolationScheme<Type>
+{
+    // Private data
+
+        const scalar blendingFactor_;
+
+    // Private Member Functions
+
+        //- Scheme 1
+        tmp<surfaceInterpolationScheme<Type> > tScheme1_;
+
+        //- Scheme 2
+        tmp<surfaceInterpolationScheme<Type> > tScheme2_;
+
+
+        //- Disallow default bitwise copy construct
+        fixedBlended(const fixedBlended&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const fixedBlended&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("fixedBlended");
+
+
+    // Constructors
+
+        //- Construct from mesh and Istream.
+        //  The name of the flux field is read from the Istream and looked-up
+        //  from the mesh objectRegistry
+        fixedBlended
+        (
+            const fvMesh& mesh,
+            Istream& is
+        )
+        :
+            surfaceInterpolationScheme<Type>(mesh),
+            blendingFactor_(readScalar(is)),
+            tScheme1_
+            (
+                surfaceInterpolationScheme<Type>::New(mesh, is)
+            ),
+            tScheme2_
+            (
+                surfaceInterpolationScheme<Type>::New(mesh, is)
+            )
+        {
+            if (blendingFactor_ < 0 || blendingFactor_ > 1)
+            {
+                FatalIOErrorIn("fixedBlended(const fvMesh&, Istream&)", is)
+                    << "coefficient = " << blendingFactor_
+                    << " should be >= 0 and <= 1"
+                    << exit(FatalIOError);
+            }
+            if (surfaceInterpolationScheme<Type>::debug)
+            {
+                Info<<"fixedBlended: " << blendingFactor_
+                    << "*" << tScheme1_().type()
+                    << " + (1-" << blendingFactor_ << ")*"
+                    << tScheme2_().type()
+                    <<endl;
+            }
+        }
+
+        //- Construct from mesh, faceFlux and Istream
+        fixedBlended
+        (
+            const fvMesh& mesh,
+            const surfaceScalarField& faceFlux,
+            Istream& is
+        )
+        :
+            surfaceInterpolationScheme<Type>(mesh),
+            blendingFactor_(readScalar(is)),
+            tScheme1_
+            (
+                surfaceInterpolationScheme<Type>::New(mesh, faceFlux, is)
+            ),
+            tScheme2_
+            (
+                surfaceInterpolationScheme<Type>::New(mesh, faceFlux, is)
+            )
+        {
+            if (blendingFactor_ < 0 || blendingFactor_ > 1)
+            {
+                FatalIOErrorIn("fixedBlended(const fvMesh&, Istream&)", is)
+                    << "coefficient = " << blendingFactor_
+                    << " should be >= 0 and <= 1"
+                    << exit(FatalIOError);
+            }
+            if (surfaceInterpolationScheme<Type>::debug)
+            {
+                Info<<"fixedBlended: " << blendingFactor_
+                    << "*" << tScheme1_().type()
+                    << " + (1-" << blendingFactor_ << ")*"
+                    << tScheme2_().type()
+                    <<endl;
+            }
+        }
+
+
+    // Member Functions
+
+        //- Return the interpolation weighting factors
+        tmp<surfaceScalarField> weights
+        (
+            const GeometricField<Type, fvPatchField, volMesh>& vf
+        ) const
+        {
+            return
+                blendingFactor_*tScheme1_().weights(vf)
+              + (scalar(1.0) - blendingFactor_)*tScheme2_().weights(vf);
+        }
+
+        //- Return the face-interpolate of the given cell field
+        //  with explicit correction
+        tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        interpolate(const GeometricField<Type, fvPatchField, volMesh>& vf) const
+        {
+            return
+                blendingFactor_*tScheme1_().interpolate(vf)
+              + (scalar(1.0) - blendingFactor_)*tScheme2_().interpolate(vf);
+        }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearFit/linearFit.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearFit/linearFit.C
index beff7881b2..6362a7b7ae 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearFit/linearFit.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearFit/linearFit.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticFit/quadraticFit.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticFit/quadraticFit.C
index fd0bd3f8bd..7d84fd4887 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticFit/quadraticFit.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticFit/quadraticFit.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticLinearFit/quadraticLinearFit.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticLinearFit/quadraticLinearFit.C
index 0ecd5ece93..8660cae93a 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticLinearFit/quadraticLinearFit.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticLinearFit/quadraticLinearFit.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticLinearUpwindFit/quadraticLinearUpwindFit.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticLinearUpwindFit/quadraticLinearUpwindFit.C
index fb344602dc..ca0da7d9da 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticLinearUpwindFit/quadraticLinearUpwindFit.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticLinearUpwindFit/quadraticLinearUpwindFit.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwindFit/quadraticUpwindFit.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwindFit/quadraticUpwindFit.C
index 66aadef7db..e0e003906e 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwindFit/quadraticUpwindFit.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwindFit/quadraticUpwindFit.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
index 386e08fcbe..4702ccb5aa 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
@@ -47,13 +47,6 @@ tmp<surfaceInterpolationScheme<Type> > surfaceInterpolationScheme<Type>::New
     Istream& schemeData
 )
 {
-    if (surfaceInterpolation::debug)
-    {
-        Info<< "surfaceInterpolationScheme<Type>::New(const fvMesh&, Istream&)"
-               " : constructing surfaceInterpolationScheme<Type>"
-            << endl;
-    }
-
     if (schemeData.eof())
     {
         FatalIOErrorIn
@@ -69,6 +62,15 @@ tmp<surfaceInterpolationScheme<Type> > surfaceInterpolationScheme<Type>::New
 
     word schemeName(schemeData);
 
+    if (surfaceInterpolation::debug || surfaceInterpolationScheme<Type>::debug)
+    {
+        Info<< "surfaceInterpolationScheme<Type>::New"
+               "(const fvMesh&, Istream&)"
+               " : discretisation scheme = "
+            << schemeName
+            << endl;
+    }
+
     typename MeshConstructorTable::iterator constructorIter =
         MeshConstructorTablePtr_->find(schemeName);
 
@@ -98,14 +100,6 @@ tmp<surfaceInterpolationScheme<Type> > surfaceInterpolationScheme<Type>::New
     Istream& schemeData
 )
 {
-    if (surfaceInterpolation::debug)
-    {
-        Info<< "surfaceInterpolationScheme<Type>::New"
-               "(const fvMesh&, const surfaceScalarField&, Istream&) : "
-               "constructing surfaceInterpolationScheme<Type>"
-            << endl;
-    }
-
     if (schemeData.eof())
     {
         FatalIOErrorIn
@@ -122,6 +116,15 @@ tmp<surfaceInterpolationScheme<Type> > surfaceInterpolationScheme<Type>::New
 
     word schemeName(schemeData);
 
+    if (surfaceInterpolation::debug || surfaceInterpolationScheme<Type>::debug)
+    {
+        Info<< "surfaceInterpolationScheme<Type>::New"
+               "(const fvMesh&, const surfaceScalarField&, Istream&)"
+               " : discretisation scheme = "
+            << schemeName
+            << endl;
+    }
+
     typename MeshFluxConstructorTable::iterator constructorIter =
         MeshFluxConstructorTablePtr_->find(schemeName);
 

From 6e10b0defdfec6bd3ba71d7f630255cab1ed2f86 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 5 May 2009 13:18:29 +0200
Subject: [PATCH 078/175] adjusted dictionary #inputMode directive

- #inputMode error
  now issues a FatalError on duplicate entries

- #inputMode warn
  issues a warning on duplicate entries, corresponds to the
  old behaviour of 'error'

- #inputMode protect
  prevents overwriting existing entries

The 'protect' mode provides a simple mechanism for supplying default values.
eg,
    in file1:
        #inputMode  protect
        intensity       0.1;
        mixingLength    0.005;
        #inputMode  merge

        inlet
        {
            type        turbulentIntensityKineticEnergyInlet;
            intensity   $intensity;
        }

    which is included from file2:

        intensity   0.05;
        #include    "file1"
---
 applications/test/dictionary/testDict         | 34 ++++++++-------
 applications/test/dictionary/testDict2        | 27 ++++++------
 src/OpenFOAM/db/dictionary/dictionary.C       |  6 ++-
 src/OpenFOAM/db/dictionary/entry/entryIO.C    | 42 +++++++++++++++----
 .../functionEntry/functionEntry.C             |  2 +-
 .../includeEntry/includeEntry.C               |  2 +-
 .../includeEntry/includeEntry.H               |  4 +-
 .../inputModeEntry/inputModeEntry.C           | 22 +++++++++-
 .../inputModeEntry/inputModeEntry.H           | 24 +++++++----
 .../primitiveEntry/primitiveEntryIO.C         | 14 +++----
 10 files changed, 120 insertions(+), 57 deletions(-)

diff --git a/applications/test/dictionary/testDict b/applications/test/dictionary/testDict
index 809625ee18..7709155fec 100644
--- a/applications/test/dictionary/testDict
+++ b/applications/test/dictionary/testDict
@@ -1,23 +1,28 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-|    =========                                                              |
-|    \\      /     OpenFOAM                                                 |
-|     \\    /                                                               |
-|      \\  /       The Open Source CFD Toolbox                              |
-|       \\/                                        http://www.OpenFOAM.org  |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  Any                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
 FoamFile
 {
-    version         2.0;
-    format          ascii;
-    class           dictionary;
-    object          testDict;
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      testDict;
 }
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 #inputMode  merge
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
 internalField   uniform 1;
 
+// use 'protect' to supply defaults
+#inputMode  protect
+internalField   uniform 10;
+dimensions      [ 0 2 -2 0 0 0 0 ];
+#inputMode  merge
+
 active
 {
     type            turbulentIntensityKineticEnergyInlet;
@@ -31,6 +36,7 @@ inactive
     type            zeroGradient;
 }
 
+
 boundaryField
 {
     Default_Boundary_Region
@@ -101,4 +107,4 @@ baz
 // this should work too
 #remove ( bar baz )
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/test/dictionary/testDict2 b/applications/test/dictionary/testDict2
index 6c55ab384c..124f5b0aee 100644
--- a/applications/test/dictionary/testDict2
+++ b/applications/test/dictionary/testDict2
@@ -1,19 +1,18 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-|    =========                                                              |
-|    \\      /     OpenFOAM                                                 |
-|     \\    /                                                               |
-|      \\  /       The Open Source CFD Toolbox                              |
-|       \\/                                        http://www.OpenFOAM.org  |
-\*-------------------------------------------------------------------------*/
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  Any                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
 FoamFile
 {
-    version         2.0;
-    format          ascii;
-    class           dictionary;
-    object          testDict;
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      testDict;
 }
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 boundaryField
 {
@@ -27,4 +26,4 @@ boundaryField
 }
 
 #inputMode  overwrite
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/dictionary/dictionary.C b/src/OpenFOAM/db/dictionary/dictionary.C
index fd89f0f608..5e76ecd612 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.C
+++ b/src/OpenFOAM/db/dictionary/dictionary.C
@@ -53,7 +53,8 @@ bool Foam::dictionary::findInPatterns
         {
             if
             (
-                patternMatch ? reLink()->match(Keyword)
+                patternMatch
+              ? reLink()->match(Keyword)
               : wcLink()->keyword() == Keyword
             )
             {
@@ -83,7 +84,8 @@ bool Foam::dictionary::findInPatterns
         {
             if
             (
-                patternMatch ? reLink()->match(Keyword)
+                patternMatch
+              ? reLink()->match(Keyword)
               : wcLink()->keyword() == Keyword
             )
             {
diff --git a/src/OpenFOAM/db/dictionary/entry/entryIO.C b/src/OpenFOAM/db/dictionary/entry/entryIO.C
index 76d068ea28..509c892e1d 100644
--- a/src/OpenFOAM/db/dictionary/entry/entryIO.C
+++ b/src/OpenFOAM/db/dictionary/entry/entryIO.C
@@ -73,7 +73,7 @@ bool Foam::entry::getKeyword(keyType& keyword, Istream& is)
     {
         cerr<< "--> FOAM Warning : " << std::endl
             << "    From function "
-            << "entry::getKeyword(keyType& keyword, Istream& is)" << std::endl
+            << "entry::getKeyword(keyType&, Istream&)" << std::endl
             << "    in file " << __FILE__
             << " at line " << __LINE__ << std::endl
             << "    Reading " << is.name().c_str() << std::endl
@@ -88,7 +88,7 @@ bool Foam::entry::getKeyword(keyType& keyword, Istream& is)
 
 bool Foam::entry::New(dictionary& parentDict, Istream& is)
 {
-    is.fatalCheck("entry::New(const dictionary& parentDict, Istream& is)");
+    is.fatalCheck("entry::New(const dictionary& parentDict, Istream&)");
 
     keyType keyword;
 
@@ -97,9 +97,9 @@ bool Foam::entry::New(dictionary& parentDict, Istream& is)
     {
         return false;
     }
-    else // Keyword starts entry ...
+    else  // Keyword starts entry ...
     {
-        if (keyword[0] == '#')        // ... Function entry
+        if (keyword[0] == '#')         // ... Function entry
         {
             word functionName = keyword(1, keyword.size()-1);
             return functionEntry::execute(functionName, parentDict, is);
@@ -128,9 +128,14 @@ bool Foam::entry::New(dictionary& parentDict, Istream& is)
                 false,
                 false
             );
+
             if (existingPtr)
             {
-                if (functionEntries::inputModeEntry::overwrite())
+                if (functionEntries::inputModeEntry::merge())
+                {
+                    mergeEntry = true;
+                }
+                else if (functionEntries::inputModeEntry::overwrite())
                 {
                     // clear dictionary so merge acts like overwrite
                     if (existingPtr->isDict())
@@ -139,9 +144,30 @@ bool Foam::entry::New(dictionary& parentDict, Istream& is)
                     }
                     mergeEntry = true;
                 }
-                else if (functionEntries::inputModeEntry::merge())
+                else if (functionEntries::inputModeEntry::protect())
                 {
-                    mergeEntry = true;
+                    // read and discard the entry
+                    if (nextToken == token::BEGIN_BLOCK)
+                    {
+                        dictionaryEntry dummy(keyword, parentDict, is);
+                    }
+                    else
+                    {
+                        primitiveEntry  dummy(keyword, parentDict, is);
+                    }
+                    return true;
+                }
+                else if (functionEntries::inputModeEntry::error())
+                {
+                    FatalIOErrorIn
+                    (
+                        "entry::New(const dictionary& parentDict, Istream&)",
+                        is
+                    )
+                        << "ERROR! duplicate entry: " << keyword
+                        << exit(FatalIOError);
+
+                    return false;
                 }
             }
 
@@ -168,7 +194,7 @@ bool Foam::entry::New(dictionary& parentDict, Istream& is)
 
 Foam::autoPtr<Foam::entry> Foam::entry::New(Istream& is)
 {
-    is.fatalCheck("entry::New(Istream& is)");
+    is.fatalCheck("entry::New(Istream&)");
 
     keyType keyword;
 
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C
index e36de4108c..e386a30f20 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C
@@ -58,7 +58,7 @@ bool Foam::functionEntry::execute
     is.fatalCheck
     (
         "functionEntry::execute"
-        "(const word& functionName, dictionary& parentDict, Istream& is)"
+        "(const word& functionName, dictionary& parentDict, Istream&)"
     );
 
     if (!executedictionaryIstreamMemberFunctionTablePtr_)
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C
index 7879369017..2d49418fae 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C
@@ -131,7 +131,7 @@ bool Foam::functionEntries::includeEntry::execute
         FatalIOErrorIn
         (
             "functionEntries::includeEntry::includeEntry"
-            "(dictionary& parentDict, primitiveEntry& entry, Istream&)",
+            "(dictionary& parentDict, primitiveEntry&, Istream&)",
             is
         )   << "Cannot open include file " << ifs.name()
             << " while reading dictionary " << parentDict.name()
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H
index b260e3f36c..e4255827bf 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H
@@ -34,8 +34,8 @@ Description
         #include "includeFile"
     @endverbatim
 
-    The usual expansion of environment variables and other constructs (eg,
-    the @c ~OpenFOAM/ expansion) is retained.
+    The usual expansion of environment variables and other constructs
+    (eg, the @c ~OpenFOAM/ expansion) is retained.
 
 See Also
     fileName, string::expand()
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.C
index f711da80aa..986780fdee 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.C
@@ -72,6 +72,14 @@ void Foam::functionEntries::inputModeEntry::setMode(Istream& is)
     {
         mode_ = OVERWRITE;
     }
+    else if (mode == "protect")
+    {
+        mode_ = PROTECT;
+    }
+    else if (mode == "warn")
+    {
+        mode_ = WARN;
+    }
     else if (mode == "error")
     {
         mode_ = ERROR;
@@ -79,7 +87,8 @@ void Foam::functionEntries::inputModeEntry::setMode(Istream& is)
     else
     {
         WarningIn("Foam::functionEntries::inputModeEntry::setMode(Istream&)")
-            << "unsupported input mode " << mode
+            << "unsupported input mode '" << mode
+            << "' ... defaulting to 'merge'"
             << endl;
     }
 }
@@ -116,4 +125,15 @@ bool Foam::functionEntries::inputModeEntry::overwrite()
 }
 
 
+bool Foam::functionEntries::inputModeEntry::protect()
+{
+    return mode_ == PROTECT;
+}
+
+bool Foam::functionEntries::inputModeEntry::error()
+{
+    return mode_ == ERROR;
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.H
index 9ecb558da9..da3bd7a067 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.H
@@ -37,8 +37,10 @@ Description
     The possible input modes:
     @param merge      merge sub-dictionaries when possible
     @param overwrite  keep last entry and silently remove previous ones
-    @param error      flag duplicate entry as an error
-    @param default    currently the same as merge
+    @param protect    keep initial entry and silently ignore subsequent ones
+    @param warn       keep initial entry and warn about subsequent ones
+    @param error      issue a FatalError for duplicate entries
+    @param default    currently identical to merge
 
 SourceFiles
     inputModeEntry.C
@@ -65,15 +67,17 @@ class inputModeEntry
 :
     public functionEntry
 {
-        //- input mode options
+        //- The input mode options
         enum inputMode
         {
-            ERROR,
             MERGE,
-            OVERWRITE
+            OVERWRITE,
+            PROTECT,
+            WARN,
+            ERROR
         };
 
-        //- current input mode
+        //- The current input mode
         static inputMode mode_;
 
 
@@ -100,7 +104,7 @@ public:
         //- Execute the functionEntry in a sub-dict context
         static bool execute(dictionary& parentDict, Istream&);
 
-        //- Reset the inputMode to %default
+        //- Reset the inputMode to %default (ie, %merge)
         static void clear();
 
         //- Return true if the inputMode is %merge
@@ -109,6 +113,12 @@ public:
         //- Return true if the inputMode is %overwrite
         static bool overwrite();
 
+        //- Return true if the inputMode is %protect
+        static bool protect();
+
+        //- Return true if the inputMode is %error
+        static bool error();
+
 };
 
 
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C
index adee46a636..896dee8d14 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C
@@ -83,7 +83,7 @@ bool Foam::primitiveEntry::expandVariable
     // lookup the variable name in the given dictionary....
     const entry* ePtr = dict.lookupEntryPtr(varName, true, true);
 
-    // ...if defined insert its tokens into this 
+    // ...if defined insert its tokens into this
     if (ePtr != NULL)
     {
         append(ePtr->stream());
@@ -91,7 +91,7 @@ bool Foam::primitiveEntry::expandVariable
     }
     else
     {
-        // if not in the dictionary see if it is an environment 
+        // if not in the dictionary see if it is an environment
         // variable
 
         string enVarString = getEnv(varName);
@@ -123,7 +123,7 @@ bool Foam::primitiveEntry::read(const dictionary& dict, Istream& is)
 {
     is.fatalCheck
     (
-        "primitiveEntry::readData(const dictionary& dict, Istream& is)"
+        "primitiveEntry::readData(const dictionary&, Istream&)"
     );
 
     label blockCount = 0;
@@ -177,7 +177,7 @@ bool Foam::primitiveEntry::read(const dictionary& dict, Istream& is)
 
     is.fatalCheck
     (
-        "primitiveEntry::readData(const dictionary& dict, Istream& is)"
+        "primitiveEntry::readData(const dictionary&, Istream&)"
     );
 
     if (currToken.good())
@@ -205,7 +205,7 @@ void Foam::primitiveEntry::readEntry(const dictionary& dict, Istream& is)
     {
         FatalIOErrorIn
         (
-            "primitiveEntry::readEntry(const dictionary& dict,Istream& is)",
+            "primitiveEntry::readEntry(const dictionary&, Istream&)",
             is
         )   << "ill defined primitiveEntry starting at keyword '"
             << keyword() << '\''
@@ -266,7 +266,7 @@ void Foam::primitiveEntry::write(Ostream& os) const
             os << token::SPACE;
         }
     }
-    
+
     os << token::END_STATEMENT << endl;
 }
 
@@ -297,7 +297,7 @@ Foam::Ostream& Foam::operator<<
     {
         os  << " ...";
     }
-    
+
     os  << endl;
 
     return os;

From 48c6fbcab20b411eecf0b4e7409789c50daec368 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Tue, 5 May 2009 21:23:56 +0100
Subject: [PATCH 079/175] Added tags file to help locate files.

---
 bin/foamTags | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/foamTags b/bin/foamTags
index f51e06a062..e00795d8e6 100755
--- a/bin/foamTags
+++ b/bin/foamTags
@@ -42,7 +42,7 @@ fi
 cd $WM_PROJECT_DIR
 mkdir .tags 2>/dev/null
 
-#etagsCmd="etags --declarations -l c++ -o .tags/etags -"
+etagsCmd="etags --declarations -l c++ -o .tags/etags -"
 #etagsDefCmd="etags -l c++ -o .tags/etagsDef -"
 #etagsDecCmd="etags --declarations -l c++ -o .tags/etagsDec -"
 
@@ -52,10 +52,10 @@ etagsDecCmd="ectags -e --extra=+fq --file-scope=no --c-kinds=+p -o .tags/etagsDe
 
 ectagsDecCmd="ectags -o .tags/ectagsDec --file-scope=no --c-kinds=+p --excmd=n --extra=+fq --fields=+afiKmnsSzt -L -"
 
-find -H . \( -name "*.[HC]" -o -name lnInclude -prune -o -name Doxygen -prune \) | $etagsCmd
-find -H . \( -name "*.[HC]" -o -name lnInclude -prune -o -name Doxygen -prune \) | $etagsDefCmd
-find -H . \( -name "*.H" -o -name lnInclude -prune -o -name Doxygen -prune \) | $etagsDecCmd
-find -H . \( -name "*.H" -o -name lnInclude -prune -o -name Doxygen -prune \) | $ectagsDecCmd
+find -H $WM_PROJECT_DIR \( -name "*.[HC]" -o -name lnInclude -prune -o -name Doxygen -prune \) | $etagsCmd
+find -H $WM_PROJECT_DIR \( -name "*.[HC]" -o -name lnInclude -prune -o -name Doxygen -prune \) | $etagsDefCmd
+find -H $WM_PROJECT_DIR \( -name "*.H" -o -name lnInclude -prune -o -name Doxygen -prune \) | $etagsDecCmd
+find -H $WM_PROJECT_DIR \( -name "*.H" -o -name lnInclude -prune -o -name Doxygen -prune \) | $ectagsDecCmd
 
 gtags -i --gtagsconf bin/tools/gtagsrc .tags
 

From fbf67192e05f3a1bf93db0c5d4c93c0dc8958ed8 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Tue, 5 May 2009 21:24:19 +0100
Subject: [PATCH 080/175] Change to keep gcc-4.4.0 happy.

---
 src/OSspecific/Unix/signals/sigFpe.C | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/OSspecific/Unix/signals/sigFpe.C b/src/OSspecific/Unix/signals/sigFpe.C
index 5376aa8a8c..813364d366 100644
--- a/src/OSspecific/Unix/signals/sigFpe.C
+++ b/src/OSspecific/Unix/signals/sigFpe.C
@@ -46,6 +46,7 @@ License
 
 #endif
 
+#include <stdint.h>
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -69,7 +70,7 @@ void* Foam::sigFpe::my_malloc_hook(size_t size, const void *caller)
     // initialize to signalling nan
 #   ifdef SP
 
-    const uint32_t sNAN = 0x7ff7fffflu; 
+    const uint32_t sNAN = 0x7ff7fffflu;
 
     int nScalars = size / sizeof(scalar);
 
@@ -82,7 +83,7 @@ void* Foam::sigFpe::my_malloc_hook(size_t size, const void *caller)
 
 #   else
 
-    const uint64_t sNAN = 0x7ff7ffffffffffffllu; 
+    const uint64_t sNAN = 0x7ff7ffffffffffffllu;
 
     int nScalars = size/sizeof(scalar);
 
@@ -115,7 +116,7 @@ void Foam::sigFpe::sigFpeHandler(int)
         (
             "Foam::sigSegv::sigFpeHandler()"
         )   << "Cannot reset SIGFPE trapping"
-            << abort(FatalError);    
+            << abort(FatalError);
     }
 
     // Update jobInfo file
@@ -153,7 +154,7 @@ Foam::sigFpe::~sigFpe()
             (
                 "Foam::sigFpe::~sigFpe()"
             )   << "Cannot reset SIGFPE trapping"
-                << abort(FatalError);    
+                << abort(FatalError);
         }
 
 #       endif
@@ -208,7 +209,7 @@ void Foam::sigFpe::set()
             (
                 "Foam::sigFpe::set()"
             )   << "Cannot set SIGFPE trapping"
-                << abort(FatalError);    
+                << abort(FatalError);
         }
 
 

From ac37ed4537f7f78ca588e310f58c103eacf93741 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Tue, 5 May 2009 21:25:01 +0100
Subject: [PATCH 081/175] Made floatTransfer 0 by default.

---
 src/OpenFOAM/db/IOstreams/Pstreams/Pstream.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.C
index 531b15b8fc..bdb31516ba 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.C
@@ -230,7 +230,7 @@ Foam::List<Foam::Pstream::commsStruct> Foam::Pstream::treeCommunication_(0);
 // in accuracy
 bool Foam::Pstream::floatTransfer
 (
-    debug::optimisationSwitch("floatTransfer", 1)
+    debug::optimisationSwitch("floatTransfer", 0)
 );
 
 // Number of processors at which the reduce algorithm changes from linear to

From 01184dfb3337de37ae1fa54693094645df8c452f Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Tue, 5 May 2009 21:25:22 +0100
Subject: [PATCH 082/175] Minor typo correction.

---
 .../primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
index 13d5f52e9e..3534519ca7 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
@@ -790,7 +790,7 @@ bool Foam::primitiveMesh::checkPoints
     {
         if (debug || report)
         {
-            Info<< " ***Unsed points found in the mesh, "
+            Info<< " ***Unused points found in the mesh, "
                    "number unused by faces: " << nFaceErrors
                 << " number unused by cells: " << nCellErrors
                 << endl;

From 162f9d57d8d7731a73e26825141f5103e5ee5d04 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Tue, 5 May 2009 21:25:48 +0100
Subject: [PATCH 083/175] Fix from Niklas.

---
 .../collisionModel/trajectoryModel/trajectoryCM.H               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/trajectoryModel/trajectoryCM.H b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/trajectoryModel/trajectoryCM.H
index fd01d4390d..a7cca2b7e3 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/trajectoryModel/trajectoryCM.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/trajectoryModel/trajectoryCM.H
@@ -8,7 +8,7 @@ scalar magVRel = mag(vRel);
 vector p = p2().position() - p1().position();
 scalar dist = mag(p);
 
-scalar vAlign = vRel & (p/dist);
+scalar vAlign = vRel & (p/(dist+SMALL));
 
 if (vAlign > 0)
 {

From 395298292dcc1d9e927ce2962e20fec880bb9871 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Tue, 5 May 2009 21:58:38 +0100
Subject: [PATCH 084/175] Renamed the LES wall-function back to how it was
 because it is more generally applicable than just to the Spalart Allmaras
 model.

---
 .../compressible/LES/Make/files               |  2 +-
 .../muSgsWallFunctionFvPatchScalarField.C}    | 36 +++++++++---------
 .../muSgsWallFunctionFvPatchScalarField.H}    | 38 +++++++++----------
 .../incompressible/LES/Make/files             |  2 +-
 .../nuSgsWallFunctionFvPatchScalarField.C}    | 32 ++++++++--------
 .../nuSgsWallFunctionFvPatchScalarField.H}    | 36 +++++++++---------
 6 files changed, 73 insertions(+), 73 deletions(-)
 rename src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/{muSgsSpalartAllmarasWallFunction/muSgsSpalartAllmarasWallFunctionFvPatchScalarField.C => muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C} (82%)
 rename src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/{muSgsSpalartAllmarasWallFunction/muSgsSpalartAllmarasWallFunctionFvPatchScalarField.H => muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H} (76%)
 rename src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/{nuSgsSpalartAllmarasWallFunction/nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.C => nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C} (82%)
 rename src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/{nuSgsSpalartAllmarasWallFunction/nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.H => nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H} (76%)

diff --git a/src/turbulenceModels/compressible/LES/Make/files b/src/turbulenceModels/compressible/LES/Make/files
index dc31f55cae..06e7b76d45 100644
--- a/src/turbulenceModels/compressible/LES/Make/files
+++ b/src/turbulenceModels/compressible/LES/Make/files
@@ -14,6 +14,6 @@ SpalartAllmaras/SpalartAllmaras.C
 wallFunctions=derivedFvPatchFields/wallFunctions
 
 muSgsWallFunctions=$(wallFunctions)/muSgsWallFunctions
-$(muSgsWallFunctions)/muSgsSpalartAllmarasWallFunction/muSgsSpalartAllmarasWallFunctionFvPatchScalarField.C
+$(muSgsWallFunctions)/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
 
 LIB = $(FOAM_LIBBIN)/libcompressibleLESModels
diff --git a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsSpalartAllmarasWallFunction/muSgsSpalartAllmarasWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
similarity index 82%
rename from src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsSpalartAllmarasWallFunction/muSgsSpalartAllmarasWallFunctionFvPatchScalarField.C
rename to src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
index bb489c3091..987cd21f29 100644
--- a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsSpalartAllmarasWallFunction/muSgsSpalartAllmarasWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "muSgsSpalartAllmarasWallFunctionFvPatchScalarField.H"
+#include "muSgsWallFunctionFvPatchScalarField.H"
 #include "LESModel.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
@@ -41,8 +41,8 @@ namespace LESModels
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-muSgsSpalartAllmarasWallFunctionFvPatchScalarField::
-muSgsSpalartAllmarasWallFunctionFvPatchScalarField
+muSgsWallFunctionFvPatchScalarField::
+muSgsWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
@@ -52,10 +52,10 @@ muSgsSpalartAllmarasWallFunctionFvPatchScalarField
 {}
 
 
-muSgsSpalartAllmarasWallFunctionFvPatchScalarField::
-muSgsSpalartAllmarasWallFunctionFvPatchScalarField
+muSgsWallFunctionFvPatchScalarField::
+muSgsWallFunctionFvPatchScalarField
 (
-    const muSgsSpalartAllmarasWallFunctionFvPatchScalarField& ptf,
+    const muSgsWallFunctionFvPatchScalarField& ptf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
@@ -65,8 +65,8 @@ muSgsSpalartAllmarasWallFunctionFvPatchScalarField
 {}
 
 
-muSgsSpalartAllmarasWallFunctionFvPatchScalarField::
-muSgsSpalartAllmarasWallFunctionFvPatchScalarField
+muSgsWallFunctionFvPatchScalarField::
+muSgsWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
@@ -77,8 +77,8 @@ muSgsSpalartAllmarasWallFunctionFvPatchScalarField
 {}
 
 
-muSgsSpalartAllmarasWallFunctionFvPatchScalarField::
-muSgsSpalartAllmarasWallFunctionFvPatchScalarField
+muSgsWallFunctionFvPatchScalarField::
+muSgsWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
@@ -89,20 +89,20 @@ muSgsSpalartAllmarasWallFunctionFvPatchScalarField
 {}
 
 
-muSgsSpalartAllmarasWallFunctionFvPatchScalarField::
-muSgsSpalartAllmarasWallFunctionFvPatchScalarField
+muSgsWallFunctionFvPatchScalarField::
+muSgsWallFunctionFvPatchScalarField
 (
-    const muSgsSpalartAllmarasWallFunctionFvPatchScalarField& tppsf
+    const muSgsWallFunctionFvPatchScalarField& tppsf
 )
 :
     fixedValueFvPatchScalarField(tppsf)
 {}
 
 
-muSgsSpalartAllmarasWallFunctionFvPatchScalarField::
-muSgsSpalartAllmarasWallFunctionFvPatchScalarField
+muSgsWallFunctionFvPatchScalarField::
+muSgsWallFunctionFvPatchScalarField
 (
-    const muSgsSpalartAllmarasWallFunctionFvPatchScalarField& tppsf,
+    const muSgsWallFunctionFvPatchScalarField& tppsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
@@ -112,7 +112,7 @@ muSgsSpalartAllmarasWallFunctionFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void muSgsSpalartAllmarasWallFunctionFvPatchScalarField::evaluate
+void muSgsWallFunctionFvPatchScalarField::evaluate
 (
     const Pstream::commsTypes
 )
@@ -193,7 +193,7 @@ void muSgsSpalartAllmarasWallFunctionFvPatchScalarField::evaluate
 makePatchTypeField
 (
     fvPatchScalarField,
-    muSgsSpalartAllmarasWallFunctionFvPatchScalarField
+    muSgsWallFunctionFvPatchScalarField
 );
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsSpalartAllmarasWallFunction/muSgsSpalartAllmarasWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H
similarity index 76%
rename from src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsSpalartAllmarasWallFunction/muSgsSpalartAllmarasWallFunctionFvPatchScalarField.H
rename to src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H
index f3c6e9ecc9..916685fd7c 100644
--- a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsSpalartAllmarasWallFunction/muSgsSpalartAllmarasWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H
@@ -24,18 +24,18 @@ License
 
 Class
     Foam::compressible::LESModels::
-        muSgsSpalartAllmarasWallFunctionFvPatchScalarField
+        muSgsWallFunctionFvPatchScalarField
 
 Description
     Spalart Allmaas wall function boundary condition for compressible flows
 
 SourceFiles
-    muSgsSpalartAllmarasWallFunctionFvPatchScalarField.C
+    muSgsWallFunctionFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef muSgsSpalartAllmarasWallFunctionFvPatchScalarField_H
-#define muSgsSpalartAllmarasWallFunctionFvPatchScalarField_H
+#ifndef muSgsWallFunctionFvPatchScalarField_H
+#define muSgsWallFunctionFvPatchScalarField_H
 
 #include "fixedValueFvPatchFields.H"
 
@@ -49,10 +49,10 @@ namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
-     Class muSgsSpalartAllmarasWallFunctionFvPatchScalarField Declaration
+     Class muSgsWallFunctionFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
-class muSgsSpalartAllmarasWallFunctionFvPatchScalarField
+class muSgsWallFunctionFvPatchScalarField
 :
     public fixedValueFvPatchScalarField
 {
@@ -62,20 +62,20 @@ class muSgsSpalartAllmarasWallFunctionFvPatchScalarField
 public:
 
     //- Runtime type information
-    TypeName("muSgsSpalartAllmarasWallFunction");
+    TypeName("muSgsWallFunction");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        muSgsSpalartAllmarasWallFunctionFvPatchScalarField
+        muSgsWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and Istream
-        muSgsSpalartAllmarasWallFunctionFvPatchScalarField
+        muSgsWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
@@ -83,7 +83,7 @@ public:
         );
 
         //- Construct from patch, internal field and dictionary
-        muSgsSpalartAllmarasWallFunctionFvPatchScalarField
+        muSgsWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
@@ -91,20 +91,20 @@ public:
         );
 
         //- Construct by mapping given
-        //  muSgsSpalartAllmarasWallFunctionFvPatchScalarField
+        //  muSgsWallFunctionFvPatchScalarField
         //  onto a new patch
-        muSgsSpalartAllmarasWallFunctionFvPatchScalarField
+        muSgsWallFunctionFvPatchScalarField
         (
-            const muSgsSpalartAllmarasWallFunctionFvPatchScalarField&,
+            const muSgsWallFunctionFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        muSgsSpalartAllmarasWallFunctionFvPatchScalarField
+        muSgsWallFunctionFvPatchScalarField
         (
-            const muSgsSpalartAllmarasWallFunctionFvPatchScalarField&
+            const muSgsWallFunctionFvPatchScalarField&
         );
 
         //- Construct and return a clone
@@ -112,14 +112,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new muSgsSpalartAllmarasWallFunctionFvPatchScalarField(*this)
+                new muSgsWallFunctionFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        muSgsSpalartAllmarasWallFunctionFvPatchScalarField
+        muSgsWallFunctionFvPatchScalarField
         (
-            const muSgsSpalartAllmarasWallFunctionFvPatchScalarField&,
+            const muSgsWallFunctionFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -131,7 +131,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new muSgsSpalartAllmarasWallFunctionFvPatchScalarField
+                new muSgsWallFunctionFvPatchScalarField
                 (
                     *this,
                     iF
diff --git a/src/turbulenceModels/incompressible/LES/Make/files b/src/turbulenceModels/incompressible/LES/Make/files
index bd97e2c1ec..186324fde3 100644
--- a/src/turbulenceModels/incompressible/LES/Make/files
+++ b/src/turbulenceModels/incompressible/LES/Make/files
@@ -32,7 +32,7 @@ kOmegaSSTSAS/kOmegaSSTSAS.C
 wallFunctions=derivedFvPatchFields/wallFunctions
 
 nuSgsWallFunctions=$(wallFunctions)/nuSgsWallFunctions
-$(nuSgsWallFunctions)/nuSgsSpalartAllmarasWallFunction/nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.C
+$(nuSgsWallFunctions)/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
 
 
 LIB = $(FOAM_LIBBIN)/libincompressibleLESModels
diff --git a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsSpalartAllmarasWallFunction/nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
similarity index 82%
rename from src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsSpalartAllmarasWallFunction/nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.C
rename to src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
index f42afb995d..e70fd66bf9 100644
--- a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsSpalartAllmarasWallFunction/nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.H"
+#include "nuSgsWallFunctionFvPatchScalarField.H"
 #include "LESModel.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
@@ -41,8 +41,8 @@ namespace LESModels
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::
-nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
+nuSgsWallFunctionFvPatchScalarField::
+nuSgsWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
@@ -52,10 +52,10 @@ nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
 {}
 
 
-nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::
-nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
+nuSgsWallFunctionFvPatchScalarField::
+nuSgsWallFunctionFvPatchScalarField
 (
-    const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField& ptf,
+    const nuSgsWallFunctionFvPatchScalarField& ptf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
@@ -65,8 +65,8 @@ nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
 {}
 
 
-nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::
-nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
+nuSgsWallFunctionFvPatchScalarField::
+nuSgsWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
@@ -77,20 +77,20 @@ nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
 {}
 
 
-nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::
-nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
+nuSgsWallFunctionFvPatchScalarField::
+nuSgsWallFunctionFvPatchScalarField
 (
-    const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField& tppsf
+    const nuSgsWallFunctionFvPatchScalarField& tppsf
 )
 :
     fixedValueFvPatchScalarField(tppsf)
 {}
 
 
-nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::
-nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
+nuSgsWallFunctionFvPatchScalarField::
+nuSgsWallFunctionFvPatchScalarField
 (
-    const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField& tppsf,
+    const nuSgsWallFunctionFvPatchScalarField& tppsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
@@ -100,7 +100,7 @@ nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::evaluate
+void nuSgsWallFunctionFvPatchScalarField::evaluate
 (
     const Pstream::commsTypes
 )
@@ -174,7 +174,7 @@ void nuSgsSpalartAllmarasWallFunctionFvPatchScalarField::evaluate
 makePatchTypeField
 (
     fvPatchScalarField,
-    nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
+    nuSgsWallFunctionFvPatchScalarField
 );
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsSpalartAllmarasWallFunction/nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H
similarity index 76%
rename from src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsSpalartAllmarasWallFunction/nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.H
rename to src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H
index 07dd197554..d3f06ece81 100644
--- a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsSpalartAllmarasWallFunction/nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H
@@ -24,18 +24,18 @@ License
 
 Class
     Foam::incompressible::LESModels::
-        nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
+        nuSgsWallFunctionFvPatchScalarField
 
 Description
     Spalart Allmaras wall function boundary condition for incompressible flows
 
 SourceFiles
-    nuSgsSpalartAllmarasWallFunctionFvPatchScalarField.C
+    nuSgsWallFunctionFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef nuSgsSpalartAllmarasWallFunctionFvPatchScalarField_H
-#define nuSgsSpalartAllmarasWallFunctionFvPatchScalarField_H
+#ifndef nuSgsWallFunctionFvPatchScalarField_H
+#define nuSgsWallFunctionFvPatchScalarField_H
 
 #include "fixedValueFvPatchFields.H"
 
@@ -49,10 +49,10 @@ namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
-     Class nuSgsSpalartAllmarasWallFunctionFvPatchScalarField Declaration
+     Class nuSgsWallFunctionFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
-class nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
+class nuSgsWallFunctionFvPatchScalarField
 :
     public fixedValueFvPatchScalarField
 {
@@ -62,20 +62,20 @@ class nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
 public:
 
     //- Runtime type information
-    TypeName("nuSgsSpalartAllmarasWallFunction");
+    TypeName("nuSgsWallFunction");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
+        nuSgsWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
+        nuSgsWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
@@ -83,20 +83,20 @@ public:
         );
 
         //- Construct by mapping given
-        //  nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
+        //  nuSgsWallFunctionFvPatchScalarField
         //  onto a new patch
-        nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
+        nuSgsWallFunctionFvPatchScalarField
         (
-            const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField&,
+            const nuSgsWallFunctionFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
+        nuSgsWallFunctionFvPatchScalarField
         (
-            const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField&
+            const nuSgsWallFunctionFvPatchScalarField&
         );
 
         //- Construct and return a clone
@@ -104,14 +104,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new nuSgsSpalartAllmarasWallFunctionFvPatchScalarField(*this)
+                new nuSgsWallFunctionFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
+        nuSgsWallFunctionFvPatchScalarField
         (
-            const nuSgsSpalartAllmarasWallFunctionFvPatchScalarField&,
+            const nuSgsWallFunctionFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -123,7 +123,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new nuSgsSpalartAllmarasWallFunctionFvPatchScalarField
+                new nuSgsWallFunctionFvPatchScalarField
                 (
                     *this,
                     iF

From 981bbb5aaef99122709d9fb80f9942b2df63b867 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 6 May 2009 10:07:43 +0100
Subject: [PATCH 085/175] display n-D on construction - also serves to
 initialise mesh.geometricD() and mesh.solutionD()   - lazy evaluation of
 calcDirections() caused prob when running in parallel

---
 .../InjectionModel/InjectionModel/InjectionModel.C    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index adf2559e98..b9ee75ef20 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -301,6 +301,12 @@ Foam::InjectionModel<CloudType>::InjectionModel
     time0_(owner.db().time().value()),
     timeStep0_(0.0)
 {
+    // Provide some info
+    // - also serves to initialise mesh dimensions - needed for parallel runs
+    //   due to lazy evaluation of valid mesh dimensions
+    Info<< "    Constructing " << owner.mesh().nGeometricD() << "-D injection"
+        << endl;
+
     word parcelBasisType = coeffDict_.lookup("parcelBasisType");
     if (parcelBasisType == "mass")
     {
@@ -341,6 +347,11 @@ template<class CloudType>
 template<class TrackData>
 void Foam::InjectionModel<CloudType>::inject(TrackData& td)
 {
+    if (!active())
+    {
+        return;
+    }
+
     const scalar time = owner_.db().time().value();
     const scalar continuousDt = owner_.db().time().deltaT().value();
 

From 3728ce97f9a887e662e3e0dc806759b434879c85 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 6 May 2009 10:13:47 +0100
Subject: [PATCH 086/175] removing unused file

---
 .../basic/lagrangianField/LagrangianField.H   | 140 ------------------
 1 file changed, 140 deletions(-)
 delete mode 100644 src/lagrangian/basic/lagrangianField/LagrangianField.H

diff --git a/src/lagrangian/basic/lagrangianField/LagrangianField.H b/src/lagrangian/basic/lagrangianField/LagrangianField.H
deleted file mode 100644
index a760413448..0000000000
--- a/src/lagrangian/basic/lagrangianField/LagrangianField.H
+++ /dev/null
@@ -1,140 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  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::LagrangianField
-
-Description
-
-SourceFiles
-    LagrangianFieldI.H
-    LagrangianField.C
-    LagrangianFieldIO.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef LagrangianField_H
-#define LagrangianField_H
-
-#include "DimensionedField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class LagrangianField Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class Type, class Cloud>
-class LagrangianField
-:
-    public DimensionedField<Type>
-{
-    // Private data
-
-        //- Reference to lagrangian cloud this field is part of
-        const Cloud& cloud_;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("LagrangianField");
-
-
-    // Constructors
-
-        //- Construct from components
-        LagrangianField
-        (
-            const IOobject& ioObject,
-            const Cloud& cloud,
-            const dimensions& dims,
-            const Field<Type> field
-        );
-
-        //- Construct from IOobject
-        LagrangianField
-        (
-            const IOobject& ioObject,
-            const Cloud& cloud
-        );
-
-        //- Construct from Cloud data
-        LagrangianField(const Cloud& cloud, const int typeFieldIndex);
-
-        //- Construct as copy
-        LagrangianField(const LagrangianField<Type>&);
-
-
-    // Destructor
-
-        ~LagrangianField();
-
-
-    // Member Functions
-
-        // Access
-
-            //- Map field back into Cloud
-            void map(Cloud& cloud, const int typeFieldIndex);
-
-
-        // Check
-
-        // Edit
-
-        // Write
-
-
-    // Member Operators
-
-        void operator=(const LagrangianField&);
-
-
-    // Friend Functions
-
-    // Friend Operators
-
-    // IOstream Operators
-
-        friend Ostream& operator<<(Ostream&, const LagrangianField&);
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "LagrangianFieldI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //

From 231df62edf06689d1558ffe4dadca14890e7fa78 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 6 May 2009 10:59:23 +0100
Subject: [PATCH 087/175] resolve conflict

---
 .../InjectionModel/InjectionModel.C           | 53 +++++--------------
 .../InjectionModel/InjectionModel.H           |  5 +-
 2 files changed, 14 insertions(+), 44 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index b9ee75ef20..ad918e63d7 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -230,17 +230,17 @@ Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
 
 
 template<class CloudType>
-void Foam::InjectionModel<CloudType>::postInjectCheck()
+void Foam::InjectionModel<CloudType>::postInjectCheck(const label parcelsAdded)
 {
-    if (parcelsAdded_ > 0)
+    if (parcelsAdded > 0)
     {
         Pout<< "\n--> Cloud: " << owner_.name() << nl
-            << "    Added " << parcelsAdded_
+            << "    Added " << parcelsAdded
             << " new parcels" << nl << endl;
     }
 
     // Increment total number of parcels added
-    parcelsAddedTotal_ += parcelsAdded_;
+    parcelsAddedTotal_ += parcelsAdded;
 
     // Update time for start of next injection
     time0_ = owner_.db().time().value();
@@ -248,9 +248,6 @@ void Foam::InjectionModel<CloudType>::postInjectCheck()
     // Increment number of injections
     nInjections_++;
 
-    // Reset added parcels counter
-    parcelsAdded_ = 0;
-
     // Write current state to properties file
     writeProps();
 }
@@ -269,7 +266,6 @@ Foam::InjectionModel<CloudType>::InjectionModel(CloudType& owner)
     massTotal_(0.0),
     massInjected_(0.0),
     nInjections_(0),
-    parcelsAdded_(0),
     parcelsAddedTotal_(0),
     parcelBasis_(pbNumber),
     time0_(0.0),
@@ -295,18 +291,11 @@ Foam::InjectionModel<CloudType>::InjectionModel
     massTotal_(dimensionedScalar(coeffDict_.lookup("massTotal")).value()),
     massInjected_(0.0),
     nInjections_(0),
-    parcelsAdded_(0),
     parcelsAddedTotal_(0),
     parcelBasis_(pbNumber),
     time0_(owner.db().time().value()),
     timeStep0_(0.0)
 {
-    // Provide some info
-    // - also serves to initialise mesh dimensions - needed for parallel runs
-    //   due to lazy evaluation of valid mesh dimensions
-    Info<< "    Constructing " << owner.mesh().nGeometricD() << "-D injection"
-        << endl;
-
     word parcelBasisType = coeffDict_.lookup("parcelBasisType");
     if (parcelBasisType == "mass")
     {
@@ -347,16 +336,11 @@ template<class CloudType>
 template<class TrackData>
 void Foam::InjectionModel<CloudType>::inject(TrackData& td)
 {
-    if (!active())
-    {
-        return;
-    }
-
     const scalar time = owner_.db().time().value();
     const scalar continuousDt = owner_.db().time().deltaT().value();
+    const polyMesh& mesh = owner_.mesh();
 
     // Prepare for next time step
-    parcelsAdded_ = 0;
     label newParcels = 0;
     scalar newVolume = 0.0;
     prepareForNextTimeStep(time0_, time, newParcels, newVolume);
@@ -364,7 +348,7 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
     // Return if no parcels are required
     if (newParcels == 0)
     {
-        postInjectCheck();
+        postInjectCheck(0);
         return;
     }
 
@@ -384,7 +368,8 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
     // Pad injection time if injection starts during this timestep
     const scalar padTime = max(0.0, SOI_ - time0_);
 
-    // Introduce new parcels linearly with time
+    // Introduce new parcels linearly across carrier phase timestep
+    label parcelsAdded = 0;
     for (label parcelI=0; parcelI<newParcels; parcelI++)
     {
         // Calculate the pseudo time of injection for parcel 'parcelI'
@@ -395,7 +380,7 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
         vector pos = vector::zero;
         setPositionAndCell(parcelI, timeInj, pos, cellI);
 
-        if (cellI >= 0)
+        if (cellI > -1)
         {
             if (validInjection(parcelI))
             {
@@ -419,30 +404,18 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
                 scalar dt = time - timeInj;
 
                 // Apply corrections for 2-D cases
-                meshTools::constrainToMeshCentre(owner_.mesh(), pos);
-                meshTools::constrainDirection
-                (
-                    owner_.mesh(),
-                    owner_.mesh().solutionD(),
-                    U
-                );
+                meshTools::constrainToMeshCentre(mesh, pos);
+                meshTools::constrainDirection(mesh, mesh.solutionD(), U);
 
                 // Add the new parcel
                 td.cloud().addNewParcel(pos, cellI, d, U, nP, dt);
                 massInjected_ += nP*rho*mathematicalConstant::pi*pow3(d)/6.0;
-                parcelsAdded_++;
+                parcelsAdded++;
             }
         }
-        else
-        {
-            WarningIn("Foam::InjectionModel<CloudType>::inject(TrackData& td)")
-                << "Failed to inject new parcel:" << nl
-                << "    id = " << parcelI << ", position = " << pos
-                << nl << endl;
-        }
     }
 
-    postInjectCheck();
+    postInjectCheck(parcelsAdded);
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index a2f0cd1c16..36820ac318 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -114,9 +114,6 @@ protected:
             //- Number of injections counter
             label nInjections_;
 
-            //- Running counter of parcels added during each injection
-            label parcelsAdded_;
-
             //- Running counter of total number of parcels added
             label parcelsAddedTotal_;
 
@@ -178,7 +175,7 @@ protected:
         );
 
         //- Post injection checks
-        virtual void postInjectCheck();
+        virtual void postInjectCheck(const label parcelsAdded);
 
 
 public:

From 96d17a50a25a36aa2395b424207b9997adab89db Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 6 May 2009 10:07:43 +0100
Subject: [PATCH 088/175] display n-D on construction - also serves to
 initialise mesh.geometricD() and mesh.solutionD()   - lazy evaluation of
 calcDirections() caused prob when running in parallel

---
 .../InjectionModel/InjectionModel/InjectionModel.C    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index ad918e63d7..6a0ba9544b 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -296,6 +296,12 @@ Foam::InjectionModel<CloudType>::InjectionModel
     time0_(owner.db().time().value()),
     timeStep0_(0.0)
 {
+    // Provide some info
+    // - also serves to initialise mesh dimensions - needed for parallel runs
+    //   due to lazy evaluation of valid mesh dimensions
+    Info<< "    Constructing " << owner.mesh().nGeometricD() << "-D injection"
+        << endl;
+
     word parcelBasisType = coeffDict_.lookup("parcelBasisType");
     if (parcelBasisType == "mass")
     {
@@ -336,6 +342,11 @@ template<class CloudType>
 template<class TrackData>
 void Foam::InjectionModel<CloudType>::inject(TrackData& td)
 {
+    if (!active())
+    {
+        return;
+    }
+
     const scalar time = owner_.db().time().value();
     const scalar continuousDt = owner_.db().time().deltaT().value();
     const polyMesh& mesh = owner_.mesh();

From ce3db4f17a5b209098d2e20dbbf06978e31ae48d Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 6 May 2009 11:57:56 +0100
Subject: [PATCH 089/175] constraining new velocity by solutionD()

---
 .../parcels/Templates/KinematicParcel/KinematicParcel.C      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index f318c5c73d..0248e4375d 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -85,6 +85,8 @@ void Foam::KinematicParcel<ParcelType>::calc
     const scalar rho0 = rho_;
     const scalar mass0 = mass();
 
+    const polyMesh& mesh = this->cloud().pMesh();
+
 
     // Initialise transfer terms
     // ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -104,6 +106,9 @@ void Foam::KinematicParcel<ParcelType>::calc
     vector U1 =
         calcVelocity(td, dt, cellI, d0, U0, rho0, mass0, Fx, Cud, dUTrans);
 
+    // Constrain the new velocity for reduced -D cases
+    meshTools::constrainDirection(mesh, mesh.solutionD(), U1);
+
 
     // Accumulate carrier phase source terms
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

From 02cc2455ed6bd6d8f3c00a3c270edcf606430baf Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 6 May 2009 13:23:11 +0100
Subject: [PATCH 090/175] initial commit of reactingParcelFoam

---
 .../Lagrangian/reactingParcelFoam/Make/files  |   3 +
 .../reactingParcelFoam/Make/options           |  40 +++++
 .../Lagrangian/reactingParcelFoam/UEqn.H      |  16 ++
 .../Lagrangian/reactingParcelFoam/YEqn.H      |  45 ++++++
 .../reactingParcelFoam/additionalOutput.H     |  48 ++++++
 .../Lagrangian/reactingParcelFoam/chemistry.H |  25 ++++
 .../reactingParcelFoam/createClouds.H         |  42 ++++++
 .../reactingParcelFoam/createFields.H         | 141 ++++++++++++++++++
 .../Lagrangian/reactingParcelFoam/hEqn.H      |  20 +++
 .../Lagrangian/reactingParcelFoam/pEqn.H      |  72 +++++++++
 .../reactingParcelFoam/reactingParcelFoam.C   | 120 +++++++++++++++
 .../readChemistryProperties.H                 |  22 +++
 .../Lagrangian/reactingParcelFoam/rhoEqn.H    |  43 ++++++
 13 files changed, 637 insertions(+)
 create mode 100644 applications/solvers/Lagrangian/reactingParcelFoam/Make/files
 create mode 100644 applications/solvers/Lagrangian/reactingParcelFoam/Make/options
 create mode 100644 applications/solvers/Lagrangian/reactingParcelFoam/UEqn.H
 create mode 100644 applications/solvers/Lagrangian/reactingParcelFoam/YEqn.H
 create mode 100644 applications/solvers/Lagrangian/reactingParcelFoam/additionalOutput.H
 create mode 100644 applications/solvers/Lagrangian/reactingParcelFoam/chemistry.H
 create mode 100644 applications/solvers/Lagrangian/reactingParcelFoam/createClouds.H
 create mode 100644 applications/solvers/Lagrangian/reactingParcelFoam/createFields.H
 create mode 100644 applications/solvers/Lagrangian/reactingParcelFoam/hEqn.H
 create mode 100644 applications/solvers/Lagrangian/reactingParcelFoam/pEqn.H
 create mode 100644 applications/solvers/Lagrangian/reactingParcelFoam/reactingParcelFoam.C
 create mode 100644 applications/solvers/Lagrangian/reactingParcelFoam/readChemistryProperties.H
 create mode 100644 applications/solvers/Lagrangian/reactingParcelFoam/rhoEqn.H

diff --git a/applications/solvers/Lagrangian/reactingParcelFoam/Make/files b/applications/solvers/Lagrangian/reactingParcelFoam/Make/files
new file mode 100644
index 0000000000..ea13ecb0c5
--- /dev/null
+++ b/applications/solvers/Lagrangian/reactingParcelFoam/Make/files
@@ -0,0 +1,3 @@
+reactingParcelFoam.C
+
+EXE = $(FOAM_USER_APPBIN)/reactingParcelFoam
diff --git a/applications/solvers/Lagrangian/reactingParcelFoam/Make/options b/applications/solvers/Lagrangian/reactingParcelFoam/Make/options
new file mode 100644
index 0000000000..21575a94ae
--- /dev/null
+++ b/applications/solvers/Lagrangian/reactingParcelFoam/Make/options
@@ -0,0 +1,40 @@
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
+    -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
+    -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/solids/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/solidMixture/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
+    -I$(LIB_SRC)/ODE/lnInclude
+
+EXE_LIBS = \
+    -L$(FOAM_USER_LIBBIN) \
+    -lfiniteVolume \
+    -lmeshTools \
+    -lcompressibleRASModels \
+    -lcompressibleLESModels \
+    -llagrangian \
+    -llagrangianIntermediate \
+    -lcoalCombustion\
+    -lspecie \
+    -lbasicThermophysicalModels \
+    -lliquids \
+    -lliquidMixture \
+    -lsolids \
+    -lsolidMixture \
+    -lthermophysicalFunctions \
+    -lcombustionThermophysicalModels \
+    -lchemistryModel \
+    -lradiation \
+    -lODE
diff --git a/applications/solvers/Lagrangian/reactingParcelFoam/UEqn.H b/applications/solvers/Lagrangian/reactingParcelFoam/UEqn.H
new file mode 100644
index 0000000000..ce4292dec9
--- /dev/null
+++ b/applications/solvers/Lagrangian/reactingParcelFoam/UEqn.H
@@ -0,0 +1,16 @@
+    fvVectorMatrix UEqn
+    (
+        fvm::ddt(rho, U)
+      + fvm::div(phi, U)
+      + turbulence->divDevRhoReff(U)
+     ==
+        rho.dimensionedInternalField()*g
+      + reactingParcels.SU1()
+    );
+
+    UEqn.relax();
+
+    if (momentumPredictor)
+    {
+        solve(UEqn == -fvc::grad(p));
+    }
diff --git a/applications/solvers/Lagrangian/reactingParcelFoam/YEqn.H b/applications/solvers/Lagrangian/reactingParcelFoam/YEqn.H
new file mode 100644
index 0000000000..d7dd43e6d7
--- /dev/null
+++ b/applications/solvers/Lagrangian/reactingParcelFoam/YEqn.H
@@ -0,0 +1,45 @@
+
+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)
+              ==
+                reactingParcels.Srho1(i)
+              + kappa*chemistry.RR(i)().dimensionedInternalField()
+            );
+
+            Yi.max(0.0);
+            Yt += Yi;
+        }
+        else
+        {
+            inertIndex = i;
+        }
+    }
+
+    Y[inertIndex] = scalar(1) - Yt;
+    Y[inertIndex].max(0.0);
+
+}
diff --git a/applications/solvers/Lagrangian/reactingParcelFoam/additionalOutput.H b/applications/solvers/Lagrangian/reactingParcelFoam/additionalOutput.H
new file mode 100644
index 0000000000..9edd35eb7c
--- /dev/null
+++ b/applications/solvers/Lagrangian/reactingParcelFoam/additionalOutput.H
@@ -0,0 +1,48 @@
+{
+    tmp<volScalarField> tdQ
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "dQ",
+                runTime.timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::AUTO_WRITE
+            ),
+            mesh,
+            dimensionedScalar
+            (
+                "zero",
+                dimensionSet(1, -3, -1, 0, 0, 0, 0),
+                0.0
+            )
+        )
+    );
+
+    scalarField& dQ = tdQ();
+
+    scalarField cp(dQ.size(), 0.0);
+
+    forAll(Y, i)
+    {
+        volScalarField RRi = chemistry.RR(i);
+
+        forAll(h, celli)
+        {
+            scalar Ti = T[celli];
+            cp[celli] += Y[i][celli]*chemistry.specieThermo()[i].Cp(Ti);
+            scalar hi = chemistry.specieThermo()[i].h(Ti);
+            scalar RR = RRi[celli];
+            dQ[celli] -= hi*RR;
+        }
+    }
+
+    forAll(dQ, celli)
+    {
+        dQ[celli] /= cp[celli];
+    }
+
+    tdQ().write();
+}
diff --git a/applications/solvers/Lagrangian/reactingParcelFoam/chemistry.H b/applications/solvers/Lagrangian/reactingParcelFoam/chemistry.H
new file mode 100644
index 0000000000..07b1e9953b
--- /dev/null
+++ b/applications/solvers/Lagrangian/reactingParcelFoam/chemistry.H
@@ -0,0 +1,25 @@
+{
+    Info << "Solving chemistry" << endl;
+
+    chemistry.solve
+    (
+        runTime.value() - runTime.deltaT().value(),
+        runTime.deltaT().value()
+    );
+
+    // turbulent time scale
+    if (turbulentReaction)
+    {
+        DimensionedField<scalar, volMesh> tk =
+            Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon());
+        DimensionedField<scalar, volMesh> tc =
+            chemistry.tc()().dimensionedInternalField();
+
+        // Chalmers PaSR model
+        kappa = (runTime.deltaT() + tc)/(runTime.deltaT() + tc + tk);
+    }
+    else
+    {
+        kappa = 1.0;
+    }
+}
diff --git a/applications/solvers/Lagrangian/reactingParcelFoam/createClouds.H b/applications/solvers/Lagrangian/reactingParcelFoam/createClouds.H
new file mode 100644
index 0000000000..238ee3b18b
--- /dev/null
+++ b/applications/solvers/Lagrangian/reactingParcelFoam/createClouds.H
@@ -0,0 +1,42 @@
+Info<< "\nConstructing interpolation" << endl;
+
+Info << "\nConstructing gas properties" << endl;
+/*
+PtrList<specieConstProperties> gasProperties(Y.size());
+forAll(gasProperties, i)
+{
+    gasProperties.set
+    (
+        i,
+        new specieConstProperties
+        (
+            dynamic_cast<const multiComponentMixture<constTransport<
+                specieThermo<hConstThermo<perfectGas> > > >&>
+                (thermo()).speciesData()[i]
+        )
+    );
+}
+*/
+PtrList<specieReactingProperties> gasProperties(Y.size());
+forAll(gasProperties, i)
+{
+    gasProperties.set
+    (
+        i,
+        new specieReactingProperties
+        (
+            dynamic_cast<const reactingMixture&>(thermo()).speciesData()[i]
+        )
+    );
+}
+
+Info<< "\nConstructing reacting cloud" << endl;
+basicReactingCloud reactingParcels
+(
+    "reactingCloud1",
+    rho,
+    U,
+    g,
+    thermo(),
+    gasProperties
+);
diff --git a/applications/solvers/Lagrangian/reactingParcelFoam/createFields.H b/applications/solvers/Lagrangian/reactingParcelFoam/createFields.H
new file mode 100644
index 0000000000..079a4f2e1d
--- /dev/null
+++ b/applications/solvers/Lagrangian/reactingParcelFoam/createFields.H
@@ -0,0 +1,141 @@
+    Info<< "Reading thermophysical properties\n" << endl;
+
+    autoPtr<hCombustionThermo> thermo
+    (
+        hCombustionThermo::New(mesh)
+    );
+
+    combustionMixture& composition = thermo->composition();
+    PtrList<volScalarField>& Y = composition.Y();
+
+    word inertSpecie(thermo->lookup("inertSpecie"));
+
+    volScalarField& p = thermo->p();
+    volScalarField& h = thermo->h();
+    const volScalarField& T = thermo->T();
+    const volScalarField& psi = thermo->psi();
+
+    volScalarField rho
+    (
+        IOobject
+        (
+            "rho",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        thermo->rho()
+    );
+
+// lagrangian coal density field
+/*    volScalarField rholc
+    (
+        IOobject
+        (
+            "rholc",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh,
+        dimensionedScalar("zero", dimensionSet(1, -3, 0, 0, 0, 0, 0), 0.0)
+    );
+
+// lagrangian limestone density field
+    volScalarField rhols
+    (
+        IOobject
+        (
+            "rhols",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh,
+        dimensionedScalar("zero", dimensionSet(1, -3, 0, 0, 0, 0, 0), 0.0)
+    );
+
+// lagrangian total density field
+    volScalarField rhol
+    (
+        IOobject
+        (
+            "rhol",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh,
+        dimensionedScalar("zero", dimensionSet(1, -3, 0, 0, 0, 0, 0), 0.0)
+    );*/
+
+    Info<< "\nReading field U\n" << endl;
+    volVectorField U
+    (
+        IOobject
+        (
+            "U",
+            runTime.timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh
+    );
+
+#   include "compressibleCreatePhi.H"
+
+    DimensionedField<scalar, volMesh> kappa
+    (
+        IOobject
+        (
+            "kappa",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh,
+        dimensionedScalar("zero", dimless, 0.0)
+    );
+
+    Info<< "Creating turbulence model\n" << endl;
+    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);
+
+    Info << "Constructing chemical mechanism" << endl;
+    chemistryModel chemistry
+    (
+        thermo(),
+        rho
+    );
+
+    multivariateSurfaceInterpolationScheme<scalar>::fieldTable fields;
+
+    forAll (Y, i)
+    {
+        fields.add(Y[i]);
+    }
+    fields.add(h);
+
+    Info<< "Creating radiation model\n" << endl;
+    autoPtr<radiation::radiationModel> radiation
+    (
+        radiation::radiationModel::New(T)
+    );
diff --git a/applications/solvers/Lagrangian/reactingParcelFoam/hEqn.H b/applications/solvers/Lagrangian/reactingParcelFoam/hEqn.H
new file mode 100644
index 0000000000..e4fc046097
--- /dev/null
+++ b/applications/solvers/Lagrangian/reactingParcelFoam/hEqn.H
@@ -0,0 +1,20 @@
+{
+    fvScalarMatrix hEqn
+    (
+        fvm::ddt(rho, h)
+      + fvm::div(phi, h)
+      - fvm::laplacian(turbulence->alphaEff(), h)
+     ==
+        DpDt
+     +  reactingParcels.Sh1()
+     +  radiation->Sh(thermo())
+    );
+
+    hEqn.relax();
+
+    hEqn.solve();
+
+    thermo->correct();
+
+    radiation->correct();
+}
diff --git a/applications/solvers/Lagrangian/reactingParcelFoam/pEqn.H b/applications/solvers/Lagrangian/reactingParcelFoam/pEqn.H
new file mode 100644
index 0000000000..5516afe515
--- /dev/null
+++ b/applications/solvers/Lagrangian/reactingParcelFoam/pEqn.H
@@ -0,0 +1,72 @@
+rho = thermo->rho();
+
+volScalarField rUA = 1.0/UEqn.A();
+U = rUA*UEqn.H();
+
+if (transonic)
+{
+    surfaceScalarField phid
+    (
+        "phid",
+        fvc::interpolate(thermo->psi())
+       *(
+            (fvc::interpolate(U) & mesh.Sf())
+          + fvc::ddtPhiCorr(rUA, rho, U, phi)
+        )
+    );
+
+    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    {
+        fvScalarMatrix pEqn
+        (
+            fvm::ddt(psi, p)
+          + fvm::div(phid, p)
+          - fvm::laplacian(rho*rUA, p)
+         ==
+            reactingParcels.Srho1()
+        );
+
+        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
+        (
+            fvm::ddt(psi, p)
+          + fvc::div(phi)
+          - fvm::laplacian(rho*rUA, p)
+         ==
+            reactingParcels.Srho1()
+        );
+
+        pEqn.solve();
+
+        if (nonOrth == nNonOrthCorr)
+        {
+            phi += pEqn.flux();
+        }
+    }
+}
+
+#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/Lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/Lagrangian/reactingParcelFoam/reactingParcelFoam.C
new file mode 100644
index 0000000000..122f7dffb7
--- /dev/null
+++ b/applications/solvers/Lagrangian/reactingParcelFoam/reactingParcelFoam.C
@@ -0,0 +1,120 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2007 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
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#include "fvCFD.H"
+#include "hCombustionThermo.H"
+#include "turbulenceModel.H"
+#include "basicThermoCloud.H"
+#include "basicReactingCloud.H"
+#include "chemistryModel.H"
+#include "chemistrySolver.H"
+#include "ReactingCloudThermoTypes.H"
+#include "radiationModel.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 "createClouds.H"
+#   include "readPISOControls.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;
+
+        Info << "Evolving reacting cloud" << endl;
+
+        reactingParcels.evolve();
+
+        reactingParcels.info();
+
+#       include "chemistry.H"
+#       include "rhoEqn.H"
+
+        // --- PIMPLE loop
+        for (int ocorr=1; ocorr<=nOuterCorr; ocorr++)
+        {
+#           include "UEqn.H"
+#           include "YEqn.H"
+
+            // --- PISO loop
+            for (int corr=1; corr<=nCorr; corr++)
+            {
+#               include "hEqn.H"
+#               include "pEqn.H"
+            }
+
+            Info<< "T gas min/max   = " << min(T).value() << ", "
+                << max(T).value() << endl;
+        }
+
+        turbulence->correct();
+
+        rho = thermo->rho();
+
+        if (runTime.write())
+        {
+#           include "additionalOutput.H"
+        }
+
+        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
+            << nl << endl;
+    }
+
+    Info<< "End\n" << endl;
+
+    return(0);
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/Lagrangian/reactingParcelFoam/readChemistryProperties.H b/applications/solvers/Lagrangian/reactingParcelFoam/readChemistryProperties.H
new file mode 100644
index 0000000000..1a60e6fb34
--- /dev/null
+++ b/applications/solvers/Lagrangian/reactingParcelFoam/readChemistryProperties.H
@@ -0,0 +1,22 @@
+Info<< "Reading chemistry properties\n" << endl;
+
+IOdictionary chemistryProperties
+(
+    IOobject
+    (
+        "chemistryProperties",
+        runTime.constant(),
+        mesh,
+        IOobject::MUST_READ,
+        IOobject::NO_WRITE
+    )
+);
+
+Switch turbulentReaction(chemistryProperties.lookup("turbulentReaction"));
+
+dimensionedScalar Cmix("Cmix", dimless, 1.0);
+
+if (turbulentReaction)
+{
+    chemistryProperties.lookup("Cmix") >> Cmix;
+}
diff --git a/applications/solvers/Lagrangian/reactingParcelFoam/rhoEqn.H b/applications/solvers/Lagrangian/reactingParcelFoam/rhoEqn.H
new file mode 100644
index 0000000000..d6b129452e
--- /dev/null
+++ b/applications/solvers/Lagrangian/reactingParcelFoam/rhoEqn.H
@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2007 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
+
+Global
+    rhoEqn
+
+Description
+    Solve the continuity for density.
+
+\*---------------------------------------------------------------------------*/
+
+{
+    solve
+    (
+        fvm::ddt(rho)
+      + fvc::div(phi)
+      ==
+        reactingParcels.Srho1()
+    );
+}
+
+// ************************************************************************* //

From 1cdbeb29d76fd334934a28486cd1564f552926e1 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Wed, 6 May 2009 15:56:29 +0200
Subject: [PATCH 091/175] minor tweak to wmake

- place wmkdep and dirToString executables under
  utilbin/$(WM_ARCH)$(WM_COMPILER).
  This helps somewhat when copying rules about, and might help when creating
  general rules.
---
 wmake/Makefile                   | 10 +++++++---
 wmake/MakefileApps               |  2 +-
 wmake/MakefileFiles              |  2 +-
 wmake/MakefileOptions            |  4 ++--
 wmake/makeWmake                  |  2 +-
 wmake/rules/General/mplibOPENMPI |  3 +++
 wmake/rules/General/sourceToDep  |  2 +-
 wmake/rules/linux64Gcc/X         |  4 ++--
 wmake/scripts/addCompile         |  2 +-
 wmake/scripts/makeFiles          | 30 +++++++++++++++---------------
 wmake/scripts/makeOptions        |  2 +-
 wmake/scripts/mkObjectDir        |  2 +-
 wmake/src/Makefile               | 22 +++++++++++++---------
 wmake/src/dirToString.c          | 12 ++++++------
 wmake/src/wmkdep.l               |  4 ++--
 wmake/wmkdir                     | 15 +++++++++------
 16 files changed, 66 insertions(+), 52 deletions(-)
 create mode 100644 wmake/rules/General/mplibOPENMPI

diff --git a/wmake/Makefile b/wmake/Makefile
index cd1d1f0e43..02c573a265 100644
--- a/wmake/Makefile
+++ b/wmake/Makefile
@@ -4,7 +4,7 @@
 #  \\    /   O peration     |
 #   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
 #    \\/     M anipulation  |
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM.
 #
@@ -65,7 +65,10 @@ SYS_LIBS           =
 
 PROJECT_INC        = -I$(LIB_SRC)/$(WM_PROJECT)/lnInclude -I$(LIB_SRC)/OSspecific/$(WM_OS)/lnInclude
 PROJECT_LIBS       = -l$(WM_PROJECT)
-PROJECT_VERSION    = $(shell printf -- "-DPROJECT_VERSION=%d%03d%03d" $$(echo $(WM_PROJECT_VERSION) | sed -e 's/\./ /g'))
+##
+## unused:
+## PROJECT_VERSION    = $(shell printf -- "-DPROJECT_VERSION=%d%03d%03d" $$(echo $(WM_PROJECT_VERSION) | sed -e 's/\./ /g'))
+##
 
 EXE_INC            =
 EXE_LIBS           =
@@ -103,6 +106,7 @@ SEXE            = a.out
 
 GENERAL_RULES = $(WM_DIR)/rules/General
 RULES         = $(WM_DIR)/rules/$(WM_ARCH)$(WM_COMPILER)
+UTILBIN       = $(WM_DIR)/utilbin/$(WM_ARCH)$(WM_COMPILER)
 
 include $(GENERAL_RULES)/general
 include $(RULES)/general
@@ -197,7 +201,7 @@ $(LIB).jar: $(OBJECTS)
 #------------------------------------------------------------------------------
 
 lnInclude/uptodate: $(MAKE_DIR)/files $(MAKE_DIR)/options
-	     @rm -rf lnInclude ; wmakeLnInclude `pwd` ; touch lnInclude/uptodate
+	     @rm -rf lnInclude ; wmakeLnInclude . ; touch lnInclude/uptodate
 
 
 #------------------------------------------------------------------------------
diff --git a/wmake/MakefileApps b/wmake/MakefileApps
index 607925d779..56c089c853 100644
--- a/wmake/MakefileApps
+++ b/wmake/MakefileApps
@@ -4,7 +4,7 @@
 #  \\    /   O peration     |
 #   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
 #    \\/     M anipulation  |
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM.
 #
diff --git a/wmake/MakefileFiles b/wmake/MakefileFiles
index 9c95ed320f..4c2ef52826 100644
--- a/wmake/MakefileFiles
+++ b/wmake/MakefileFiles
@@ -4,7 +4,7 @@
 #  \\    /   O peration     |
 #   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
 #    \\/     M anipulation  |
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM.
 #
diff --git a/wmake/MakefileOptions b/wmake/MakefileOptions
index 06bfccd123..92834a9a65 100644
--- a/wmake/MakefileOptions
+++ b/wmake/MakefileOptions
@@ -4,7 +4,7 @@
 #  \\    /   O peration     |
 #   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
 #    \\/     M anipulation  |
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM.
 #
@@ -43,7 +43,7 @@ include $(RULES)/general
 OPTIONS = $(WM_OPTIONS)/options
 
 #------------------------------------------------------------------------------
-# Declare dependecy of all make system files on FILE
+# Declare dependency of all make system files on FILE
 # Causes all derived files to be remade if any are changed or missing
 #------------------------------------------------------------------------------
 
diff --git a/wmake/makeWmake b/wmake/makeWmake
index 659e1ba377..30a6565095 100755
--- a/wmake/makeWmake
+++ b/wmake/makeWmake
@@ -5,7 +5,7 @@
 #  \\    /   O peration     |
 #   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
 #    \\/     M anipulation  |
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM.
 #
diff --git a/wmake/rules/General/mplibOPENMPI b/wmake/rules/General/mplibOPENMPI
new file mode 100644
index 0000000000..834d2d3e22
--- /dev/null
+++ b/wmake/rules/General/mplibOPENMPI
@@ -0,0 +1,3 @@
+PFLAGS     = -DOMPI_SKIP_MPICXX
+PINC       = -I$(MPI_ARCH_PATH)/include
+PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/General/sourceToDep b/wmake/rules/General/sourceToDep
index 21332f95fb..9935761405 100644
--- a/wmake/rules/General/sourceToDep
+++ b/wmake/rules/General/sourceToDep
@@ -1,6 +1,6 @@
 .SUFFIXES: .c .cc .cxx .cpp .C .java .F .f .dep
 
-MKDEP       = $(RULES)/wmkdep -I$(*D) $(LIB_HEADER_DIRS)
+MKDEP       = $(UTILBIN)/wmkdep -I$(*D) $(LIB_HEADER_DIRS)
 
 .c.dep:
 	$(MAKE_DEP)
diff --git a/wmake/rules/linux64Gcc/X b/wmake/rules/linux64Gcc/X
index 5d1f9c5cc5..47480abd22 100644
--- a/wmake/rules/linux64Gcc/X
+++ b/wmake/rules/linux64Gcc/X
@@ -1,3 +1,3 @@
 XFLAGS     =
-XINC       = $(XFLAGS) -I/usr/X11R6/include
-XLIBS      = -L/usr/X11R6/lib64 -lXext -lX11
+XINC       = $(XFLAGS) -I/usr/include/X11
+XLIBS      = -L/usr/lib64 -lXext -lX11
diff --git a/wmake/scripts/addCompile b/wmake/scripts/addCompile
index f0963d0b14..802768241b 100755
--- a/wmake/scripts/addCompile
+++ b/wmake/scripts/addCompile
@@ -5,7 +5,7 @@
 #  \\    /   O peration     |
 #   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
 #    \\/     M anipulation  |
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM.
 #
diff --git a/wmake/scripts/makeFiles b/wmake/scripts/makeFiles
index e3ed702939..3ccc3fa221 100755
--- a/wmake/scripts/makeFiles
+++ b/wmake/scripts/makeFiles
@@ -5,7 +5,7 @@
 #  \\    /   O peration     |
 #   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
 #    \\/     M anipulation  |
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM.
 #
@@ -35,11 +35,11 @@
 
 if [ -r Make/files ]
 then
-   echo "makeFiles: Make/files already exists, exiting"
-   exit 1
+    echo "makeFiles: Make/files already exists, exiting"
+    exit 1
 fi
 
-rulesPath=$WM_DIR/rules/$WM_ARCH$WM_COMPILER
+utilbin=$WM_DIR/utilbin/$WM_ARCH$WM_COMPILER
 
 [ -d Make ] || mkdir Make
 rm -f Make/files
@@ -48,16 +48,16 @@ dirs=`find . -name "*" -type d -print`
 
 for dir in $dirs
 do
-   if [ $dir != . ]
-   then
-      baseDirName=`echo $dir | sed 's%^\./%%' | $rulesPath/dirToString`
-      baseDir=`echo $dir | sed 's%^\./%%'`
+    if [ $dir != . ]
+    then
+        baseDir=`echo $dir | sed 's%^\./%%'`
+        baseDirName=`echo $baseDir | $utilbin/dirToString`
 
-      if [ $baseDirName != Make ]
-      then
-         echo $baseDirName " = " $baseDir >> Make/files
-      fi
-   fi
+        if [ $baseDirName != Make ]
+        then
+            echo $baseDirName " = " $baseDir >> Make/files
+        fi
+    fi
 done
 
 echo >> Make/files
@@ -66,12 +66,12 @@ files=`find . -name "*.[cCylfF]" -type f  -print`
 
 for file in $files
 do
-    pathName=`echo ${file%/*} | sed 's%^\.%%' | sed 's%^/%%' | $rulesPath/dirToString`
+    pathName=`echo ${file%/*} | sed 's%^\.%%' | sed 's%^/%%' | $utilbin/dirToString`
     fileName=`echo ${file##*/}`
 
     if [ "$pathName" != "" ]
     then
-        echo '$('$pathName")/"$fileName >> Make/files
+        echo '$('$pathName')/'$fileName >> Make/files
     else
         echo $fileName >> Make/files
     fi
diff --git a/wmake/scripts/makeOptions b/wmake/scripts/makeOptions
index 3a8d706b82..47c9f0c271 100755
--- a/wmake/scripts/makeOptions
+++ b/wmake/scripts/makeOptions
@@ -5,7 +5,7 @@
 #  \\    /   O peration     |
 #   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
 #    \\/     M anipulation  |
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM.
 #
diff --git a/wmake/scripts/mkObjectDir b/wmake/scripts/mkObjectDir
index db4762ecf1..3008303ae3 100755
--- a/wmake/scripts/mkObjectDir
+++ b/wmake/scripts/mkObjectDir
@@ -5,7 +5,7 @@
 #  \\    /   O peration     |
 #   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
 #    \\/     M anipulation  |
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM.
 #
diff --git a/wmake/src/Makefile b/wmake/src/Makefile
index 11900fd6a0..daa1e56c6b 100644
--- a/wmake/src/Makefile
+++ b/wmake/src/Makefile
@@ -4,7 +4,7 @@
 #  \\    /   O peration     |
 #   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
 #    \\/     M anipulation  |
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM.
 #
@@ -43,26 +43,30 @@ SHELL      = /bin/sh
 .SUFFIXES:
 .SUFFIXES: .o
 
-RULES_DIR = $(WM_DIR)/rules/$(WM_ARCH)$(WM_COMPILER)
+UTILBIN = $(WM_DIR)/utilbin/$(WM_ARCH)$(WM_COMPILER)
 
-all:  $(RULES_DIR)/dirToString $(RULES_DIR)/wmkdep
+all:  $(UTILBIN)/dirToString $(UTILBIN)/wmkdep
 
 clean:
-	rm -f $(RULES_DIR)/dirToString $(RULES_DIR)/wmkdep 2>/dev/null
+	rm -f $(UTILBIN)/dirToString $(UTILBIN)/wmkdep 2>/dev/null
 
 
-$(RULES_DIR)/dirToString: dirToString.c
-	$(cc) $(cFLAGS) dirToString.c -o $(RULES_DIR)/dirToString
+$(UTILBIN)/dirToString: dirToString.c
+	@mkdir -p $(UTILBIN)
+	$(cc) $(cFLAGS) dirToString.c -o $(UTILBIN)/dirToString
+
+$(UTILBIN)/wmkdep: wmkdep.l
+	@mkdir -p $(UTILBIN)
+	flex wmkdep.l
+	$(cc) $(cFLAGS) lex.yy.c -o $(UTILBIN)/wmkdep
 
-$(RULES_DIR)/wmkdep: wmkdep.l
-	flex wmkdep.l ; $(cc) $(cFLAGS) lex.yy.c -o $(RULES_DIR)/wmkdep
 
 #------------------------------------------------------------------------------
 # set compilation and dependency building rules
 #------------------------------------------------------------------------------
 
 GENERAL_RULES = $(WM_DIR)/rules/General
-RULES         = $(RULES_DIR)
+RULES         = $(WM_DIR)/rules/$(WM_ARCH)$(WM_COMPILER)
 
 include $(RULES)/general
 include $(RULES)/$(WM_LINK_LANGUAGE)
diff --git a/wmake/src/dirToString.c b/wmake/src/dirToString.c
index e7ba1f1505..1116214530 100644
--- a/wmake/src/dirToString.c
+++ b/wmake/src/dirToString.c
@@ -33,11 +33,11 @@ Usage
     echo dirName | dirToString
 
     e.g.
-        using csh
-        set baseDirName=`echo $dir | sed 's%^\./%%' | $rulesPath/dirToString`
+        using sh
+        baseDirName=`echo $dir | sed 's%^\./%%' | $utilbin/dirToString`
 
-        using ksh
-        baseDirName=`echo $dir | sed 's%^\./%%' | $rulesPath/dirToString`
+        using csh
+        set baseDirName=`echo $dir | sed 's%^\./%%' | $utilbin/dirToString`
 
 \*----------------------------------------------------------------------------*/
 
@@ -49,7 +49,7 @@ int main()
 {
     int c;
     int nextupper = 0;
-    
+
     while ((c=getchar()) != EOF)
     {
         if (c == '/')
@@ -66,7 +66,7 @@ int main()
             {
                 putchar(c);
             }
-            
+
             nextupper = 0;
         }
     }
diff --git a/wmake/src/wmkdep.l b/wmake/src/wmkdep.l
index 7f79bb3ea2..43eb4899b7 100644
--- a/wmake/src/wmkdep.l
+++ b/wmake/src/wmkdep.l
@@ -36,7 +36,7 @@ Description
     only once.  This is why this program is faster than cpp.
 
 Usage
-    wmkdep [ -Idirectory ... -Idirectory] filename
+    wmkdep [ -Idirectory ... -Idirectory ] filename
 
 \*---------------------------------------------------------------------------*/
 
@@ -107,7 +107,7 @@ int main(int argc, char* argv[])
 
     sourceFile = (char*)malloc(strlen(argv[argc-1]) + 1);
     strcpy(sourceFile, argv[argc-1]);
-    fprintf(stderr,"Making dependency list for source file %s\n", sourceFile);
+    fprintf(stderr, "Making dependency list for source file %s\n", sourceFile);
 
 
     /* Get list of -I directories. */
diff --git a/wmake/wmkdir b/wmake/wmkdir
index 441eedb52d..e9703d2733 100755
--- a/wmake/wmkdir
+++ b/wmake/wmkdir
@@ -27,21 +27,24 @@
 #     wmkdir
 #
 # Description
-#     Script to make a directory that does not already exist
-#     Usage : wmkdir <dir>
+#     Script to make directories that do not already exist
+#     Usage : wmkdir <dir> [.. <dirN>]
 #
 #------------------------------------------------------------------------------
 
-if [ $# -eq 1 ]
+if [ $# -ge 1 ]
 then
     # provide help
     if [ "$1" = "-h" -o "$1" = "-help" ]
     then
-        echo "usage: ${0##*/} <dir>"
-        echo "       mkdir if directory does not already exist"
+        echo "usage: ${0##*/} <dir> [.. <dirN>]"
+        echo "       mkdir if directories do not already exist"
         echo
     else
-        [ -d "$1" ] || mkdir -p "$1"
+        for dir
+        do
+            [ -d "$dir" ] || mkdir -p "$dir"
+        done
     fi
 fi
 

From d2a78f7e9657ea4880cded1987a5db21ae8b50f6 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Thu, 7 May 2009 10:37:55 +0200
Subject: [PATCH 092/175] finally drop references to ~/.OpenFOAM-<ver> (use
 ~/.OpenFOAM/<ver>)

---
 bin/foamExec       | 109 ++++++++++++++++++++-------------------------
 tutorials/Allclean |   2 +-
 tutorials/Allrun   |  13 +++---
 tutorials/Alltest  |  78 ++++++++++++++++++--------------
 4 files changed, 103 insertions(+), 99 deletions(-)

diff --git a/bin/foamExec b/bin/foamExec
index 48a6d5872f..998bbd0643 100755
--- a/bin/foamExec
+++ b/bin/foamExec
@@ -38,8 +38,8 @@
 #
 #------------------------------------------------------------------------------
 usage() {
-   while [ "$#" -ge 1 ]; do echo "$1"; shift; done
-   cat<<USAGE
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat<<USAGE
 
 usage: ${0##*/} [OPTION] <application> ...
 
@@ -50,16 +50,17 @@ options:
 * run a particular OpenFOAM version of <application>
 
 USAGE
-   exit 1
+    exit 1
 }
 
+
 # This script should exist in <foamInstall>/OpenFOAM-<VERSION>/bin/
 # extract the <foamInstall> and <version> elements
 # using a function preserves the command args
 getDefaults() {
-   set -- $(echo $0 | sed -e 's@/OpenFOAM-\([^/]*\)/bin/[^/]*$@ \1@')
-   foamInstall=$1
-   version=$2
+    set -- $(echo $0 | sed -e 's@/OpenFOAM-\([^/]*\)/bin/[^/]*$@ \1@')
+    foamInstall=$1
+    version=$2
 }
 
 getDefaults
@@ -67,72 +68,60 @@ getDefaults
 # parse options
 while [ "$#" -gt 0 ]
 do
-   case "$1" in
-   -h | -help)
-      usage
-      ;;
-   -v)
-      shift
-      version=$1
-      shift
-      ;;
-   --)
-      shift
-      break
-      ;;
-   -*)
-      usage "invalid option '$1'"
-      ;;
-   *)
-      break
-      ;;
-   esac
+    case "$1" in
+    -h | -help)
+        usage
+        ;;
+    -v)
+        shift
+        version=$1
+        shift
+        ;;
+    --)
+        shift
+        break
+        ;;
+    -*)
+        usage "invalid option '$1'"
+        ;;
+    *)
+        break
+        ;;
+    esac
 done
 
-if [ "$#" -lt 1 ]; then
-   usage "no application specified"
+if [ "$#" -lt 1 ]
+then
+    usage "no application specified"
 fi
 
 unset foamDotFile
 
 # Check user-specific OpenFOAM bashrc file
-for subDir in \
-   $HOME/.OpenFOAM-$version \
-   $HOME/.OpenFOAM/$version \
-;
-do
-   foamDotFile="$subDir/bashrc"
-   if [ -f $foamDotFile ]; then
-      . $foamDotFile
-      foamDotFile=okay
-      break
-   fi
-done
-
-# Use the FOAM_INST_DIR variable for locating the installed version
-if [ "$foamDotFile" != okay ]
+foamDotFile="$HOME/.OpenFOAM/$version/bashrc"
+if [ -f $foamDotFile ]
 then
-   for FOAM_INST_DIR in $foamInstall $WM_PROJECT_INST_DIR
-   do
-      for subDir in \
-         OpenFOAM-$version/etc \
-         OpenFOAM-$version/.OpenFOAM-$version \
-      ;
-      do
-        foamDotFile="$FOAM_INST_DIR/$subDir/bashrc"
-        if [ -f $foamDotFile ]; then
-           . $foamDotFile
-           foamDotFile=okay
-           break 2
+    . $foamDotFile
+    foamDotFile=okay
+else
+    # Use the FOAM_INST_DIR variable for locating the installed version
+    for FOAM_INST_DIR in $foamInstall $WM_PROJECT_INST_DIR
+    do
+        foamDotFile="$FOAM_INST_DIR/OpenFOAM-$version/etc/bashrc"
+        if [ -f $foamDotFile ]
+        then
+            . $foamDotFile
+            foamDotFile=okay
+            break
         fi
-     done
-   done
+    done
 fi
 
-if [ "$foamDotFile" != okay ];
+
+if [ "$foamDotFile" != okay ]
 then
-   echo "Error : bashrc file could not be found for OpenFOAM-$version" 1>&2
-   exit 1
+    echo "Error : bashrc file could not be found for OpenFOAM-$version" 1>&2
+    exit 1
 fi
 
 # Pass on the rest of the arguments
diff --git a/tutorials/Allclean b/tutorials/Allclean
index f3d601c48d..57f63c776c 100755
--- a/tutorials/Allclean
+++ b/tutorials/Allclean
@@ -36,7 +36,7 @@ echo "--------"
 echo "Cleaning tutorials ..."
 echo "Removing backup files"
 find . -type f \( -name "*~" -o -name "*.bak" \) -exec rm {} \;
-find . \( -name 'core' -o -name 'core.[1-9]*' \) -exec rm {} \;
+find . \( -name core -o -name 'core.[1-9]*' \) -exec rm {} \;
 find . \( -name '*.pvs' -o -name '*.OpenFOAM' \) -exec rm {} \;
 rm logs testLoopReport > /dev/null 2>&1
 
diff --git a/tutorials/Allrun b/tutorials/Allrun
index d06a98cca0..bfc2241656 100755
--- a/tutorials/Allrun
+++ b/tutorials/Allrun
@@ -48,15 +48,19 @@ logReport () {
     UzSS=`grep -E "Uz[:| ]*solution singularity" $1`
     completed=`grep -E "^[\t ]*[eE]nd" $1`
 
-    if [ "$fatalError" ] ; then
+    if [ "$fatalError" ]
+    then
         echo "$appAndCase: ** FOAM FATAL ERROR **"
         return
-    elif [ "$UxSS" -a "$UySS" -a "$UzSS" ] ; then
+    elif [ "$UxSS" -a "$UySS" -a "$UzSS" ]
+    then
         echo "$appAndCase: ** Solution singularity **"
         return
-    elif [ "$completed" ] ; then
+    elif [ "$completed" ]
+    then
         completionTime=`tail -10 $log | grep Execution | cut -d= -f2 | sed 's/^[ \t]*//'`
-        if [ "$completionTime" ] ; then
+        if [ "$completionTime" ]
+        then
             completionTime="in $completionTime"
         fi
         echo "$appAndCase: completed $completionTime"
@@ -90,5 +94,4 @@ done
 
 find . -name "log.*" -exec cat {} \; >> logs
 
-
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/Alltest b/tutorials/Alltest
index 4e0107fdcc..69eb8b9a28 100755
--- a/tutorials/Alltest
+++ b/tutorials/Alltest
@@ -27,25 +27,30 @@
 #     Alltest
 #
 # Description
+#     quickly tests the tutorials and writes out the scheme/solver information
 #
 #------------------------------------------------------------------------------
 
 cd ${0%/*} || exit 1    # run from this directory
 
-# FUNCTIONS
-#
-printUsage () {
-cat <<EOF
-Usage: $0
-Quickly tests the tutorials and writes out the scheme/solver information
+usage() {
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat<<USAGE
 
-Options are:
--d         sets up a default scheme on all schemes
--h         help
-EOF
+usage: $0 [OPTION]
+
+options:
+  -d            sets up a default scheme on all schemes
+  -h            this usage
+
+* quickly tests the tutorials and writes out the scheme/solver information
+
+USAGE
+    exit 1
 }
 
-setDefaultFvSchemes () {
+
+setDefaultFvSchemes() {
 cat<<EOF
 gradSchemes { default Gauss linear; }
 divSchemes
@@ -72,23 +77,27 @@ snGradSchemes { default corrected; }
 fluxRequired { default yes; }
 EOF
 }
+
 #
 # VARIABLE
 #
-MAIN_CONTROL_DICT=
+unset MAIN_CONTROL_DICT
 
 for i in \
-  $HOME/.$WM_PROJECT-$WM_PROJECT_VERSION \
-  $HOME/.$WM_PROJECT/$WM_PROJECT_VERSION \
-  $HOME/.$WM_PROJECT \
-  $WM_PROJECT_DIR/etc \
-  ;
+    $HOME/.$WM_PROJECT/$WM_PROJECT_VERSION \
+    $HOME/.$WM_PROJECT \
+    $WM_PROJECT_DIR/etc \
+    ;
 do
-  if [ -f "$i/controlDict" ]; then
-     MAIN_CONTROL_DICT="$i/controlDict"
-     break
-  fi
+    if [ -f "$i/controlDict" ]
+    then
+        MAIN_CONTROL_DICT="$i/controlDict"
+        break
+    fi
 done
+
+[ -f "$MAIN_CONTROL_DICT" ] || usage "main controlDict not found"
+
 TUTORIALS_DIR=.
 TEST_RUN_DIR=../tutorialsTest
 FV_SCHEMES=\
@@ -110,16 +119,16 @@ DEFAULT_SCHEMES=0
 # OPTIONS
 #
 OPTS=`getopt hd $*`
-if [ $? -ne 0 ] ; then
-    echo "Aborting due to invalid option"
-    printUsage
-    exit 1
+if [ $? -ne 0 ]
+then
+    usage "Aborting due to invalid option"
 fi
 eval set -- "$OPTS"
-while [ $1 != -- ]; do
+while [ $1 != -- ]
+do
     case $1 in
         -d) DEFAULT_SCHEMES=1;;
-        -h) printUsage; exit 1;;
+        -h) usage;;
     esac
     shift
 done
@@ -129,14 +138,15 @@ shift
 # MAIN
 #
 
-if [ -d "$TEST_RUN_DIR" ] ; then
+if [ -d "$TEST_RUN_DIR" ]
+then
     rm -rf $TEST_RUN_DIR
 fi
 
 echo "Modifying ${MAIN_CONTROL_DICT}"
 if [ -e ${MAIN_CONTROL_DICT}.org ]
 then
-    echo "File " ${MAIN_CONTROL_DICT}.org " already exists"
+    echo "File ${MAIN_CONTROL_DICT}.org already exists"
     echo "Did Alltest fail in some way and then run again?"
     exit 1
 fi
@@ -155,20 +165,21 @@ echo "Copying the tutorials"
 cp -a ${TUTORIALS_DIR} ${TEST_RUN_DIR}
 
 echo "Modifying the controlDicts to run only one time step"
-cd ${TEST_RUN_DIR}
+cd ${TEST_RUN_DIR} || exit 1
 
 for CD in `find . -name "controlDict*"`
 do
     mv ${CD} ${CD}.org
     sed \
-   -e s/"\(startFrom[ \t]*\)\([a-zA-Z]*\);"/"\1 latestTime;"/g \
+    -e s/"\(startFrom[ \t]*\)\([a-zA-Z]*\);"/"\1 latestTime;"/g \
     -e s/"\(stopAt[ \t]*\)\([a-zA-Z]*\);"/"\1 nextWrite;"/g \
     -e s/"\(writeControl[ \t]*\)\([a-zA-Z]*\);"/"\1 timeStep;"/g \
     -e s/"\(writeInterval[ \t]*\)\([0-9a-zA-Z.-]*\);"/"\1 1;"/g \
     ${CD}.org > ${CD}
 done
 
-if [ $DEFAULT_SCHEMES = 1 ] ; then
+if [ $DEFAULT_SCHEMES = 1 ]
+then
     echo "Modifying the fvSchemes to contain only default schemes"
     for FV_SC in `find . -name fvSchemes`
     do
@@ -205,7 +216,8 @@ do
             done
         echo `grep solver ${LOG} | cut -d" " -f4` >> $SOLVERS_TEMP
         done
-        if [ -f $SCHEMES_TEMP ] ; then
+        if [ -f $SCHEMES_TEMP ]
+        then
             cat $SCHEMES_TEMP | sort -u >> $SCHEMES_FILE
         fi
     done

From 321e4af9e8c336233f655793f178ea06a09d8d24 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 8 May 2009 11:55:50 +0100
Subject: [PATCH 093/175] constraints for reduced -D cases

---
 .../Templates/KinematicParcel/KinematicParcel.C       | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index 0248e4375d..583f3ed303 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -106,9 +106,6 @@ void Foam::KinematicParcel<ParcelType>::calc
     vector U1 =
         calcVelocity(td, dt, cellI, d0, U0, rho0, mass0, Fx, Cud, dUTrans);
 
-    // Constrain the new velocity for reduced -D cases
-    meshTools::constrainDirection(mesh, mesh.solutionD(), U1);
-
 
     // Accumulate carrier phase source terms
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -144,6 +141,8 @@ const Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
     vector& dUTrans
 ) const
 {
+    const polyMesh& mesh = this->cloud().pMesh();
+
     // Return linearised term from drag model
     Cud = td.cloud().drag().Cu(U - Uc_, d, rhoc_, rho, muc_);
 
@@ -160,6 +159,9 @@ const Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
 
     vector Unew = td.cloud().UIntegrator().integrate(U, dt, ap, bp).value();
 
+    // Apply correction to velocity for reduced-D cases
+    meshTools::constrainDirection(mesh, mesh.solutionD(), Unew);
+
     // Calculate the momentum transfer to the continuous phase
     // - do not include gravity impulse
     dUTrans = -mass*(Unew - U - dt*td.g());
@@ -188,6 +190,9 @@ bool Foam::KinematicParcel<ParcelType>::move(TrackData& td)
 
     while (td.keepParticle && !td.switchProcessor && tEnd > ROOTVSMALL)
     {
+        // Apply correction to position for reduced-D cases
+        meshTools::constrainToMeshCentre(mesh, p.position());
+
         // Set the Lagrangian time-step
         scalar dt = min(dtMax, tEnd);
 

From 1c101ec1a8f6d8bdf1bbf06712d1ac8dc377fee3 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 8 May 2009 13:05:19 +0200
Subject: [PATCH 094/175] bugfix fixedBlended scheme, cosmetics changes

- actually blend correction factors as well in fixedBlended scheme

- consistency change: move 'linearUpwindV' into same directory as
  'linearUpwind', move correction code from .H into .C code.

- minor docu format/spelling changes

A more general question:
~~~~~~~~~~~~~~~~~~~~~~~~
- would it make more sense to use template specializations for the
  '*V' differencing schemes?
---
 src/finiteVolume/Make/files                   |   2 +-
 .../cellLimitedGrad/cellLimitedGrads.C        |   4 +-
 .../cellMDLimitedGrad/cellMDLimitedGrads.C    |   2 +-
 .../limitedSchemes/Limited/Limited.H          |   2 +-
 .../limitedSchemes/Limited01/Limited01.H      |   2 +-
 .../limitedSchemes/QUICK/QUICK.H              |   7 +-
 .../limitedSchemes/QUICK/QUICKV.H             |   5 +-
 .../filteredLinear/filteredLinear.H           |   2 +-
 .../filteredLinear2/filteredLinear2.H         |   2 +-
 .../filteredLinear2/filteredLinear2V.H        |  12 +-
 .../filteredLinear3/filteredLinear3.H         |   4 +-
 .../filteredLinear3/filteredLinear3V.H        |  14 +-
 .../linearUpwind/linearUpwind.H               |   5 +-
 .../linearUpwind/linearUpwindV.C              | 136 ++++++++++++++++++
 .../linearUpwindV.H                           |  94 +-----------
 .../linearUpwindV/linearUpwindV.C             |  39 -----
 .../schemes/UpwindFitScheme/UpwindFitData.H   |   4 +-
 .../schemes/UpwindFitScheme/UpwindFitScheme.H |   2 +-
 .../biLinearFit/biLinearFitPolynomial.H       |   3 +-
 .../cubicUpwindFit/cubicUpwindFitPolynomial.H |   2 +-
 .../schemes/fixedBlended/fixedBlended.H       |  65 ++++++++-
 .../schemes/harmonic/harmonic.H               |   9 +-
 .../schemes/linearFit/linearFitPolynomial.H   |   3 +-
 .../schemes/localMax/localMax.H               |   7 +-
 .../schemes/localMin/localMin.H               |   7 +-
 .../outletStabilised/outletStabilised.H       |  16 ++-
 .../quadraticFit/quadraticFitPolynomial.H     |   2 +-
 .../quadraticLinearFitPolynomial.H            |   2 +-
 .../quadraticLinearUpwindFitPolynomial.H      |   2 +-
 .../quadraticUpwindFitPolynomial.H            |   2 +-
 .../schemes/reverseLinear/reverseLinear.H     |   1 +
 .../schemes/skewCorrected/skewCorrected.H     |   2 +-
 32 files changed, 271 insertions(+), 190 deletions(-)
 create mode 100644 src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwindV.C
 rename src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/{linearUpwindV => linearUpwind}/linearUpwindV.H (58%)
 delete mode 100644 src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwindV/linearUpwindV.C

diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index ddd50de180..54afdb3551 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -206,7 +206,7 @@ $(limitedSchemes)/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationS
 $(limitedSchemes)/upwind/upwind.C
 $(limitedSchemes)/blended/blended.C
 $(limitedSchemes)/linearUpwind/linearUpwind.C
-$(limitedSchemes)/linearUpwindV/linearUpwindV.C
+$(limitedSchemes)/linearUpwind/linearUpwindV.C
 $(limitedSchemes)/Gamma/Gamma.C
 $(limitedSchemes)/SFCD/SFCD.C
 $(limitedSchemes)/Minmod/Minmod.C
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrads.C b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrads.C
index c3af907ea5..c4f0bf524a 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrads.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrads.C
@@ -21,7 +21,7 @@ License
     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 "cellLimitedGrad.H"
@@ -377,7 +377,7 @@ tmp<volTensorField> cellLimitedGrad<vector>::grad
             );
         }
     }
- 
+
     if (fv::debug)
     {
         Info<< "gradient limiter for: " << vsf.name()
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrads.C b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrads.C
index 4a4cbc9fa8..5a35033428 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrads.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrads.C
@@ -21,7 +21,7 @@ License
     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 "cellMDLimitedGrad.H"
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Limited/Limited.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Limited/Limited.H
index 8f1ce9a80d..ba6bdb8ed9 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Limited/Limited.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Limited/Limited.H
@@ -41,7 +41,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class LimitedLimiter Declaration
+                       Class LimitedLimiter Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class LimitedScheme>
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Limited01/Limited01.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Limited01/Limited01.H
index c71a3a255b..694bd974cb 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Limited01/Limited01.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Limited01/Limited01.H
@@ -41,7 +41,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                    Class Limited01Limiter Declaration
+                      Class Limited01Limiter Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class LimitedScheme>
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/QUICK/QUICK.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/QUICK/QUICK.H
index 6b615a2b55..15f94d1ed8 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/QUICK/QUICK.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/QUICK/QUICK.H
@@ -79,18 +79,17 @@ public:
     {
         scalar phiCD = cdWeight*phiP + (1 - cdWeight)*phiN;
 
-        scalar phif;
-        scalar phiU;
+        scalar phiU, phif;
 
         if (faceFlux > 0)
         {
-            phif = 0.5*(phiCD + phiP + (1 - cdWeight)*(d & gradcP));
             phiU = phiP;
+            phif = 0.5*(phiCD + phiP + (1 - cdWeight)*(d & gradcP));
         }
         else
         {
-            phif = 0.5*(phiCD + phiN - cdWeight*(d & gradcN));
             phiU = phiN;
+            phif = 0.5*(phiCD + phiN - cdWeight*(d & gradcN));
         }
 
         // Calculate the effective limiter for the QUICK interpolation
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/QUICK/QUICKV.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/QUICK/QUICKV.H
index 7551aae4ab..f8917861c7 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/QUICK/QUICKV.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/QUICK/QUICKV.H
@@ -81,8 +81,7 @@ public:
 
         scalar phiCD = gradfV & (cdWeight*phiP + (1 - cdWeight)*phiN);
 
-        scalar phif;
-        scalar phiU;
+        scalar phiU, phif;
 
         if (faceFlux > 0)
         {
@@ -95,7 +94,7 @@ public:
             phif = 0.5*(phiCD + phiU - cdWeight*(gradfV & (d & gradcN)));
         }
 
-        // Calculate the effective limiter for the linearUpwind interpolation
+        // Calculate the effective limiter for the QUICK interpolation
         scalar QLimiter = (phif - phiU)/stabilise(phiCD - phiU, SMALL);
 
         // Limit the limiter between upwind and downwind
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear/filteredLinear.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear/filteredLinear.H
index 8029667f0f..996699759c 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear/filteredLinear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear/filteredLinear.H
@@ -26,7 +26,7 @@ Class
     Foam::filteredLinearLimiter
 
 Description
-    Class to generate weighting factors for the filtered-linear
+    Class to generate weighting factors for the filteredLinear
     differencing scheme.
 
     The aim is to remove high-frequency modes with "staggering"
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2.H
index be5df5575c..90503633e1 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2.H
@@ -26,7 +26,7 @@ Class
     Foam::filteredLinear2Limiter
 
 Description
-    Class to generate weighting factors for the filtered-linear-2
+    Class to generate weighting factors for the filteredLinear2
     differencing scheme.
 
     The aim is to remove high-frequency modes with "staggering"
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2V.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2V.H
index 74f7348eb2..f2565b49d8 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2V.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear2/filteredLinear2V.H
@@ -26,11 +26,13 @@ Class
     Foam::filteredLinear2VLimiter
 
 Description
-    Class to generate weighting factors for the filteredLinear2V differencing
-    scheme.  The aim is to remove high-frequency modes with "staggering"
-    characteristics from vector fields by comparing the face gradient in the
-    direction of maximum gradient with both neighbouring cell gradients and
-    introduce small amounts of upwind in order to damp these modes.
+    Class to generate weighting factors for the filteredLinear2V
+    differencing scheme.
+
+    The aim is to remove high-frequency modes with "staggering"
+    characteristics from vector fields by comparing the face gradient in
+    the direction of maximum gradient with both neighbouring cell gradients
+    and introduce small amounts of upwind in order to damp these modes.
 
     Used in conjunction with the template class LimitedScheme.
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3.H
index 3edc0aba41..6afcb84982 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3.H
@@ -26,7 +26,7 @@ Class
     Foam::filteredLinear3Limiter
 
 Description
-    Class to generate weighting factors for the filtered-linear-3
+    Class to generate weighting factors for the filteredLinear
     differencing scheme.
 
     The aim is to remove high-frequency modes with "staggering"
@@ -79,7 +79,7 @@ public:
                 << "coefficient = " << k_
                 << " should be >= 0 and <= 1"
                 << exit(FatalIOError);
-        }    
+        }
     }
 
     scalar limiter
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3V.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3V.H
index c88d6d3052..a27a233aff 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3V.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3V.H
@@ -26,11 +26,13 @@ Class
     Foam::filteredLinear3VLimiter
 
 Description
-    Class to generate weighting factors for the filteredLinear3V differencing
-    scheme.  The aim is to remove high-frequency modes with "staggering"
-    characteristics from vector fields by comparing the face gradient in the
-    direction of maximum gradient with both neighbouring cell gradients and
-    introduce small amounts of upwind in order to damp these modes.
+    Class to generate weighting factors for the filteredLinear3V
+    differencing scheme.
+
+    The aim is to remove high-frequency modes with "staggering"
+    characteristics from vector fields by comparing the face gradient in
+    the direction of maximum gradient with both neighbouring cell gradients
+    and introduce small amounts of upwind in order to damp these modes.
 
     Used in conjunction with the template class LimitedScheme.
 
@@ -77,7 +79,7 @@ public:
                 << "coefficient = " << k_
                 << " should be >= 0 and <= 1"
                 << exit(FatalIOError);
-        }    
+        }
     }
 
     scalar limiter
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.H
index 7637a22f6e..2b51590f85 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.H
@@ -90,7 +90,7 @@ public:
             )
         {}
 
-        //- Construct from Istream. 
+        //- Construct from Istream.
         //  The name of the flux field is read from the Istream and looked-up
         //  from the mesh objectRegistry
         linearUpwind
@@ -142,8 +142,9 @@ public:
         virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
         correction
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
+            const GeometricField<Type, fvPatchField, volMesh>&
         ) const;
+
 };
 
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwindV.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwindV.C
new file mode 100644
index 0000000000..db4a31c551
--- /dev/null
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwindV.C
@@ -0,0 +1,136 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "linearUpwindV.H"
+#include "fvMesh.H"
+#include "volFields.H"
+#include "surfaceFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh> >
+Foam::linearUpwindV<Type>::correction
+(
+    const GeometricField<Type, fvPatchField, volMesh>& vf
+) const
+{
+   const fvMesh& mesh = this->mesh();
+
+   tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsfCorr
+   (
+       new GeometricField<Type, fvsPatchField, surfaceMesh>
+       (
+           IOobject
+           (
+               vf.name(),
+               mesh.time().timeName(),
+               mesh
+           ),
+           mesh,
+           dimensioned<Type>
+           (
+               vf.name(),
+               vf.dimensions(),
+               pTraits<Type>::zero
+           )
+       )
+   );
+
+   GeometricField<Type, fvsPatchField, surfaceMesh>& sfCorr = tsfCorr();
+
+   const surfaceScalarField& faceFlux = this->faceFlux_;
+   const surfaceScalarField& w = mesh.weights();
+
+   const labelList& own = mesh.owner();
+   const labelList& nei = mesh.neighbour();
+
+   const vectorField& C = mesh.C();
+   const vectorField& Cf = mesh.Cf();
+
+   GeometricField
+       <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
+       gradVf = gradScheme_().grad(vf);
+
+   forAll(faceFlux, facei)
+   {
+       vector maxCorr;
+
+       if (faceFlux[facei] > 0.0)
+       {
+           maxCorr =
+               (1.0 - w[facei])
+               *(vf[nei[facei]] - vf[own[facei]]);
+
+           sfCorr[facei] =
+               (Cf[facei] - C[own[facei]]) & gradVf[own[facei]];
+       }
+       else
+       {
+           maxCorr =
+               w[facei]*(vf[own[facei]] - vf[nei[facei]]);
+
+           sfCorr[facei] =
+               (Cf[facei] - C[nei[facei]]) & gradVf[nei[facei]];
+       }
+
+       scalar sfCorrs = magSqr(sfCorr[facei]);
+       scalar maxCorrs = sfCorr[facei] & maxCorr;
+
+       if (sfCorrs > 0)
+       {
+           if (maxCorrs < 0)
+           {
+               sfCorr[facei] = vector::zero;
+           }
+           else if (sfCorrs > maxCorrs)
+           {
+               sfCorr[facei] *= maxCorrs/(sfCorrs + VSMALL);
+           }
+       }
+       else if (sfCorrs < 0)
+       {
+           if (maxCorrs > 0)
+           {
+               sfCorr[facei] = vector::zero;
+           }
+           else if (sfCorrs < maxCorrs)
+           {
+               sfCorr[facei] *= maxCorrs/(sfCorrs - VSMALL);
+           }
+       }
+   }
+
+   return tsfCorr;
+}
+
+
+namespace Foam
+{
+    makelimitedSurfaceInterpolationTypeScheme(linearUpwindV, vector)
+}
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwindV/linearUpwindV.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwindV.H
similarity index 58%
rename from src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwindV/linearUpwindV.H
rename to src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwindV.H
index 6982cde3d6..7f8c9de742 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwindV/linearUpwindV.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwindV.H
@@ -90,7 +90,7 @@ public:
             )
         {}
 
-        //- Construct from Istream. 
+        //- Construct from Istream.
         //  The name of the flux field is read from the Istream and looked-up
         //  from the mesh objectRegistry
         linearUpwindV
@@ -142,97 +142,9 @@ public:
         virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
         correction
         (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
-        ) const
-        {
-            const fvMesh& mesh = this->mesh();
+            const GeometricField<Type, fvPatchField, volMesh>&
+        ) const;
 
-            tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsfCorr
-            (
-                new GeometricField<Type, fvsPatchField, surfaceMesh>
-                (
-                    IOobject
-                    (
-                        vf.name(),
-                        mesh.time().timeName(),
-                        mesh
-                    ),
-                    mesh,
-                    dimensioned<Type>
-                    (
-                        vf.name(),
-                        vf.dimensions(),
-                        pTraits<Type>::zero
-                    )
-                )
-            );
-
-            GeometricField<Type, fvsPatchField, surfaceMesh>& sfCorr = tsfCorr();
-
-            const surfaceScalarField& faceFlux = this->faceFlux_;
-            const surfaceScalarField& w = mesh.weights();
-
-            const labelList& own = mesh.owner();
-            const labelList& nei = mesh.neighbour();
-
-            const vectorField& C = mesh.C();
-            const vectorField& Cf = mesh.Cf();
-
-            GeometricField
-            <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
-                gradVf = gradScheme_().grad(vf);
-
-            forAll(faceFlux, facei)
-            {
-                vector maxCorr;
-
-                if (faceFlux[facei] > 0.0)
-                {
-                    maxCorr =
-                        (1.0 - w[facei])
-                       *(vf[nei[facei]] - vf[own[facei]]);
-
-                    sfCorr[facei] = 
-                        (Cf[facei] - C[own[facei]]) & gradVf[own[facei]];
-                }
-                else
-                {
-                    maxCorr =
-                        w[facei]*(vf[own[facei]] - vf[nei[facei]]);
-
-                    sfCorr[facei] = 
-                        (Cf[facei] - C[nei[facei]]) & gradVf[nei[facei]];
-                }
-
-                scalar sfCorrs = magSqr(sfCorr[facei]);
-                scalar maxCorrs = sfCorr[facei] & maxCorr;
-
-                if (sfCorrs > 0)
-                {
-                    if (maxCorrs < 0)
-                    {
-                        sfCorr[facei] = vector::zero;
-                    }
-                    else if (sfCorrs > maxCorrs)
-                    {
-                        sfCorr[facei] *= maxCorrs/(sfCorrs + VSMALL);
-                    }
-                }
-                else if (sfCorrs < 0)
-                {
-                    if (maxCorrs > 0)
-                    {
-                        sfCorr[facei] = vector::zero;
-                    }
-                    else if (sfCorrs < maxCorrs)
-                    {
-                        sfCorr[facei] *= maxCorrs/(sfCorrs - VSMALL);
-                    }
-                }
-            }
-
-            return tsfCorr;
-        }
 };
 
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwindV/linearUpwindV.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwindV/linearUpwindV.C
deleted file mode 100644
index e1ef0dc025..0000000000
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwindV/linearUpwindV.C
+++ /dev/null
@@ -1,39 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  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 "linearUpwindV.H"
-#include "fvMesh.H"
-#include "volFields.H"
-#include "surfaceFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    makelimitedSurfaceInterpolationTypeScheme(linearUpwindV, vector)
-}
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.H
index cd52bc8764..de0636c4d3 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitData.H
@@ -58,11 +58,11 @@ class UpwindFitData
     // Private data
 
         //- For each face of the mesh store the coefficients to multiply the
-        // stencil cell values by if the flow is from the owner
+        //  stencil cell values by if the flow is from the owner
         List<scalarList> owncoeffs_;
 
         //- For each face of the mesh store the coefficients to multiply the
-        // stencil cell values by if the flow is from the neighbour
+        //  stencil cell values by if the flow is from the neighbour
         List<scalarList> neicoeffs_;
 
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitScheme.H
index 67dad671fa..30444aafa4 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/UpwindFitScheme/UpwindFitScheme.H
@@ -26,7 +26,7 @@ Class
     Foam::UpwindFitScheme
 
 Description
-    Upwind biased fit surface interpolation scheme which applies an explicit
+    Upwind biased fit surface interpolation scheme that applies an explicit
     correction to linear.
 
 \*---------------------------------------------------------------------------*/
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/biLinearFit/biLinearFitPolynomial.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/biLinearFit/biLinearFitPolynomial.H
index 5960f54ee2..ad8975d2e1 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/biLinearFit/biLinearFitPolynomial.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/biLinearFit/biLinearFitPolynomial.H
@@ -27,7 +27,8 @@ Class
 
 Description
     BiLinear polynomial for interpolation fitting.
-    Can be used with the CentredFit scheme to crate a biLinear surface
+
+    Can be used with the CentredFit scheme to create a biLinear surface
     interpolation scheme
 
 \*---------------------------------------------------------------------------*/
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubicUpwindFit/cubicUpwindFitPolynomial.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubicUpwindFit/cubicUpwindFitPolynomial.H
index dab0871b8e..182a5608c2 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubicUpwindFit/cubicUpwindFitPolynomial.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubicUpwindFit/cubicUpwindFitPolynomial.H
@@ -28,7 +28,7 @@ Class
 Description
     Cubic polynomial for upwind biased interpolation fitting.
 
-    Can be used with the UpwindFit scheme to crate a cubic surface
+    Can be used with the UpwindFit scheme to create a cubic surface
     interpolation scheme
 
 \*---------------------------------------------------------------------------*/
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H
index a3e615cc52..cffa51d223 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/fixedBlended/fixedBlended.H
@@ -125,6 +125,7 @@ public:
             }
         }
 
+
         //- Construct from mesh, faceFlux and Istream
         fixedBlended
         (
@@ -165,7 +166,8 @@ public:
     // Member Functions
 
         //- Return the interpolation weighting factors
-        tmp<surfaceScalarField> weights
+        tmp<surfaceScalarField>
+        weights
         (
             const GeometricField<Type, fvPatchField, volMesh>& vf
         ) const
@@ -175,15 +177,74 @@ public:
               + (scalar(1.0) - blendingFactor_)*tScheme2_().weights(vf);
         }
 
+
         //- Return the face-interpolate of the given cell field
         //  with explicit correction
         tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
-        interpolate(const GeometricField<Type, fvPatchField, volMesh>& vf) const
+        interpolate
+        (
+            const GeometricField<Type, fvPatchField, volMesh>& vf
+        ) const
         {
             return
                 blendingFactor_*tScheme1_().interpolate(vf)
               + (scalar(1.0) - blendingFactor_)*tScheme2_().interpolate(vf);
         }
+
+
+        //- Return true if this scheme uses an explicit correction
+        virtual bool corrected() const
+        {
+            return tScheme1_().corrected() || tScheme2_().corrected();
+        }
+
+
+        //- Return the explicit correction to the face-interpolate
+        //  for the given field
+        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+        correction
+        (
+            const GeometricField<Type, fvPatchField, volMesh>& vf
+        ) const
+        {
+            if (tScheme1_().corrected())
+            {
+                if (tScheme2_().corrected())
+                {
+                    return
+                    (
+                        blendingFactor_
+                      * tScheme1_().correction(vf)
+                      + (scalar(1.0) - blendingFactor_)
+                      * tScheme2_().correction(vf)
+                    );
+                }
+                else
+                {
+                    return
+                    (
+                        blendingFactor_
+                      * tScheme1_().correction(vf)
+                    );
+                }
+            }
+            else if (tScheme2_().corrected())
+            {
+                return
+                (
+                    (scalar(1.0) - blendingFactor_)
+                  * tScheme2_().correction(vf)
+                );
+            }
+            else
+            {
+                return tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
+                (
+                    NULL
+                );
+            }
+        }
+
 };
 
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.H
index be52e6837a..594c3fcd43 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/harmonic/harmonic.H
@@ -26,9 +26,10 @@ Class
     Foam::harmonic
 
 Description
-    Harmonic-mean differencing scheme class.  This scheme interpolates 1/field
-    using a scheme specified at run-time and return the reciprocal of the
-    interpolate.
+    Harmonic-mean differencing scheme class.
+
+    This scheme interpolates 1/field using a scheme specified at run-time
+    and return the reciprocal of the interpolate.
 
 SourceFiles
     harmonic.C
@@ -76,7 +77,7 @@ public:
             surfaceInterpolationScheme<scalar>(mesh)
         {}
 
-        //- Construct from Istream. 
+        //- Construct from Istream.
         //  The name of the flux field is read from the Istream and looked-up
         //  from the mesh objectRegistry
         harmonic
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearFit/linearFitPolynomial.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearFit/linearFitPolynomial.H
index 72192a71be..3c0a095200 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearFit/linearFitPolynomial.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearFit/linearFitPolynomial.H
@@ -27,7 +27,8 @@ Class
 
 Description
     Linear polynomial for interpolation fitting.
-    Can be used with the CentredFit scheme to crate a linear surface
+
+    Can be used with the CentredFit scheme to create a linear surface
     interpolation scheme
 
 \*---------------------------------------------------------------------------*/
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H
index 108c6e8973..3fe3f21001 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H
@@ -26,9 +26,10 @@ Class
     Foam::localMax
 
 Description
-    LocalMax-mean differencing scheme class.  This scheme interpolates 1/field
-    using a scheme specified at run-time and return the reciprocal of the
-    interpolate.
+    LocalMax-mean differencing scheme class.
+
+    This scheme interpolates 1/field using a scheme specified at run-time
+    and return the reciprocal of the interpolate.
 
 SourceFiles
     localMax.C
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H
index b5e2e3ba42..302e5bfd85 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H
@@ -26,9 +26,10 @@ Class
     Foam::localMin
 
 Description
-    LocalMin-mean differencing scheme class.  This scheme interpolates 1/field
-    using a scheme specified at run-time and return the reciprocal of the
-    interpolate.
+    LocalMin-mean differencing scheme class.
+
+    This scheme interpolates 1/field using a scheme specified at run-time
+    and return the reciprocal of the interpolate.
 
 SourceFiles
     localMin.C
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H
index cb32f8e0c1..dbe27c5996 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H
@@ -27,9 +27,11 @@ Class
 
 Description
     Outlet-stabilised interpolation scheme which applies upwind differencing
-    to the faces of teh cells adjacent to outlets.  This is particularly
-    useful to stabilise the velocity at entrainment boundaries for LES
-    cases using linear or other centred differencing schemes.
+    to the faces of the cells adjacent to outlets.
+
+    This is particularly useful to stabilise the velocity at entrainment
+    boundaries for LES cases using linear or other centred differencing
+    schemes.
 
 SourceFiles
     outletStabilised.C
@@ -138,7 +140,7 @@ public:
 
             forAll(vf.boundaryField(), patchi)
             {
-                if 
+                if
                 (
                     isA<zeroGradientFvPatchField<Type> >
                         (vf.boundaryField()[patchi])
@@ -187,7 +189,7 @@ public:
         {
             if (tScheme_().corrected())
             {
-                tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tcorr = 
+                tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tcorr =
                     tScheme_().correction(vf);
 
                 GeometricField<Type, fvsPatchField, surfaceMesh>& corr = tcorr();
@@ -197,7 +199,7 @@ public:
 
                 forAll(vf.boundaryField(), patchi)
                 {
-                    if 
+                    if
                     (
                         isA<zeroGradientFvPatchField<Type> >
                             (vf.boundaryField()[patchi])
@@ -230,7 +232,7 @@ public:
             }
             else
             {
-                return 
+                return
                     tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >(NULL);
             }
         }
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticFit/quadraticFitPolynomial.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticFit/quadraticFitPolynomial.H
index 5ba7520df1..e55ba88ea3 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticFit/quadraticFitPolynomial.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticFit/quadraticFitPolynomial.H
@@ -28,7 +28,7 @@ Class
 Description
     Quadratic polynomial for centred interpolation fitting.
 
-    Can be used with the CentredFit scheme to crate a quadratic surface
+    Can be used with the CentredFit scheme to create a quadratic surface
     interpolation scheme
 
 \*---------------------------------------------------------------------------*/
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticLinearFit/quadraticLinearFitPolynomial.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticLinearFit/quadraticLinearFitPolynomial.H
index 75446b8214..0b9ef63b82 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticLinearFit/quadraticLinearFitPolynomial.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticLinearFit/quadraticLinearFitPolynomial.H
@@ -30,7 +30,7 @@ Description
         quadratic normal to the face,
         linear in the plane of the face for consistency with 2nd-order Gauss.
 
-    Can be used with the CentredFit scheme to crate a quadratic surface
+    Can be used with the CentredFit scheme to create a quadratic surface
     interpolation scheme
 
 \*---------------------------------------------------------------------------*/
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticLinearUpwindFit/quadraticLinearUpwindFitPolynomial.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticLinearUpwindFit/quadraticLinearUpwindFitPolynomial.H
index b904d6baa8..5bfc56be79 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticLinearUpwindFit/quadraticLinearUpwindFitPolynomial.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticLinearUpwindFit/quadraticLinearUpwindFitPolynomial.H
@@ -28,7 +28,7 @@ Class
 Description
     Quadratic polynomial for upwind biased interpolation fitting.
 
-    Can be used with the UpwindFit scheme to crate a quadratic surface
+    Can be used with the UpwindFit scheme to create a quadratic surface
     interpolation scheme
 
 \*---------------------------------------------------------------------------*/
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwindFit/quadraticUpwindFitPolynomial.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwindFit/quadraticUpwindFitPolynomial.H
index 7256d601a3..0646af67d4 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwindFit/quadraticUpwindFitPolynomial.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwindFit/quadraticUpwindFitPolynomial.H
@@ -28,7 +28,7 @@ Class
 Description
     Quadratic polynomial for upwind biased interpolation fitting.
 
-    Can be used with the UpwindFit scheme to crate a quadratic surface
+    Can be used with the UpwindFit scheme to create a quadratic surface
     interpolation scheme
 
 \*---------------------------------------------------------------------------*/
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H
index c778503daa..2d5bc309e9 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H
@@ -27,6 +27,7 @@ Class
 
 Description
     Inversed weight central-differencing interpolation scheme class.
+
     Useful for inverse weighted and harmonic interpolations.
 
 SourceFiles
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H
index 7996828086..047f5c7df1 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H
@@ -26,7 +26,7 @@ Class
     Foam::skewCorrected
 
 Description
-    Skewness-corrected interpolation scheme which applies an explicit
+    Skewness-corrected interpolation scheme that applies an explicit
     correction to given scheme.
 
 SourceFiles

From c0fcf87cb96f86253208b8e1994cdc90f237fec0 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 8 May 2009 13:07:21 +0100
Subject: [PATCH 095/175] comment

---
 src/turbulenceModels/compressible/RAS/RASModel/RASModel.H | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
index 7479eb4c55..7c787d8ceb 100644
--- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
+++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
@@ -351,7 +351,7 @@ public:
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct() = 0;
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read() = 0;
 };
 

From 7deb4aa2a998e291fca891846f782b465e541da6 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 8 May 2009 13:32:00 +0100
Subject: [PATCH 096/175] added alphaSgs wall functions - need checking

---
 .../DeardorffDiffStress/DeardorffDiffStress.C |   3 +
 .../LES/GenEddyVisc/GenEddyVisc.C             |  13 +
 .../LES/GenEddyVisc/GenEddyVisc.H             |  11 +-
 .../LES/GenSGSStress/GenSGSStress.C           |  13 +
 .../LES/GenSGSStress/GenSGSStress.H           |  19 +-
 .../compressible/LES/LESModel/LESModel.C      |  48 ++-
 .../compressible/LES/LESModel/LESModel.H      |  61 +++-
 .../compressible/LES/Make/files               |   4 +
 .../LES/Smagorinsky/Smagorinsky.C             |   3 +
 .../LES/SpalartAllmaras/SpalartAllmaras.C     |  17 +-
 .../LES/SpalartAllmaras/SpalartAllmaras.H     |   9 +-
 ...ayatillekeWallFunctionFvPatchScalarField.C | 317 ++++++++++++++++++
 ...ayatillekeWallFunctionFvPatchScalarField.H | 179 ++++++++++
 .../alphaSgsWallFunctionFvPatchScalarField.C  | 161 +++++++++
 .../alphaSgsWallFunctionFvPatchScalarField.H  | 155 +++++++++
 .../LES/dynOneEqEddy/dynOneEqEddy.C           |   3 +
 .../LES/lowReOneEqEddy/lowReOneEqEddy.C       |   3 +
 .../compressible/LES/oneEqEddy/oneEqEddy.C    |   3 +
 18 files changed, 1002 insertions(+), 20 deletions(-)
 create mode 100644 src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.C
 create mode 100644 src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.H
 create mode 100644 src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.C
 create mode 100644 src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.H

diff --git a/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C b/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
index e847acda6e..eb9a3c783e 100644
--- a/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
+++ b/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
@@ -48,6 +48,9 @@ void DeardorffDiffStress::updateSubGridScaleFields(const volScalarField& K)
 {
     muSgs_ = ck_*rho()*sqrt(K)*delta();
     muSgs_.correctBoundaryConditions();
+
+    alphaSgs_ = muSgs_/Prt();
+    alphaSgs_.correctBoundaryConditions();
 }
 
 
diff --git a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
index 61907f0c5b..d1e3591e9d 100644
--- a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
+++ b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
@@ -84,6 +84,19 @@ GenEddyVisc::GenEddyVisc
             IOobject::AUTO_WRITE
         ),
         mesh_
+    ),
+
+    alphaSgs_
+    (
+        IOobject
+        (
+            "alphaSgs",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh_
     )
 {}
 
diff --git a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H
index 5690b26a48..5a9504dbd1 100644
--- a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H
+++ b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H
@@ -72,6 +72,7 @@ protected:
 
         volScalarField k_;
         volScalarField muSgs_;
+        volScalarField alphaSgs_;
 
 
 public:
@@ -113,12 +114,18 @@ public:
             return muSgs_;
         }
 
-        //- Return thermal conductivity
+        //- Return thermal diffusivity
+        virtual tmp<volScalarField> alphaSgs() const
+        {
+            return alphaSgs_;
+        }
+
+        //- Return thermal diffusivity
         virtual tmp<volScalarField> alphaEff() const
         {
             return tmp<volScalarField>
             (
-                new volScalarField("alphaEff", muSgs_ + alpha())
+                new volScalarField("alphaEff", alphaSgs_ + alpha())
             );
         }
 
diff --git a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C
index 4c8089851a..a1400f67b3 100644
--- a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C
+++ b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C
@@ -88,6 +88,19 @@ GenSGSStress::GenSGSStress
             IOobject::AUTO_WRITE
         ),
         mesh_
+    ),
+
+    alphaSgs_
+    (
+        IOobject
+        (
+            "alphaSgs",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh_
     )
 {}
 
diff --git a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H
index 6425d86b49..131db3bc16 100644
--- a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H
+++ b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H
@@ -73,6 +73,7 @@ protected:
 
         volSymmTensorField B_;
         volScalarField muSgs_;
+        volScalarField alphaSgs_;
 
 
 public:
@@ -96,35 +97,41 @@ public:
 
     // Member Functions
 
-        //- Return the SGS turbulent kinetic energy.
+        //- Return the SGS turbulent kinetic energy
         virtual tmp<volScalarField> k() const
         {
             return 0.5*tr(B_);
         }
 
-        //- Return the SGS turbulent dissipation.
+        //- Return the SGS turbulent dissipation
         virtual tmp<volScalarField> epsilon() const
         {
             volScalarField K = k();
             return ce_*K*sqrt(K)/delta();
         }
 
-        //- Return the SGS viscosity.
+        //- Return the SGS viscosity
         virtual tmp<volScalarField> muSgs() const
         {
             return muSgs_;
         }
 
+        //- Return the SGS thermal diffusivity
+        virtual tmp<volScalarField> alphaSgs() const
+        {
+            return alphaSgs_;
+        }
+
         //- Return thermal conductivity
         virtual tmp<volScalarField> alphaEff() const
         {
             return tmp<volScalarField>
             (
-                new volScalarField("alphaEff", muSgs_ + alpha())
+                new volScalarField("alphaEff", alphaSgs_ + alpha())
             );
         }
 
-        //- Return the sub-grid stress tensor.
+        //- Return the sub-grid stress tensor
         virtual tmp<volSymmTensorField> B() const
         {
             return B_;
@@ -135,7 +142,7 @@ public:
         virtual tmp<volSymmTensorField> devRhoBeff() const;
 
         //- Returns divergence of B : i.e. the additional term in the
-        //  filtered NSE.
+        //  filtered NSE
         virtual tmp<fvVectorMatrix> divDevRhoBeff(volVectorField& U) const;
 
         //- Correct Eddy-Viscosity and related properties
diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
index 3e7b3eabf4..267de51f60 100644
--- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
+++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
@@ -81,7 +81,45 @@ LESModel::LESModel
 
     k0_("k0", dimVelocity*dimVelocity, SMALL),
 
-    delta_(LESdelta::New("delta", U.mesh(), *this))
+    delta_(LESdelta::New("delta", U.mesh(), *this)),
+
+    wallFunctionDict_(subDict("wallFunctionCoeffs")),
+    kappa_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "kappa",
+            wallFunctionDict_,
+            0.4187
+        )
+    ),
+    E_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "E",
+            wallFunctionDict_,
+            9.0
+        )
+    ),
+    Cmu_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Cmu",
+            wallFunctionDict_,
+            0.07
+        )
+    ),
+    Prt_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Prt",
+            wallFunctionDict_,
+            0.85
+        )
+    )
 {
     readIfPresent("k0", k0_);
 }
@@ -107,9 +145,15 @@ bool LESModel::read()
     {
         coeffDict_ = subDict(type() + "Coeffs");
 
+        readIfPresent("k0", k0_);
+
         delta_().read(*this);
 
-        readIfPresent("k0", k0_);
+        wallFunctionDict_ = subDict("wallFunctionCoeffs");
+        kappa_.readIfPresent(wallFunctionDict_);
+        E_.readIfPresent(wallFunctionDict_);
+        Cmu_.readIfPresent(wallFunctionDict_);
+        Prt_.readIfPresent(wallFunctionDict_);
 
         return true;
     }
diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.H b/src/turbulenceModels/compressible/LES/LESModel/LESModel.H
index dec3e88c0f..58ca05ce92 100644
--- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.H
+++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.H
@@ -87,6 +87,19 @@ protected:
 
         autoPtr<LESdelta> delta_;
 
+        // Wall function properties
+
+            //- Wall function dictionary
+            dictionary wallFunctionDict_;
+
+            dimensionedScalar kappa_;
+
+            dimensionedScalar E_;
+
+            dimensionedScalar Cmu_;
+
+            dimensionedScalar Prt_;
+
 
     // Protected Member Functions
 
@@ -167,12 +180,6 @@ public:
             return coeffDict_;
         }
 
-        //- Access function to filter width
-        inline const volScalarField& delta() const
-        {
-            return delta_();
-        }
-
         //- Return the value of k0 which k is not allowed to be less than
         const dimensionedScalar& k0() const
         {
@@ -185,6 +192,35 @@ public:
             return k0_;
         }
 
+        //- Access function to filter width
+        inline const volScalarField& delta() const
+        {
+            return delta_();
+        }
+
+        //- Return kappa for use in wall-functions
+        dimensionedScalar kappa() const
+        {
+            return kappa_;
+        }
+
+        //- Return E for use in wall-functions
+        dimensionedScalar E() const
+        {
+            return E_;
+        }
+
+        //- Return Cmu for use in wall-functions
+        dimensionedScalar Cmu() const
+        {
+            return Cmu_;
+        }
+
+        //- Return turbulent Prandtl number for use in wall-functions
+        dimensionedScalar Prt() const
+        {
+            return Prt_;
+        }
 
         //- Return the SGS turbulent kinetic energy.
         virtual tmp<volScalarField> k() const = 0;
@@ -192,7 +228,7 @@ public:
         //- Return the SGS turbulent dissipation.
         virtual tmp<volScalarField> epsilon() const = 0;
 
-        //- Return the effective viscosity
+        //- Return the SGS turbulent viscosity
         virtual tmp<volScalarField> muSgs() const = 0;
 
         //- Return the effective viscosity
@@ -204,6 +240,9 @@ public:
             );
         }
 
+        //- Return the SGS turbulent thermal diffusivity
+        virtual tmp<volScalarField> alphaSgs() const = 0;
+
         //- Return the SGS thermal conductivity.
         virtual tmp<volScalarField> alphaEff() const = 0;
 
@@ -227,6 +266,12 @@ public:
                 return muSgs();
             }
 
+            //- Return the turbulence thermal diffusivity
+            virtual tmp<volScalarField> alphat() const
+            {
+                return alphaSgs();
+            }
+
             //- Return the Reynolds stress tensor
             virtual tmp<volSymmTensorField> R() const
             {
@@ -254,7 +299,7 @@ public:
         //- Correct Eddy-Viscosity and related properties
         virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read() = 0;
 };
 
diff --git a/src/turbulenceModels/compressible/LES/Make/files b/src/turbulenceModels/compressible/LES/Make/files
index 06e7b76d45..3609694e59 100644
--- a/src/turbulenceModels/compressible/LES/Make/files
+++ b/src/turbulenceModels/compressible/LES/Make/files
@@ -16,4 +16,8 @@ wallFunctions=derivedFvPatchFields/wallFunctions
 muSgsWallFunctions=$(wallFunctions)/muSgsWallFunctions
 $(muSgsWallFunctions)/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
 
+alphaSgsWallFunctions=$(wallFunctions)/alphaSgsWallFunctions
+$(alphaSgsWallFunctions)/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.C
+$(alphaSgsWallFunctions)/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.C
+
 LIB = $(FOAM_LIBBIN)/libcompressibleLESModels
diff --git a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C
index c89b2aeecf..0698b5aa27 100644
--- a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C
+++ b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C
@@ -56,6 +56,9 @@ void Smagorinsky::updateSubGridScaleFields(const volTensorField& gradU)
 
     muSgs_ = ck_*rho()*delta()*sqrt(k_);
     muSgs_.correctBoundaryConditions();
+
+    alphaSgs_ = muSgs_/Prt();
+    alphaSgs_.correctBoundaryConditions();
 }
 
 
diff --git a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
index 65a6a69bde..dc05459d3d 100644
--- a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
@@ -49,6 +49,9 @@ void SpalartAllmaras::updateSubGridScaleFields()
 {
     muSgs_.internalField() = rho()*fv1()*nuTilda_.internalField();
     muSgs_.correctBoundaryConditions();
+
+    alphaSgs_ = muSgs_/Prt();
+    alphaSgs_.correctBoundaryConditions();
 }
 
 
@@ -227,8 +230,20 @@ SpalartAllmaras::SpalartAllmaras
             IOobject::AUTO_WRITE
         ),
         mesh_
-    )
+    ),
 
+    alphaSgs_
+    (
+        IOobject
+        (
+            "alphaSgs",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh_
+    )
 {
     updateSubGridScaleFields();
 
diff --git a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H
index e119768537..847badd277 100644
--- a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H
@@ -89,6 +89,7 @@ class SpalartAllmaras
         volScalarField nuTilda_;
         volScalarField dTilda_;
         volScalarField muSgs_;
+        volScalarField alphaSgs_;
 
 
 public:
@@ -136,12 +137,18 @@ public:
             return muSgs_;
         }
 
+        //- Return SGS thermal diffusivity
+        virtual tmp<volScalarField> alphaSgs() const
+        {
+            return alphaSgs_;
+        }
+
         //- Return thermal conductivity
         virtual tmp<volScalarField> alphaEff() const
         {
             return tmp<volScalarField>
             (
-                new volScalarField("alphaEff", muSgs_ + alpha())
+                new volScalarField("alphaEff", alphaSgs_ + alpha())
             );
         }
 
diff --git a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.C
new file mode 100644
index 0000000000..becc932047
--- /dev/null
+++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.C
@@ -0,0 +1,317 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2007 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 "alphaSgsJayatillekeWallFunctionFvPatchScalarField.H"
+#include "LESModel.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "wallFvPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace LESModels
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+scalar alphaSgsJayatillekeWallFunctionFvPatchScalarField::maxExp_ = 50.0;
+scalar alphaSgsJayatillekeWallFunctionFvPatchScalarField::tolerance_ = 0.01;
+label alphaSgsJayatillekeWallFunctionFvPatchScalarField::maxIters_ = 10;
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void alphaSgsJayatillekeWallFunctionFvPatchScalarField::checkType()
+{
+    if (!isA<wallFvPatch>(patch()))
+    {
+        FatalErrorIn
+        (
+            "alphaSgsJayatillekeWallFunctionFvPatchScalarField::checkType()"
+        )
+            << "Patch type for patch " << patch().name() << " must be wall\n"
+            << "Current patch type is " << patch().type() << nl
+            << exit(FatalError);
+    }
+}
+
+
+scalar alphaSgsJayatillekeWallFunctionFvPatchScalarField::Psmooth
+(
+    const scalar Prat
+) const
+{
+    return 9.24*(pow(Prat, 0.75) - 1.0)*(1.0 + 0.28*exp(-0.007*Prat));
+}
+
+
+scalar alphaSgsJayatillekeWallFunctionFvPatchScalarField::yPlusTherm
+(
+    const scalar P,
+    const scalar Prat,
+    const scalar E,
+    const scalar kappa
+) const
+{
+    scalar ypt = 11.0;
+
+    for (int i=0; i<maxIters_; i++)
+    {
+        scalar f = ypt - (log(E*ypt)/kappa + P)/Prat;
+        scalar df = 1.0 - 1.0/(ypt*kappa*Prat);
+        scalar yptNew = ypt - f/df;
+
+        if (yptNew < VSMALL)
+        {
+            return 0;
+        }
+        else if (mag(yptNew - ypt) < tolerance_)
+        {
+            return yptNew;
+        }
+        else
+        {
+            ypt = yptNew;
+        }
+     }
+
+    return ypt;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+alphaSgsJayatillekeWallFunctionFvPatchScalarField::
+alphaSgsJayatillekeWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(p, iF)
+{
+    checkType();
+}
+
+
+alphaSgsJayatillekeWallFunctionFvPatchScalarField::
+alphaSgsJayatillekeWallFunctionFvPatchScalarField
+(
+    const alphaSgsJayatillekeWallFunctionFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchScalarField(ptf, p, iF, mapper)
+{}
+
+
+alphaSgsJayatillekeWallFunctionFvPatchScalarField::
+alphaSgsJayatillekeWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchScalarField(p, iF, dict)
+{
+    checkType();
+}
+
+
+alphaSgsJayatillekeWallFunctionFvPatchScalarField::
+alphaSgsJayatillekeWallFunctionFvPatchScalarField
+(
+    const alphaSgsJayatillekeWallFunctionFvPatchScalarField& tppsf
+)
+:
+    fixedValueFvPatchScalarField(tppsf)
+{
+    checkType();
+}
+
+
+alphaSgsJayatillekeWallFunctionFvPatchScalarField::
+alphaSgsJayatillekeWallFunctionFvPatchScalarField
+(
+    const alphaSgsJayatillekeWallFunctionFvPatchScalarField& tppsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(tppsf, iF)
+{
+    checkType();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void alphaSgsJayatillekeWallFunctionFvPatchScalarField::evaluate
+(
+    const Pstream::commsTypes
+)
+{
+    // Get info from the SGS model
+    const LESModel& sgs = db().lookupObject<LESModel>("LESProperties");
+
+    // Wall function constants
+    const scalar E = sgs.E().value();
+    const scalar kappa = sgs.kappa().value();
+    const scalar Prt = sgs.Prt().value();
+
+    // Field data
+    const label patchI = patch().index();
+
+    const scalarField& muw = sgs.mu().boundaryField()[patchI];
+    const scalarField& muSgsw = sgs.muSgs()().boundaryField()[patchI];
+
+    const scalarField& alphaw = sgs.alpha().boundaryField()[patchI];
+    scalarField& alphaSgsw = *this;
+
+    const fvPatchVectorField& Uw = sgs.U().boundaryField()[patchI];
+    const scalarField magUp = mag(Uw.patchInternalField() - Uw);
+    const scalarField magGradUw = mag(Uw.snGrad());
+
+    const scalarField& rhow = sgs.rho().boundaryField()[patchI];
+    const fvPatchScalarField& hw =
+        patch().lookupPatchField<volScalarField, scalar>("h");
+
+    const scalarField& ry = patch().deltaCoeffs();
+
+    // Heat flux [W/m2] - lagging alphaSgsw
+    const scalarField qDot = (alphaw + alphaSgsw)*hw.snGrad();
+
+    // Populate boundary values
+    forAll(alphaSgsw, faceI)
+    {
+        // Calculate uTau using Newton-Raphson iteration
+        scalar uTau =
+            sqrt((muSgsw[faceI] + muw[faceI])/rhow[faceI]*magGradUw[faceI]);
+
+        if (uTau > ROOTVSMALL)
+        {
+            label iter = 0;
+            scalar err = GREAT;
+
+            do
+            {
+                scalar kUu = min(kappa*magUp[faceI]/uTau, maxExp_);
+                scalar fkUu = exp(kUu) - 1.0 - kUu*(1.0 + 0.5*kUu);
+
+                scalar f =
+                    - uTau/(ry[faceI]*muw[faceI]/rhow[faceI])
+                    + magUp[faceI]/uTau
+                    + 1.0/E*(fkUu - 1.0/6.0*kUu*sqr(kUu));
+
+                scalar df =
+                    - 1.0/(ry[faceI]*muw[faceI]/rhow[faceI])
+                    - magUp[faceI]/sqr(uTau)
+                    - 1.0/E*kUu*fkUu/uTau;
+
+                scalar uTauNew = uTau - f/df;
+                err = mag((uTau - uTauNew)/uTau);
+                uTau = uTauNew;
+
+            } while (uTau>VSMALL && err>tolerance_ && ++iter<maxIters_);
+
+            scalar yPlus = uTau/ry[faceI]/(muw[faceI]/rhow[faceI]);
+
+            // Molecular Prandtl number
+            scalar Pr = muw[faceI]/alphaw[faceI];
+
+            // Molecular-to-turbulenbt Prandtl number ratio
+            scalar Prat = Pr/Prt;
+
+            // Thermal sublayer thickness
+            scalar P = Psmooth(Prat);
+            scalar yPlusTherm = this->yPlusTherm(P, Prat, E, kappa);
+
+            // Evaluate new effective thermal diffusivity
+            scalar alphaEff = 0.0;
+            if (yPlus < yPlusTherm)
+            {
+                scalar A = qDot[faceI]*rhow[faceI]*uTau/ry[faceI];
+                scalar B = qDot[faceI]*Pr*yPlus;
+                scalar C = Pr*0.5*rhow[faceI]*uTau*sqr(magUp[faceI]);
+                alphaEff = A/(B + C + VSMALL);
+            }
+            else
+            {
+                scalar A = qDot[faceI]*rhow[faceI]*uTau/ry[faceI];
+                scalar B = qDot[faceI]*Prt*(1.0/kappa*log(E*yPlus) + P);
+                scalar magUc = uTau/kappa*log(E*yPlusTherm) - mag(Uw[faceI]);
+                scalar C =
+                    0.5*rhow[faceI]*uTau
+                   *(Prt*sqr(magUp[faceI]) + (Pr - Prt)*sqr(magUc));
+                alphaEff = A/(B + C + VSMALL);
+            }
+
+            // Update turbulent thermal diffusivity
+            alphaSgsw[faceI] = max(0.0, alphaEff - alphaw[faceI]);
+
+            if (debug)
+            {
+                Info<< "    uTau           = " << uTau << nl
+                    << "    Pr             = " << Pr << nl
+                    << "    Prt            = " << Prt << nl
+                    << "    qDot           = " << qDot[faceI] << nl
+                    << "    yPlus          = " << yPlus << nl
+                    << "    yPlusTherm     = " << yPlusTherm << nl
+                    << "    alphaEff       = " << alphaEff << nl
+                    << "    alphaw         = " << alphaw[faceI] << nl
+                    << "    alphaSgsw      = " << alphaSgsw[faceI] << nl
+                    << endl;
+            }
+        }
+        else
+        {
+            alphaSgsw[faceI] = 0.0;
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField
+(
+    fvPatchScalarField,
+    alphaSgsJayatillekeWallFunctionFvPatchScalarField
+);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace LESModels
+} // End namespace compressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.H
new file mode 100644
index 0000000000..09bb27059e
--- /dev/null
+++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.H
@@ -0,0 +1,179 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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
+    alphaSgsJayatillekeWallFunctionFvPatchScalarField
+
+Description
+    Thermal wall function for turbulent thermal diffusivity based on the
+    Jayatilleke thermal wall function
+
+SourceFiles
+    alphaSgsJayatillekeWallFunctionFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef alphaSgsJayatillekeWallFunctionFvPatchScalarField_H
+#define alphaSgsJayatillekeWallFunctionFvPatchScalarField_H
+
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace LESModels
+{
+
+/*---------------------------------------------------------------------------*\
+     Class alphaSgsJayatillekeWallFunctionFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class alphaSgsJayatillekeWallFunctionFvPatchScalarField
+:
+    public fixedValueFvPatchScalarField
+{
+    // Private data
+
+        static scalar maxExp_;
+        static scalar tolerance_;
+        static label maxIters_;
+
+
+    // Private member functions
+
+        //- Check the type of the patch
+        void checkType();
+
+        //- `P' function
+        scalar Psmooth(const scalar Prat) const;
+
+        //- Calculate y+ at the edge of the thermal laminar sublayer
+        scalar yPlusTherm
+        (
+            const scalar P,
+            const scalar Prat,
+            const scalar E,
+            const scalar kappa
+        ) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("alphaSgsJayatillekeWallFunction");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        alphaSgsJayatillekeWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        alphaSgsJayatillekeWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given an
+        //  alphaSgsJayatillekeWallFunctionFvPatchScalarField
+        //  onto a new patch
+        alphaSgsJayatillekeWallFunctionFvPatchScalarField
+        (
+            const alphaSgsJayatillekeWallFunctionFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        alphaSgsJayatillekeWallFunctionFvPatchScalarField
+        (
+            const alphaSgsJayatillekeWallFunctionFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new alphaSgsJayatillekeWallFunctionFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        alphaSgsJayatillekeWallFunctionFvPatchScalarField
+        (
+            const alphaSgsJayatillekeWallFunctionFvPatchScalarField&,
+            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 alphaSgsJayatillekeWallFunctionFvPatchScalarField
+                (
+                    *this,
+                    iF
+                )
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Evaluate the patchField
+            virtual void evaluate
+            (
+                const Pstream::commsTypes commsType=Pstream::Pstream::blocking
+            );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace LESModels
+} // End namespace compressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.C
new file mode 100644
index 0000000000..9a8d890bde
--- /dev/null
+++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.C
@@ -0,0 +1,161 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2007 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 "alphaSgsWallFunctionFvPatchScalarField.H"
+#include "LESModel.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "wallFvPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace LESModels
+{
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void alphaSgsWallFunctionFvPatchScalarField::checkType()
+{
+    if (!isA<wallFvPatch>(patch()))
+    {
+        FatalErrorIn
+        (
+            "alphaSgsWallFunctionFvPatchScalarField::checkType()"
+        )
+            << "Patch type for patch " << patch().name() << " must be wall\n"
+            << "Current patch type is " << patch().type() << nl
+            << exit(FatalError);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+alphaSgsWallFunctionFvPatchScalarField::
+alphaSgsWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(p, iF)
+{
+    checkType();
+}
+
+
+alphaSgsWallFunctionFvPatchScalarField::
+alphaSgsWallFunctionFvPatchScalarField
+(
+    const alphaSgsWallFunctionFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchScalarField(ptf, p, iF, mapper)
+{}
+
+
+alphaSgsWallFunctionFvPatchScalarField::
+alphaSgsWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchScalarField(p, iF, dict)
+{
+    checkType();
+}
+
+
+alphaSgsWallFunctionFvPatchScalarField::
+alphaSgsWallFunctionFvPatchScalarField
+(
+    const alphaSgsWallFunctionFvPatchScalarField& tppsf
+)
+:
+    fixedValueFvPatchScalarField(tppsf)
+{
+    checkType();
+}
+
+
+alphaSgsWallFunctionFvPatchScalarField::
+alphaSgsWallFunctionFvPatchScalarField
+(
+    const alphaSgsWallFunctionFvPatchScalarField& tppsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(tppsf, iF)
+{
+    checkType();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void alphaSgsWallFunctionFvPatchScalarField::evaluate
+(
+    const Pstream::commsTypes
+)
+{
+    // Get reference to the SGS model
+    const LESModel& sgs = db().lookupObject<LESModel>("LESProperties");
+
+    // Turbulent Prandtl number
+    const scalar Prt = sgs.Prt().value();
+
+    // Get the turbulent viscosity at the wall
+    const scalarField& muSgsw = sgs.muSgs()().boundaryField()[patch().index()];
+
+    operator==(muSgsw/Prt);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField
+(
+    fvPatchScalarField,
+    alphaSgsWallFunctionFvPatchScalarField
+);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace LESModels
+} // End namespace compressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.H
new file mode 100644
index 0000000000..e5e200d2b5
--- /dev/null
+++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.H
@@ -0,0 +1,155 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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
+    alphaSgsWallFunctionFvPatchScalarField
+
+Description
+    Boundary condition for thermal diffusivity when using wall functions
+    - replicates OpenFOAM v1.5 (and earlier) behaviour
+
+SourceFiles
+    alphaSgsWallFunctionFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef alphaSgsWallFunctionFvPatchScalarField_H
+#define alphaSgsWallFunctionFvPatchScalarField_H
+
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace LESModels
+{
+
+/*---------------------------------------------------------------------------*\
+           Class alphaSgsWallFunctionFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class alphaSgsWallFunctionFvPatchScalarField
+:
+    public fixedValueFvPatchScalarField
+{
+    // Private member functions
+
+        //- Check the type of the patch
+        void checkType();
+
+
+public:
+
+    //- Runtime type information
+    TypeName("alphaSgsWallFunction");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        alphaSgsWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        alphaSgsWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given alphaSgsWallFunctionFvPatchScalarField
+        //  onto a new patch
+        alphaSgsWallFunctionFvPatchScalarField
+        (
+            const alphaSgsWallFunctionFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        alphaSgsWallFunctionFvPatchScalarField
+        (
+            const alphaSgsWallFunctionFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new alphaSgsWallFunctionFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        alphaSgsWallFunctionFvPatchScalarField
+        (
+            const alphaSgsWallFunctionFvPatchScalarField&,
+            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 alphaSgsWallFunctionFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Evaluate the patchField
+            virtual void evaluate
+            (
+                const Pstream::commsTypes commsType=Pstream::Pstream::blocking
+            );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace LESModels
+} // End namespace compressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.C b/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.C
index 7e9b3d9b7b..4736499b4f 100644
--- a/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.C
+++ b/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.C
@@ -47,6 +47,9 @@ void dynOneEqEddy::updateSubGridScaleFields(const volSymmTensorField& D)
 {
     muSgs_ = ck_(D)*rho()*sqrt(k_)*delta();
     muSgs_.correctBoundaryConditions();
+
+    alphaSgs_ = muSgs_/Prt();
+    alphaSgs_.correctBoundaryConditions();
 }
 
 
diff --git a/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C b/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C
index b5670ad245..67c230608f 100644
--- a/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C
+++ b/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C
@@ -51,6 +51,9 @@ void lowReOneEqEddy::updateSubGridScaleFields()
     // low Re no corrected eddy viscosity
     muSgs_ -= (mu()/beta_)*(scalar(1) - exp(-beta_*muSgs_/mu()));
     muSgs_.correctBoundaryConditions();
+
+    alphaSgs_ = muSgs_/Prt();
+    alphaSgs_.correctBoundaryConditions();
 }
 
 
diff --git a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C
index 414aba5b03..fbcf333d4f 100644
--- a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C
+++ b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C
@@ -47,6 +47,9 @@ void oneEqEddy::updateSubGridScaleFields()
 {
     muSgs_ = ck_*rho()*sqrt(k_)*delta();
     muSgs_.correctBoundaryConditions();
+
+    alphaSgs_ = muSgs_/Prt();
+    alphaSgs_.correctBoundaryConditions();
 }
 
 

From 19d951ce8681f395067815e3ce886c8af7fafc37 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 8 May 2009 17:27:42 +0200
Subject: [PATCH 097/175] minor cleanup of turbulence models

- added constructor dictionary(const dictionary*) that also handles NULL
  pointers and makes it convenient to construct from a possibly nonexistent
  sub-dictionary:
  eg,
      dictionary dict2(dict1.subDictPtr("someDict"));

- make some of the turbulence Coeffs sub-dictionary optional.
  Their contents are all 'lookupOrAddDefault' anyhow.

- in turbulentMixingLength BCs, skip namespace qualifier in template
  (eg, <RASModel> vs. <compressible::RASModel>)

- change comments from 'turbulenceProperties' to RASProperties/LESProperties

- consistency between compressible/incompressible - no separate file for
  'New' selector etc

- consistency in accessing the model coefficients.
  Use method coeffDict() for const access.
  Use protected data member coeffDict_ for read/write access.

- document model coefficients in etc/constant/RASProperties.
  Need the same for LESProperties before we can prune these from the
  tutorials.
---
 applications/test/dictionary/dictionaryTest.C |   9 +-
 etc/constant/RASProperties                    | 235 ++++++++++++++++++
 src/OpenFOAM/db/dictionary/dictionary.C       |  14 ++
 src/OpenFOAM/db/dictionary/dictionary.H       |   4 +
 .../LES/LESdeltas/LESdelta/LESdelta.C         |  29 +++
 .../LES/LESdeltas/LESdelta/LESdelta.H         |   8 +-
 .../LES/LESdeltas/LESdelta/newDelta.C         |  70 ------
 src/turbulenceModels/LES/LESdeltas/Make/files |   1 -
 .../LES/LESfilters/LESfilter/LESfilter.C      |  29 +++
 .../LES/LESfilters/LESfilter/LESfilter.H      |   4 +-
 .../LES/LESfilters/LESfilter/newFilter.C      |  69 -----
 .../LES/LESfilters/Make/files                 |   3 +-
 .../DeardorffDiffStress/DeardorffDiffStress.C |   4 +-
 .../DeardorffDiffStress/DeardorffDiffStress.H |   2 +-
 .../LES/GenEddyVisc/GenEddyVisc.C             |   2 +-
 .../LES/GenEddyVisc/GenEddyVisc.H             |   2 +-
 .../LES/GenSGSStress/GenSGSStress.C           |   2 +-
 .../LES/GenSGSStress/GenSGSStress.H           |   2 +-
 .../compressible/LES/LESModel/LESModel.C      |  60 ++++-
 .../compressible/LES/LESModel/LESModel.H      |  11 +-
 .../compressible/LES/LESModel/newLESModel.C   |  94 -------
 .../compressible/LES/Make/files               |   1 -
 .../LES/Smagorinsky/Smagorinsky.C             |   2 +-
 .../LES/Smagorinsky/Smagorinsky.H             |   2 +-
 .../LES/SpalartAllmaras/SpalartAllmaras.C     |  18 +-
 .../LES/SpalartAllmaras/SpalartAllmaras.H     |   2 +-
 .../muSgsWallFunctionFvPatchScalarField.C     |  12 +-
 .../LES/dynOneEqEddy/dynOneEqEddy.H           |   2 +-
 .../LES/lowReOneEqEddy/lowReOneEqEddy.C       |   4 +-
 .../LES/lowReOneEqEddy/lowReOneEqEddy.H       |   2 +-
 .../compressible/LES/oneEqEddy/oneEqEddy.C    |   2 +-
 .../compressible/LES/oneEqEddy/oneEqEddy.H    |   2 +-
 .../compressible/RAS/LRR/LRR.C                |  22 +-
 .../compressible/RAS/LRR/LRR.H                |   2 +-
 .../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C |  26 +-
 .../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H |   2 +-
 .../RAS/LaunderSharmaKE/LaunderSharmaKE.C     |  14 +-
 .../RAS/LaunderSharmaKE/LaunderSharmaKE.H     |   2 +-
 .../compressible/RAS/Make/files               |   1 -
 .../compressible/RAS/RASModel/RASModel.C      |  73 +++++-
 .../compressible/RAS/RASModel/RASModel.H      |   2 +-
 .../compressible/RAS/RASModel/newRASModel.C   |  99 --------
 .../RAS/RNGkEpsilon/RNGkEpsilon.C             |  18 +-
 .../RAS/RNGkEpsilon/RNGkEpsilon.H             |   2 +-
 .../RAS/SpalartAllmaras/SpalartAllmaras.C     |  16 +-
 .../RAS/SpalartAllmaras/SpalartAllmaras.H     |   2 +-
 ...entHeatFluxTemperatureFvPatchScalarField.C |   4 +-
 ...thDissipationRateInletFvPatchScalarField.C |  11 +-
 ...ngLengthFrequencyInletFvPatchScalarField.C |   9 +-
 .../alphatWallFunctionFvPatchScalarField.C    |   4 +-
 .../epsilonWallFunctionFvPatchScalarField.C   |  10 +-
 .../mutRoughWallFunctionFvPatchScalarField.C  |  14 +-
 ...ndardRoughWallFunctionFvPatchScalarField.C |   5 +-
 ...asStandardWallFunctionFvPatchScalarField.C |  10 +-
 ...rtAllmarasWallFunctionFvPatchScalarField.C |   6 +-
 .../mutWallFunctionFvPatchScalarField.C       |  12 +-
 .../omegaWallFunctionFvPatchScalarField.C     |  10 +-
 .../compressible/RAS/kEpsilon/kEpsilon.C      |  14 +-
 .../compressible/RAS/kEpsilon/kEpsilon.H      |   2 +-
 .../compressible/RAS/kOmegaSST/kOmegaSST.C    |  24 +-
 .../compressible/RAS/kOmegaSST/kOmegaSST.H    |   4 +-
 .../compressible/RAS/laminar/laminar.H        |   2 +-
 .../RAS/realizableKE/realizableKE.C           |  12 +-
 .../RAS/realizableKE/realizableKE.H           |   4 +-
 .../turbulenceModel/turbulenceModel.C         |  20 +-
 .../DeardorffDiffStress/DeardorffDiffStress.C |   4 +-
 .../DeardorffDiffStress/DeardorffDiffStress.H |   2 +-
 .../LES/GenEddyVisc/GenEddyVisc.C             |   2 +-
 .../LES/GenEddyVisc/GenEddyVisc.H             |   2 +-
 .../LES/GenSGSStress/GenSGSStress.C           |   4 +-
 .../LES/GenSGSStress/GenSGSStress.H           |   2 +-
 .../incompressible/LES/LESModel/LESModel.C    |  25 +-
 .../incompressible/LES/LESModel/LESModel.H    |  11 +-
 .../LES/LRRDiffStress/LRRDiffStress.C         |   6 +-
 .../LES/LRRDiffStress/LRRDiffStress.H         |   2 +-
 .../LES/Smagorinsky/Smagorinsky.C             |   2 +-
 .../LES/Smagorinsky/Smagorinsky.H             |   2 +-
 .../LES/Smagorinsky2/Smagorinsky2.C           |   2 +-
 .../LES/Smagorinsky2/Smagorinsky2.H           |   2 +-
 .../LES/SpalartAllmaras/SpalartAllmaras.C     |  18 +-
 .../LES/SpalartAllmaras/SpalartAllmaras.H     |   2 +-
 .../SpalartAllmarasIDDES.C                    |   6 +-
 .../SpalartAllmarasIDDES.H                    |   2 +-
 .../nuSgsWallFunctionFvPatchScalarField.C     |  12 +-
 .../dynMixedSmagorinsky/dynMixedSmagorinsky.H |   2 +-
 .../LES/dynOneEqEddy/dynOneEqEddy.H           |   2 +-
 .../LES/dynSmagorinsky/dynSmagorinsky.H       |   2 +-
 .../LES/kOmegaSSTSAS/kOmegaSSTSAS.C           |  30 +--
 .../LES/kOmegaSSTSAS/kOmegaSSTSAS.H           |   2 +-
 .../incompressible/LES/laminar/laminar.H      |   2 +-
 .../LES/locDynOneEqEddy/locDynOneEqEddy.H     |   2 +-
 .../LES/mixedSmagorinsky/mixedSmagorinsky.H   |   2 +-
 .../incompressible/LES/oneEqEddy/oneEqEddy.C  |   2 +-
 .../incompressible/LES/oneEqEddy/oneEqEddy.H  |   2 +-
 .../LES/scaleSimilarity/scaleSimilarity.H     |   2 +-
 .../LES/spectEddyVisc/spectEddyVisc.C         |  10 +-
 .../LES/spectEddyVisc/spectEddyVisc.H         |   2 +-
 .../LES/vanDriestDelta/vanDriestDelta.C       |   9 +-
 .../incompressible/RAS/LRR/LRR.C              |  18 +-
 .../incompressible/RAS/LRR/LRR.H              |   2 +-
 .../RAS/LamBremhorstKE/LamBremhorstKE.C       |   8 +-
 .../RAS/LamBremhorstKE/LamBremhorstKE.H       |   2 +-
 .../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C |  24 +-
 .../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H |   2 +-
 .../RAS/LaunderSharmaKE/LaunderSharmaKE.C     |   8 +-
 .../RAS/LaunderSharmaKE/LaunderSharmaKE.H     |   2 +-
 .../RAS/LienCubicKE/LienCubicKE.C             |  20 +-
 .../RAS/LienCubicKE/LienCubicKE.H             |   2 +-
 .../RAS/LienCubicKELowRe/LienCubicKELowRe.C   |  28 +--
 .../RAS/LienCubicKELowRe/LienCubicKELowRe.H   |   2 +-
 .../LienLeschzinerLowRe/LienLeschzinerLowRe.C |  16 +-
 .../LienLeschzinerLowRe/LienLeschzinerLowRe.H |   2 +-
 .../RAS/NonlinearKEShih/NonlinearKEShih.C     |  20 +-
 .../RAS/NonlinearKEShih/NonlinearKEShih.H     |   2 +-
 .../incompressible/RAS/QZeta/QZeta.C          |  10 +-
 .../incompressible/RAS/QZeta/QZeta.H          |   2 +-
 .../incompressible/RAS/RASModel/RASModel.C    |  35 +--
 .../incompressible/RAS/RASModel/RASModel.H    |   2 +-
 .../RAS/RNGkEpsilon/RNGkEpsilon.C             |  14 +-
 .../RAS/RNGkEpsilon/RNGkEpsilon.H             |   2 +-
 .../RAS/SpalartAllmaras/SpalartAllmaras.C     |  14 +-
 .../RAS/SpalartAllmaras/SpalartAllmaras.H     |   2 +-
 ...thDissipationRateInletFvPatchScalarField.C |  11 +-
 ...ngLengthFrequencyInletFvPatchScalarField.C |   9 +-
 .../epsilonWallFunctionFvPatchScalarField.C   |  10 +-
 .../nutRoughWallFunctionFvPatchScalarField.C  |  14 +-
 ...ndardRoughWallFunctionFvPatchScalarField.C |   6 +-
 ...asStandardWallFunctionFvPatchScalarField.C |   8 +-
 ...rtAllmarasWallFunctionFvPatchScalarField.C |   6 +-
 .../nutWallFunctionFvPatchScalarField.C       |  12 +-
 .../omegaWallFunctionFvPatchScalarField.C     |  10 +-
 .../incompressible/RAS/kEpsilon/kEpsilon.C    |   8 +-
 .../incompressible/RAS/kEpsilon/kEpsilon.H    |   2 +-
 .../incompressible/RAS/kOmega/kOmega.C        |   8 +-
 .../incompressible/RAS/kOmega/kOmega.H        |   2 +-
 .../incompressible/RAS/kOmegaSST/kOmegaSST.C  |  22 +-
 .../incompressible/RAS/kOmegaSST/kOmegaSST.H  |   4 +-
 .../incompressible/RAS/laminar/laminar.H      |   2 +-
 .../RAS/realizableKE/realizableKE.C           |  10 +-
 .../RAS/realizableKE/realizableKE.H           |   4 +-
 .../turbulenceModel/turbulenceModel.C         |  20 +-
 141 files changed, 928 insertions(+), 819 deletions(-)
 create mode 100644 etc/constant/RASProperties
 delete mode 100644 src/turbulenceModels/LES/LESdeltas/LESdelta/newDelta.C
 delete mode 100644 src/turbulenceModels/LES/LESfilters/LESfilter/newFilter.C
 delete mode 100644 src/turbulenceModels/compressible/LES/LESModel/newLESModel.C
 delete mode 100644 src/turbulenceModels/compressible/RAS/RASModel/newRASModel.C

diff --git a/applications/test/dictionary/dictionaryTest.C b/applications/test/dictionary/dictionaryTest.C
index 611a4cc8f5..d958d81a1a 100644
--- a/applications/test/dictionary/dictionaryTest.C
+++ b/applications/test/dictionary/dictionaryTest.C
@@ -52,10 +52,17 @@ int main(int argc, char *argv[])
 
         Info<< "dict1.toc(): " << dict1.name() << " " << dict1.toc() << nl
             << "dict2.toc(): " << dict2.name() << " " << dict2.toc() << endl;
-        
+
         // copy back
         dict1 = dict2;
         Info<< "dict1.toc(): " << dict1.name() << " " << dict1.toc() << endl;
+
+        dictionary dict3(dict2.subDictPtr("boundaryField"));
+        dictionary dict4(dict2.subDictPtr("NONEXISTENT"));
+
+        Info<< "dictionary construct from pointer" << nl
+            << "ok = " << dict3.name() << " " << dict3.toc() << nl
+            << "no = " << dict4.name() << " " << dict4.toc() << endl;
     }
 
 
diff --git a/etc/constant/RASProperties b/etc/constant/RASProperties
new file mode 100644
index 0000000000..f0134fe4e6
--- /dev/null
+++ b/etc/constant/RASProperties
@@ -0,0 +1,235 @@
+/*--------------------------------*- 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;
+    note        "default coefficients for RAS models";
+    location    "constant";
+    object      RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+wallFunctionCoeffs
+{
+    kappa       0.4187;
+    E           9;
+}
+
+
+kEpsilonCoeffs
+{
+    Cmu         0.09;
+    C1          1.44;
+    C2          1.92;
+    C3          -0.33;  // only for compressible
+    alphak      1.0;    // only for compressible
+    alphaEps    0.76923;
+    alphah      1.0;    // only for compressible
+}
+
+
+RNGkEpsilonCoeffs
+{
+    Cmu         0.0845;
+    C1          1.42;
+    C2          1.68;
+    C3          -0.33;  // only for compressible
+    alphak      1.39;
+    alphaEps    1.39;
+    alphah      1.0;    // only for compressible
+    eta0        4.38;
+    beta        0.012;
+}
+
+
+realizableKECoeffs
+{
+    Cmu         0.09;
+    A0          4.0;
+    C2          1.9;
+    alphak      1.0;
+    alphaEps    0.833333;
+    alphah      1.0;    // only for compressible
+}
+
+
+kOmegaSSTCoeffs
+{
+    alphaK1     0.85034;
+    alphaK2     1.0;
+    alphaOmega1 0.5;
+    alphaOmega2 0.85616;
+    alphah      1.0;    // only for compressible
+    beta1       0.075;
+    beta2       0.0828;
+    betaStar    0.09;
+    gamma1      0.5532;
+    gamma2      0.4403;
+    a1          0.31;
+    c1          10.0;
+}
+
+
+LaunderGibsonRSTMCoeffs
+{
+    Cmu         0.09;
+    Clg1        1.8;
+    Clg2        0.6;
+    C1          1.44;
+    C2          1.92;
+    C1Ref       0.5;
+    C2Ref       0.3;
+    Cs          0.25;
+    Ceps        0.15;
+    alphah      1.0;    // only for compressible
+    alphaEps    0.76923;
+    alphaR      1.22;
+    couplingFactor  0.0;
+}
+
+
+LaunderSharmaKECoeffs
+{
+    Cmu         0.09;
+    C1          1.44;
+    C2          1.92;
+    C3          -0.33;
+    alphah      1.0;    // only for compressible
+    alphahk     1.0;    // only for compressible
+    alphaEps    0.76923;
+}
+
+
+LRRCoeffs
+{
+    Cmu         0.09;
+    Clrr1       1.8;
+    Clrr2       0.6;
+    C1          1.44;
+    C2          1.92;
+    Cs          0.25;
+    Ceps        0.15;
+    alphah      1.0;        // only for compressible
+    alphaEps    0.76923;
+    alphaR      1.22;       // only for compressible
+    couplingFactor  0.0;    // only for incompressible
+}
+
+
+SpalartAllmarasCoeffs
+{
+    Cb1         0.1355;
+    Cb2         0.622;
+    Cw2         0.3;
+    Cw3         2.0;
+    Cv1         7.1;
+    Cv2         5.0;
+    alphaNut    1.5;
+    alphah      1.0;    // only for compressible
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// incompressible only:
+
+kOmegaCoeffs
+{
+    betaStar    0.09;
+    alpha       0.52;
+    beta        0.072;
+    alphak      0.5;
+    alphaOmega  0.5;
+    Cmu         $betaStar;  // equivalent to betaStar
+}
+
+
+LamBremhorstKECoeffs
+{
+    Cmu         0.09;
+    C1          1.44;
+    C2          1.92;
+    alphaEps    0.76923;
+}
+
+
+LienCubicKECoeffs
+{
+    C1              1.44;
+    C2              1.92;
+    alphak          1;
+    alphaEps        0.76923;
+    A1              1.25;
+    A2              1000;
+    Ctau1           -4;
+    Ctau2           13;
+    Ctau3           -2;
+    alphaKsi        0.9;
+}
+
+
+LienCubicKELowReCoeffs
+{
+    Cmu             0.09;
+    C1              1.44;
+    C2              1.92;
+    alphak          1;
+    alphaEps        0.76923;
+    A1              1.25;
+    A2              1000;
+    Ctau1           -4;
+    Ctau2           13;
+    Ctau3           -2;
+    alphaKsi        0.9;
+    Am              0.016;
+    Aepsilon        0.263;
+    Amu             0.00222;
+}
+
+
+LienLeschzinerLowReCoeffs
+{
+    Cmu             0.09;
+    C1              1.44;
+    C2              1.92;
+    alphak          1;
+    alphaEps        0.76923;
+    Am              0.016;
+    Aepsilon        0.263;
+    Amu             0.00222;
+}
+
+
+NonlinearKEShihCoeffs
+{
+    Cmu             0.09;  // only for boundary conditions?
+    C1              1.44;
+    C2              1.92;
+    alphak          1;
+    alphaEps        0.76932;
+    A1              1.25;
+    A2              1000;
+    Ctau1           -4;
+    Ctau2           13;
+    Ctau3           -2;
+    alphaKsi        0.9;
+}
+
+QZetaCoeffs
+{
+    Cmu             0.09;
+    C1              1.44;
+    C2              1.92;
+    alphaZeta       0.76923;
+    anisotropic     false;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/dictionary/dictionary.C b/src/OpenFOAM/db/dictionary/dictionary.C
index 5e76ecd612..fb6f28af5b 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.C
+++ b/src/OpenFOAM/db/dictionary/dictionary.C
@@ -160,6 +160,20 @@ Foam::dictionary::dictionary
 }
 
 
+Foam::dictionary::dictionary
+(
+    const dictionary* dictPtr
+)
+:
+    parent_(dictionary::null)
+{
+    if (dictPtr)
+    {
+        operator=(*dictPtr);
+    }
+}
+
+
 Foam::dictionary::dictionary
 (
     const dictionary& parentDict,
diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H
index 68fe20004c..31ac314237 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.H
+++ b/src/OpenFOAM/db/dictionary/dictionary.H
@@ -168,6 +168,10 @@ public:
         //- Construct top-level dictionary as copy
         dictionary(const dictionary&);
 
+        //- Construct top-level dictionary as copy from pointer to dictionary.
+        //  A null pointer is treated like an empty dictionary.
+        dictionary(const dictionary*);
+
         //- Construct by transferring parameter contents given parent dictionary
         dictionary(const dictionary& parentDict, const Xfer<dictionary>&);
 
diff --git a/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C b/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
index 91868fb605..5f4283859a 100644
--- a/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
+++ b/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
@@ -59,6 +59,35 @@ LESdelta::LESdelta(const word& name, const fvMesh& mesh)
 {}
 
 
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+autoPtr<LESdelta> LESdelta::New
+(
+    const word& name,
+    const fvMesh& mesh,
+    const dictionary& dict
+)
+{
+    word deltaType(dict.lookup("delta"));
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(deltaType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "LESdelta::New(const fvMesh&, const dictionary&)"
+        )   << "Unknown LESdelta type " << deltaType << endl << endl
+            << "Valid LESdelta types are :" << endl
+            << dictionaryConstructorTablePtr_->toc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<LESdelta>(cstrIter()(name, mesh, dict));
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H b/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H
index d67eab62fe..106cf01e5c 100644
--- a/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H
+++ b/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H
@@ -50,7 +50,7 @@ namespace Foam
 class fvMesh;
 
 /*---------------------------------------------------------------------------*\
-                           Class LESdelta Declaration
+                          Class LESdelta Declaration
 \*---------------------------------------------------------------------------*/
 
 class LESdelta
@@ -99,7 +99,7 @@ public:
     // Constructors
 
         //- Construct from name and mesh
-        LESdelta(const word& name, const fvMesh& mesh);
+        LESdelta(const word& name, const fvMesh&);
 
 
     // Selectors
@@ -108,8 +108,8 @@ public:
         static autoPtr<LESdelta> New
         (
             const word& name,
-            const fvMesh& mesh,
-            const dictionary& LESdeltaDict
+            const fvMesh&,
+            const dictionary&
         );
 
 
diff --git a/src/turbulenceModels/LES/LESdeltas/LESdelta/newDelta.C b/src/turbulenceModels/LES/LESdeltas/LESdelta/newDelta.C
deleted file mode 100644
index 5fb34eb8dc..0000000000
--- a/src/turbulenceModels/LES/LESdeltas/LESdelta/newDelta.C
+++ /dev/null
@@ -1,70 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  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 "LESdelta.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-autoPtr<LESdelta> LESdelta::New
-(
-    const word& name,
-    const fvMesh& mesh,
-    const dictionary& LESdeltaDict
-)
-{
-    word LESdeltaType
-    (
-        LESdeltaDict.lookup("delta")
-    );
-
-    dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(LESdeltaType);
-
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
-    {
-        FatalErrorIn
-        (
-            "LESdelta::New(const fvMesh& mesh, dictionary LESdeltaDict)"
-        )   << "Unknown LESdelta type " << LESdeltaType << endl << endl
-            << "Valid LESdelta types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
-            << exit(FatalError);
-    }
-
-    return autoPtr<LESdelta>(cstrIter()(name, mesh, LESdeltaDict));
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/LESdeltas/Make/files b/src/turbulenceModels/LES/LESdeltas/Make/files
index a86d1b629f..a251397639 100644
--- a/src/turbulenceModels/LES/LESdeltas/Make/files
+++ b/src/turbulenceModels/LES/LESdeltas/Make/files
@@ -1,5 +1,4 @@
 LESdelta/LESdelta.C
-LESdelta/newDelta.C
 cubeRootVolDelta/cubeRootVolDelta.C
 PrandtlDelta/PrandtlDelta.C
 smoothDelta/smoothDelta.C
diff --git a/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C b/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C
index ca8b5107fe..e77e00f189 100644
--- a/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C
+++ b/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C
@@ -38,8 +38,37 @@ namespace Foam
 defineTypeNameAndDebug(LESfilter, 0);
 defineRunTimeSelectionTable(LESfilter, dictionary);
 
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+autoPtr<LESfilter> LESfilter::New
+(
+    const fvMesh& mesh,
+    const dictionary& dict
+)
+{
+    word filterType(dict.lookup("filter"));
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(filterType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "LESfilter::New(const fvMesh&, const dictionary&)"
+        )   << "Unknown LESfilter type " << filterType << endl << endl
+            << "Valid LESfilter types are :" << endl
+            << dictionaryConstructorTablePtr_->toc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<LESfilter>(cstrIter()(mesh, dict));
+}
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+
 } // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.H b/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.H
index 54fde1355d..ffb04f6aa8 100644
--- a/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.H
+++ b/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.H
@@ -102,8 +102,8 @@ public:
         //- Return a reference to the selected LES filter
         static autoPtr<LESfilter> New
         (
-            const fvMesh& mesh,
-            const dictionary& LESfilterDict
+            const fvMesh&,
+            const dictionary&
         );
 
 
diff --git a/src/turbulenceModels/LES/LESfilters/LESfilter/newFilter.C b/src/turbulenceModels/LES/LESfilters/LESfilter/newFilter.C
deleted file mode 100644
index 56feaf3746..0000000000
--- a/src/turbulenceModels/LES/LESfilters/LESfilter/newFilter.C
+++ /dev/null
@@ -1,69 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  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 "LESfilter.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-autoPtr<LESfilter> LESfilter::New
-(
-    const fvMesh& mesh,
-    const dictionary& LESfilterDict
-)
-{
-    word LESfilterType
-    (
-        LESfilterDict.lookup("filter")
-    );
-
-    dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(LESfilterType);
-
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
-    {
-        FatalErrorIn
-        (
-            "LESfilter::New(const fvMesh& mesh, dictionary LESfilterDict)"
-        )   << "Unknown LESfilter type " << LESfilterType << endl << endl
-            << "Valid LESfilter types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
-            << exit(FatalError);
-    }
-
-    return autoPtr<LESfilter>(cstrIter()(mesh, LESfilterDict));
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/LESfilters/Make/files b/src/turbulenceModels/LES/LESfilters/Make/files
index 5671216381..864b819f32 100644
--- a/src/turbulenceModels/LES/LESfilters/Make/files
+++ b/src/turbulenceModels/LES/LESfilters/Make/files
@@ -1,7 +1,6 @@
 LESfilter/LESfilter.C
-LESfilter/newFilter.C
 simpleFilter/simpleFilter.C
 laplaceFilter/laplaceFilter.C
-anisotropicFilter/anisotropicFilter.C 
+anisotropicFilter/anisotropicFilter.C
 
 LIB = $(FOAM_LIBBIN)/libLESfilters
diff --git a/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C b/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
index e847acda6e..f961b5321b 100644
--- a/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
+++ b/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
@@ -69,7 +69,7 @@ DeardorffDiffStress::DeardorffDiffStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            coeffDict(),
+            coeffDict_,
             0.094
         )
     ),
@@ -78,7 +78,7 @@ DeardorffDiffStress::DeardorffDiffStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "cm",
-            coeffDict(),
+            coeffDict_,
             4.13
         )
     )
diff --git a/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.H b/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
index 510c304f20..bb07f6f46e 100644
--- a/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
+++ b/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
@@ -125,7 +125,7 @@ public:
         //- Correct Eddy-Viscosity and related properties
         virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
index 61907f0c5b..6ea794fb42 100644
--- a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
+++ b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
@@ -55,7 +55,7 @@ GenEddyVisc::GenEddyVisc
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ce",
-            coeffDict(),
+            coeffDict_,
             1.048
         )
     ),
diff --git a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H
index 5690b26a48..fd371c20f0 100644
--- a/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H
+++ b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H
@@ -136,7 +136,7 @@ public:
         //- Correct Eddy-Viscosity and related properties
         virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C
index 4c8089851a..c8dea6a34f 100644
--- a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C
+++ b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C
@@ -59,7 +59,7 @@ GenSGSStress::GenSGSStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ce",
-            coeffDict(),
+            coeffDict_,
             1.048
         )
     ),
diff --git a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H
index 6425d86b49..277f786ff1 100644
--- a/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H
+++ b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H
@@ -141,7 +141,7 @@ public:
         //- Correct Eddy-Viscosity and related properties
         virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
index 3e7b3eabf4..be0f44ed0a 100644
--- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
+++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
@@ -77,7 +77,7 @@ LESModel::LESModel
     ),
 
     printCoeffs_(lookupOrDefault<Switch>("printCoeffs", false)),
-    coeffDict_(subDict(type + "Coeffs")),
+    coeffDict_(subDictPtr(type + "Coeffs")),
 
     k0_("k0", dimVelocity*dimVelocity, SMALL),
 
@@ -87,6 +87,59 @@ LESModel::LESModel
 }
 
 
+// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
+
+autoPtr<LESModel> LESModel::New
+(
+    const volScalarField& rho,
+    const volVectorField& U,
+    const surfaceScalarField& phi,
+    const basicThermo& thermoPhysicalModel
+)
+{
+    word modelName;
+
+    // Enclose the creation of the dictionary to ensure it is deleted
+    // before the turbulenceModel is created otherwise the dictionary is
+    // entered in the database twice
+    {
+        IOdictionary dict
+        (
+            IOobject
+            (
+                "LESProperties",
+                U.time().constant(),
+                U.db(),
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE
+            )
+        );
+
+        dict.lookup("LESModel") >> modelName;
+    }
+
+    Info<< "Selecting LES turbulence model " << modelName << endl;
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(modelName);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "LESModel::New(const volVectorField& U, const "
+            "surfaceScalarField& phi, const basicThermo&)"
+        )   << "Unknown LESModel type " << modelName
+            << endl << endl
+            << "Valid LESModel types are :" << endl
+            << dictionaryConstructorTablePtr_->toc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<LESModel>(cstrIter()(rho, U, phi, thermoPhysicalModel));
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void LESModel::correct(const tmp<volTensorField>&)
@@ -105,7 +158,10 @@ bool LESModel::read()
 {
     if (regIOobject::read())
     {
-        coeffDict_ = subDict(type() + "Coeffs");
+        if (const dictionary* dictPtr = subDictPtr(type() + "Coeffs"))
+        {
+            coeffDict_ <<= *dictPtr;
+        }
 
         delta_().read(*this);
 
diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.H b/src/turbulenceModels/compressible/LES/LESModel/LESModel.H
index dec3e88c0f..c52c21471e 100644
--- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.H
+++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.H
@@ -38,7 +38,7 @@ Description
     This class defines the basic interface for a compressible flow SGS model,
     and encapsulates data of value to all possible models. In particular
     this includes references to all the dependent fields (rho, U, phi),
-    the physical viscosity mu, and the turbulenceProperties dictionary
+    the physical viscosity mu, and the LESProperties dictionary,
     which contains the model selection and model coefficients.
 
 SourceFiles
@@ -160,9 +160,10 @@ public:
 
     // Member Functions
 
-        //- Access the dictionary which provides info. about choice of
-        //  models, and all related data (particularly model coefficients).
-        inline dictionary& coeffDict()
+        //- Const access to the coefficients dictionary,
+        //  which provides info. about choice of models,
+        //  and all related data (particularly model coefficients).
+        inline const dictionary& coeffDict() const
         {
             return coeffDict_;
         }
@@ -254,7 +255,7 @@ public:
         //- Correct Eddy-Viscosity and related properties
         virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read() = 0;
 };
 
diff --git a/src/turbulenceModels/compressible/LES/LESModel/newLESModel.C b/src/turbulenceModels/compressible/LES/LESModel/newLESModel.C
deleted file mode 100644
index 179543c650..0000000000
--- a/src/turbulenceModels/compressible/LES/LESModel/newLESModel.C
+++ /dev/null
@@ -1,94 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  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 "LESModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-autoPtr<LESModel> LESModel::New
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const basicThermo& thermoPhysicalModel
-)
-{
-    word LESModelTypeName;
-
-    // Enclose the creation of the turbulencePropertiesDict to ensure it is
-    // deleted before the turbulenceModel is created otherwise the dictionary
-    // is entered in the database twice
-    {
-        IOdictionary turbulencePropertiesDict
-        (
-            IOobject
-            (
-                "LESProperties",
-                U.time().constant(),
-                U.db(),
-                IOobject::MUST_READ,
-                IOobject::NO_WRITE
-            )
-        );
-
-        turbulencePropertiesDict.lookup("LESModel") >> LESModelTypeName;
-    }
-
-    Info<< "Selecting LES turbulence model " << LESModelTypeName << endl;
-
-    dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(LESModelTypeName);
-
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
-    {
-        FatalErrorIn
-        (
-            "LESModel::New(const volVectorField& U, const "
-            "surfaceScalarField& phi, const basicThermo&)"
-        )   << "Unknown LESModel type " << LESModelTypeName
-            << endl << endl
-            << "Valid LESModel types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
-            << exit(FatalError);
-    }
-
-    return autoPtr<LESModel>(cstrIter()(rho, U, phi, thermoPhysicalModel));
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/Make/files b/src/turbulenceModels/compressible/LES/Make/files
index 06e7b76d45..dec34b8c2d 100644
--- a/src/turbulenceModels/compressible/LES/Make/files
+++ b/src/turbulenceModels/compressible/LES/Make/files
@@ -1,5 +1,4 @@
 LESModel/LESModel.C
-LESModel/newLESModel.C
 GenEddyVisc/GenEddyVisc.C
 GenSGSStress/GenSGSStress.C
 
diff --git a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C
index c89b2aeecf..276ecc538d 100644
--- a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C
+++ b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C
@@ -77,7 +77,7 @@ Smagorinsky::Smagorinsky
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            coeffDict(),
+            coeffDict_,
             0.02
         )
     )
diff --git a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H
index ba296a87f9..a795b47fe1 100644
--- a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H
+++ b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H
@@ -111,7 +111,7 @@ public:
         //- Correct Eddy-Viscosity and related properties
         virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
index 65a6a69bde..5c8945616d 100644
--- a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
@@ -114,7 +114,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaNut",
-            coeffDict(),
+            coeffDict_,
             1.5
         )
     ),
@@ -124,7 +124,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cb1",
-            coeffDict(),
+            coeffDict_,
             0.1355
         )
     ),
@@ -133,7 +133,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cb2",
-            coeffDict(),
+            coeffDict_,
             0.622
         )
     ),
@@ -142,7 +142,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cv1",
-            coeffDict(),
+            coeffDict_,
             7.1
         )
     ),
@@ -151,7 +151,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cv2",
-            coeffDict(),
+            coeffDict_,
             5.0
         )
     ),
@@ -160,7 +160,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "CDES",
-            coeffDict(),
+            coeffDict_,
             0.65
         )
     ),
@@ -169,7 +169,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            coeffDict(),
+            coeffDict_,
             0.07
         )
     ),
@@ -188,7 +188,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cw2",
-            coeffDict(),
+            coeffDict_,
             0.3
         )
     ),
@@ -197,7 +197,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cw3",
-            coeffDict(),
+            coeffDict_,
             2.0
         )
     ),
diff --git a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H
index e119768537..d01bd23f4e 100644
--- a/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H
@@ -159,7 +159,7 @@ public:
         //- Correct nuTilda and related properties
         virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
index 987cd21f29..3be2aa0c00 100644
--- a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
@@ -117,12 +117,14 @@ void muSgsWallFunctionFvPatchScalarField::evaluate
     const Pstream::commsTypes
 )
 {
-    const LESModel& sgsModel
-        = db().lookupObject<LESModel>("LESProperties");
+    const LESModel& lesModel = db().lookupObject<LESModel>("LESProperties");
 
-    scalar kappa = readScalar(sgsModel.lookup("kappa"));
-
-    scalar E = readScalar(sgsModel.subDict("wallFunctionCoeffs").lookup("E"));
+    // TODO: make these lookups optional (or more robust)?
+    const scalar kappa = readScalar(lesModel.lookup("kappa"));
+    const scalar E = readScalar
+    (
+        lesModel.subDict("wallFunctionCoeffs").lookup("E")
+    );
 
     const scalarField& ry = patch().deltaCoeffs();
 
diff --git a/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.H b/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.H
index a32dacddfd..5bb0d72752 100644
--- a/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.H
+++ b/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.H
@@ -131,7 +131,7 @@ public:
         //- Correct Eddy-Viscosity and related properties
         virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C b/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C
index b5670ad245..65d5497c96 100644
--- a/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C
+++ b/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C
@@ -72,7 +72,7 @@ lowReOneEqEddy::lowReOneEqEddy
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            coeffDict(),
+            coeffDict_,
             0.07
         )
     ),
@@ -81,7 +81,7 @@ lowReOneEqEddy::lowReOneEqEddy
         dimensioned<scalar>::lookupOrAddToDict
         (
             "beta",
-            coeffDict(),
+            coeffDict_,
             0.01
         )
     )
diff --git a/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.H b/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.H
index 9820905a41..6b892b3cc9 100644
--- a/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.H
+++ b/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.H
@@ -122,7 +122,7 @@ public:
         //- Correct Eddy-Viscosity and related properties
         virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C
index 414aba5b03..67a6744b28 100644
--- a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C
+++ b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C
@@ -68,7 +68,7 @@ oneEqEddy::oneEqEddy
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            coeffDict(),
+            coeffDict_,
             0.094
         )
     )
diff --git a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H
index 2a9bb74591..14a180a046 100644
--- a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H
+++ b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H
@@ -125,7 +125,7 @@ public:
         //- Correct Eddy-Viscosity and related properties
         virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/compressible/RAS/LRR/LRR.C b/src/turbulenceModels/compressible/RAS/LRR/LRR.C
index a6588ba17c..133026c0bd 100644
--- a/src/turbulenceModels/compressible/RAS/LRR/LRR.C
+++ b/src/turbulenceModels/compressible/RAS/LRR/LRR.C
@@ -290,17 +290,17 @@ bool LRR::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        Clrr1_.readIfPresent(coeffDict_);
-        Clrr2_.readIfPresent(coeffDict_);
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        Cs_.readIfPresent(coeffDict_);
-        Ceps_.readIfPresent(coeffDict_);
-        alphaR_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
-        alphah_.readIfPresent(coeffDict_);
-        couplingFactor_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        Clrr1_.readIfPresent(coeffDict());
+        Clrr2_.readIfPresent(coeffDict());
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        Cs_.readIfPresent(coeffDict());
+        Ceps_.readIfPresent(coeffDict());
+        alphaR_.readIfPresent(coeffDict());
+        alphaEps_.readIfPresent(coeffDict());
+        alphah_.readIfPresent(coeffDict());
+        couplingFactor_.readIfPresent(coeffDict());
 
         if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
         {
diff --git a/src/turbulenceModels/compressible/RAS/LRR/LRR.H b/src/turbulenceModels/compressible/RAS/LRR/LRR.H
index 22bf84b067..c51b41490f 100644
--- a/src/turbulenceModels/compressible/RAS/LRR/LRR.H
+++ b/src/turbulenceModels/compressible/RAS/LRR/LRR.H
@@ -184,7 +184,7 @@ public:
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index e677d86a50..ee2edcb55e 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -312,20 +312,20 @@ bool LaunderGibsonRSTM::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        Clg1_.readIfPresent(coeffDict_);
-        Clg2_.readIfPresent(coeffDict_);
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        Cs_.readIfPresent(coeffDict_);
-        Ceps_.readIfPresent(coeffDict_);
-        C1Ref_.readIfPresent(coeffDict_);
-        C2Ref_.readIfPresent(coeffDict_);
-        alphaR_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
-        alphah_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        Clg1_.readIfPresent(coeffDict());
+        Clg2_.readIfPresent(coeffDict());
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        Cs_.readIfPresent(coeffDict());
+        Ceps_.readIfPresent(coeffDict());
+        C1Ref_.readIfPresent(coeffDict());
+        C2Ref_.readIfPresent(coeffDict());
+        alphaR_.readIfPresent(coeffDict());
+        alphaEps_.readIfPresent(coeffDict());
+        alphah_.readIfPresent(coeffDict());
 
-        couplingFactor_.readIfPresent(coeffDict_);
+        couplingFactor_.readIfPresent(coeffDict());
 
         if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
         {
diff --git a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
index a7903fd2d8..450da9e6e7 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
+++ b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
@@ -191,7 +191,7 @@ public:
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
index 4a80d3f52c..1db5bdb72e 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -233,13 +233,13 @@ bool LaunderSharmaKE::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        C3_.readIfPresent(coeffDict_);
-        alphak_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
-        alphah_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        C3_.readIfPresent(coeffDict());
+        alphak_.readIfPresent(coeffDict());
+        alphaEps_.readIfPresent(coeffDict());
+        alphah_.readIfPresent(coeffDict());
 
         return true;
     }
diff --git a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
index d19386a27c..28cee3928b 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
@@ -173,7 +173,7 @@ public:
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/compressible/RAS/Make/files b/src/turbulenceModels/compressible/RAS/Make/files
index 0598d06a00..4d00100ad6 100644
--- a/src/turbulenceModels/compressible/RAS/Make/files
+++ b/src/turbulenceModels/compressible/RAS/Make/files
@@ -1,6 +1,5 @@
 /* RAS turbulence models */
 RASModel/RASModel.C
-RASModel/newRASModel.C
 laminar/laminar.C
 kEpsilon/kEpsilon.C
 RNGkEpsilon/RNGkEpsilon.C
diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
index f52646af28..5d46b78788 100644
--- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
+++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
@@ -80,9 +80,9 @@ RASModel::RASModel
 
     turbulence_(lookup("turbulence")),
     printCoeffs_(lookupOrDefault<Switch>("printCoeffs", false)),
-    coeffDict_(subDict(type + "Coeffs")),
+    coeffDict_(subDictPtr(type + "Coeffs")),
 
-    wallFunctionDict_(subDict("wallFunctionCoeffs")),
+    wallFunctionDict_(subDictPtr("wallFunctionCoeffs")),
     kappa_
     (
         dimensioned<scalar>::lookupOrAddToDict
@@ -132,6 +132,63 @@ RASModel::RASModel
 {}
 
 
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+autoPtr<RASModel> RASModel::New
+(
+    const volScalarField& rho,
+    const volVectorField& U,
+    const surfaceScalarField& phi,
+    const basicThermo& thermophysicalModel
+)
+{
+    word modelName;
+
+    // Enclose the creation of the dictionary to ensure it is deleted
+    // before the turbulenceModel is created otherwise the dictionary is
+    // entered in the database twice
+    {
+        IOdictionary dict
+        (
+            IOobject
+            (
+                "RASProperties",
+                U.time().constant(),
+                U.db(),
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE
+            )
+        );
+
+        dict.lookup("RASModel") >> modelName;
+    }
+
+    Info<< "Selecting RAS turbulence model " << modelName << endl;
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(modelName);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "RASModel::New(const volScalarField&, "
+            "const volVectorField&, const surfaceScalarField&, "
+            "basicThermo&)"
+        )   << "Unknown RASModel type " << modelName
+            << endl << endl
+            << "Valid RASModel types are :" << endl
+            << dictionaryConstructorTablePtr_->toc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<RASModel>
+    (
+        cstrIter()(rho, U, phi, thermophysicalModel)
+    );
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 scalar RASModel::yPlusLam(const scalar kappa, const scalar E) const
@@ -193,9 +250,17 @@ bool RASModel::read()
     if (regIOobject::read())
     {
         lookup("turbulence") >> turbulence_;
-        coeffDict_ = subDict(type() + "Coeffs");
 
-        wallFunctionDict_ = subDict("wallFunctionCoeffs");
+        if (const dictionary* dictPtr = subDictPtr(type() + "Coeffs"))
+        {
+            coeffDict_ <<= *dictPtr;
+        }
+
+        if (const dictionary* dictPtr = subDictPtr("wallFunctionCoeffs"))
+        {
+            wallFunctionDict_ <<= *dictPtr;
+        }
+
         kappa_.readIfPresent(wallFunctionDict_);
         E_.readIfPresent(wallFunctionDict_);
         Cmu_.readIfPresent(wallFunctionDict_);
diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
index 7479eb4c55..7c787d8ceb 100644
--- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
+++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
@@ -351,7 +351,7 @@ public:
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct() = 0;
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read() = 0;
 };
 
diff --git a/src/turbulenceModels/compressible/RAS/RASModel/newRASModel.C b/src/turbulenceModels/compressible/RAS/RASModel/newRASModel.C
deleted file mode 100644
index 2743483a8a..0000000000
--- a/src/turbulenceModels/compressible/RAS/RASModel/newRASModel.C
+++ /dev/null
@@ -1,99 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  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 "RASModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-autoPtr<RASModel> RASModel::New
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const basicThermo& thermophysicalModel
-)
-{
-    word RASModelTypeName;
-
-    // Enclose the creation of the turbulencePropertiesDict to ensure it is
-    // deleted before the RASModel is created otherwise the dictionary
-    // is entered in the database twice
-    {
-        IOdictionary turbulencePropertiesDict
-        (
-            IOobject
-            (
-                "RASProperties",
-                U.time().constant(),
-                U.db(),
-                IOobject::MUST_READ,
-                IOobject::NO_WRITE
-            )
-        );
-
-        turbulencePropertiesDict.lookup("RASModel")
-            >> RASModelTypeName;
-    }
-
-    Info<< "Selecting RAS turbulence model " << RASModelTypeName << endl;
-
-    dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(RASModelTypeName);
-
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
-    {
-        FatalErrorIn
-        (
-            "RASModel::New(const volScalarField&, "
-            "const volVectorField&, const surfaceScalarField&, "
-            "basicThermo&)"
-        )   << "Unknown RASModel type " << RASModelTypeName
-            << endl << endl
-            << "Valid RASModel types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
-            << exit(FatalError);
-    }
-
-    return autoPtr<RASModel>
-    (
-        cstrIter()(rho, U, phi, thermophysicalModel)
-    );
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
index 9e50de343f..d019b029db 100644
--- a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -253,15 +253,15 @@ bool RNGkEpsilon::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        C3_.readIfPresent(coeffDict_);
-        alphak_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
-        alphah_.readIfPresent(coeffDict_);
-        eta0_.readIfPresent(coeffDict_);
-        beta_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        C3_.readIfPresent(coeffDict());
+        alphak_.readIfPresent(coeffDict());
+        alphaEps_.readIfPresent(coeffDict());
+        alphah_.readIfPresent(coeffDict());
+        eta0_.readIfPresent(coeffDict());
+        beta_.readIfPresent(coeffDict());
 
         return true;
     }
diff --git a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H
index b599375f15..f7d8570ec8 100644
--- a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H
+++ b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H
@@ -171,7 +171,7 @@ public:
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
index fe78e344ca..4825c6464a 100644
--- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -279,16 +279,16 @@ bool SpalartAllmaras::read()
 {
     if (RASModel::read())
     {
-        alphaNut_.readIfPresent(coeffDict_);
-        alphah_.readIfPresent(coeffDict_);
+        alphaNut_.readIfPresent(coeffDict());
+        alphah_.readIfPresent(coeffDict());
 
-        Cb1_.readIfPresent(coeffDict_);
-        Cb2_.readIfPresent(coeffDict_);
+        Cb1_.readIfPresent(coeffDict());
+        Cb2_.readIfPresent(coeffDict());
         Cw1_ = Cb1_/sqr(kappa_) + alphaNut_*(1.0 + Cb2_);
-        Cw2_.readIfPresent(coeffDict_);
-        Cw3_.readIfPresent(coeffDict_);
-        Cv1_.readIfPresent(coeffDict_);
-        Cv2_.readIfPresent(coeffDict_);
+        Cw2_.readIfPresent(coeffDict());
+        Cw3_.readIfPresent(coeffDict());
+        Cv1_.readIfPresent(coeffDict());
+        Cv2_.readIfPresent(coeffDict());
 
         return true;
     }
diff --git a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
index fe07de8344..5a75616347 100644
--- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
@@ -227,7 +227,7 @@ public:
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
index b4a12a792b..bb43576ac8 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
@@ -148,9 +148,9 @@ void turbulentHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
 
     const label patchI = patch().index();
 
-    const RASModel& ras = db().lookupObject<RASModel>("RASProperties");
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
-    const scalarField alphaEffp = ras.alphaEff()().boundaryField()[patchI];
+    const scalarField alphaEffp = rasModel.alphaEff()().boundaryField()[patchI];
 
     const basicThermo& thermo =
         db().lookupObject<basicThermo>("thermophysicalProperties");
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
index 6346c9be93..2e44d03c73 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
@@ -108,16 +108,15 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::updateCoeffs()
     }
 
     // Lookup Cmu corresponding to the turbulence model selected
-    const compressible::RASModel& RAS =
-        db().lookupObject<compressible::RASModel>("RASProperties");
-    scalar Cmu = readScalar(RAS.coeffDict().lookup("Cmu"));
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
-    scalar Cmu75 = pow(Cmu, 0.75);
+    const scalar Cmu = readScalar(rasModel.coeffDict().lookup("Cmu"));
+    const scalar Cmu75 = pow(Cmu, 0.75);
 
-    const fvPatchField<scalar>& k =
+    const fvPatchField<scalar>& kp =
         patch().lookupPatchField<volScalarField, scalar>("k");
 
-    operator==(Cmu75*k*sqrt(k)/mixingLength_);
+    operator==(Cmu75*kp*sqrt(kp)/mixingLength_);
 
     fixedValueFvPatchField<scalar>::updateCoeffs();
 }
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
index 41eeeee322..4032af3586 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
@@ -76,7 +76,7 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField
 :
     fixedValueFvPatchField<scalar>(p, iF, dict),
     mixingLength_(readScalar(dict.lookup("mixingLength"))),
-    kName_(dict.lookup("k"))
+    kName_(dict.lookupOrDefault<word>("k", "k"))
 {}
 
 turbulentMixingLengthFrequencyInletFvPatchScalarField::
@@ -113,11 +113,10 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs()
     }
 
     // Lookup Cmu corresponding to the turbulence model selected
-    const compressible::RASModel& RAS =
-        db().lookupObject<compressible::RASModel>("RASProperties");
-    scalar Cmu = readScalar(RAS.coeffDict().lookup("Cmu"));
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
-    scalar Cmu25 = pow(Cmu, 0.25);
+    const scalar Cmu = readScalar(rasModel.coeffDict().lookup("Cmu"));
+    const scalar Cmu25 = pow(Cmu, 0.25);
 
     const fvPatchField<scalar>& kp =
         patch().lookupPatchField<volScalarField, scalar>(kName_);
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
index 6b2974b04f..0c125200b5 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
@@ -107,8 +107,8 @@ alphatWallFunctionFvPatchScalarField
 
 void alphatWallFunctionFvPatchScalarField::updateCoeffs()
 {
-    const RASModel& ras = db().lookupObject<RASModel>("RASProperties");
-    const scalar Prt = ras.Prt().value();
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const scalar Prt = rasModel.Prt().value();
 
     const scalarField& mutw =
         patch().lookupPatchField<volScalarField, scalar>(mutName_);
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
index d7b7547e0a..52ed1896e7 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
@@ -154,15 +154,15 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
 
 void epsilonWallFunctionFvPatchScalarField::updateCoeffs()
 {
-    const RASModel& ras = db().lookupObject<RASModel>("RASProperties");
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
-    const scalar Cmu = ras.Cmu().value();
+    const scalar Cmu = rasModel.Cmu().value();
     const scalar Cmu25 = pow(Cmu, 0.25);
     const scalar Cmu75 = pow(Cmu, 0.75);
-    const scalar kappa = ras.kappa().value();
-    const scalar yPlusLam = ras.yPlusLam();
+    const scalar kappa = rasModel.kappa().value();
+    const scalar yPlusLam = rasModel.yPlusLam();
 
-    const scalarField& y = ras.y()[patch().index()];
+    const scalarField& y = rasModel.y()[patch().index()];
 
     volScalarField& G = const_cast<volScalarField&>
         (db().lookupObject<volScalarField>(GName_));
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.C
index c772d95bff..38a275aeb5 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.C
@@ -182,15 +182,15 @@ void mutRoughWallFunctionFvPatchScalarField::rmap
 
 void mutRoughWallFunctionFvPatchScalarField::updateCoeffs()
 {
-    const RASModel& ras = db().lookupObject<RASModel>("RASProperties");
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
-    const scalar Cmu = ras.Cmu().value();
+    const scalar Cmu = rasModel.Cmu().value();
     const scalar Cmu25 = pow(Cmu, 0.25);
-    const scalar kappa = ras.kappa().value();
-    const scalar E = ras.E().value();
-    scalar yPlusLam = ras.yPlusLam();
+    const scalar kappa = rasModel.kappa().value();
+    const scalar E = rasModel.E().value();
+    scalar yPlusLam = rasModel.yPlusLam();
 
-    const scalarField& y = ras.y()[patch().index()];
+    const scalarField& y = rasModel.y()[patch().index()];
 
     const scalarField& rhow =
         patch().lookupPatchField<volScalarField, scalar>(rhoName_);
@@ -217,7 +217,7 @@ void mutRoughWallFunctionFvPatchScalarField::updateCoeffs()
         if (KsPlus > 2.25)
         {
             Edash = E/fnRough(KsPlus, Cs_[faceI], kappa);
-            yPlusLam = ras.yPlusLam(kappa, Edash);
+            yPlusLam = rasModel.yPlusLam(kappa, Edash);
         }
 
         if (debug)
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
index a480ba072b..cf78541322 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
@@ -135,8 +135,7 @@ void mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::evaluate
     const Pstream::commsTypes
 )
 {
-    const RASModel& rasModel
-        = db().lookupObject<RASModel>("RASProperties");
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
     const scalar kappa = rasModel.kappa().value();
     const scalar E = rasModel.E().value();
@@ -160,7 +159,7 @@ void mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::evaluate
 
     scalarField magFaceGradU = mag(U.snGrad());
 
-    if(roughnessHeight_ > 0.0)
+    if (roughnessHeight_ > 0.0)
     {
         // Rough Walls.
         const scalar c_1 = 1/(90 - 2.25) + roughnessConstant_;
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
index 0501a266a9..f17d16ecd9 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
@@ -120,11 +120,11 @@ void mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::evaluate
     const Pstream::commsTypes
 )
 {
-    const RASModel& ras = db().lookupObject<RASModel>("RASProperties");
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
-    scalar kappa = ras.kappa().value();
-    scalar E = ras.E().value();
-    scalar yPlusLam = ras.yPlusLam();
+    const scalar kappa = rasModel.kappa().value();
+    const scalar E = rasModel.E().value();
+    scalar yPlusLam = rasModel.yPlusLam();
 
     const scalarField& ry = patch().deltaCoeffs();
 
@@ -159,7 +159,7 @@ void mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::evaluate
             yPlusLast = yPlus;
             yPlus = (kappaRe + yPlus)/(1.0 + log(E*yPlus));
 
-        } while(mag(ryPlusLam*(yPlus - yPlusLast)) > 0.01 && ++iter < 10 );
+        } while (mag(ryPlusLam*(yPlus - yPlusLast)) > 0.01 && ++iter < 10 );
 
         if (yPlus > yPlusLam)
         {
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.C
index 88d087dc9c..42111a981a 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.C
@@ -120,10 +120,10 @@ void mutSpalartAllmarasWallFunctionFvPatchScalarField::evaluate
     const Pstream::commsTypes
 )
 {
-    const RASModel& ras = db().lookupObject<RASModel>("RASProperties");
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
-    scalar kappa = ras.kappa().value();
-    scalar E = ras.E().value();
+    const scalar kappa = rasModel.kappa().value();
+    const scalar E = rasModel.E().value();
 
     const scalarField& ry = patch().deltaCoeffs();
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C
index f57f52cdc1..97cb57bcd6 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C
@@ -117,15 +117,15 @@ mutWallFunctionFvPatchScalarField
 
 void mutWallFunctionFvPatchScalarField::updateCoeffs()
 {
-    const RASModel& ras = db().lookupObject<RASModel>("RASProperties");
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
-    const scalar Cmu = ras.Cmu().value();
+    const scalar Cmu = rasModel.Cmu().value();
     const scalar Cmu25 = pow(Cmu, 0.25);
-    const scalar kappa = ras.kappa().value();
-    const scalar E = ras.E().value();
-    const scalar yPlusLam = ras.yPlusLam();
+    const scalar kappa = rasModel.kappa().value();
+    const scalar E = rasModel.E().value();
+    const scalar yPlusLam = rasModel.yPlusLam();
 
-    const scalarField& y = ras.y()[patch().index()];
+    const scalarField& y = rasModel.y()[patch().index()];
 
     const scalarField& rhow =
         patch().lookupPatchField<volScalarField, scalar>(rhoName_);
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
index 897a8c1162..2ed7cbab74 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
@@ -154,15 +154,15 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
 
 void omegaWallFunctionFvPatchScalarField::updateCoeffs()
 {
-    const RASModel& ras = db().lookupObject<RASModel>("RASProperties");
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
-    const scalar Cmu = ras.Cmu().value();
+    const scalar Cmu = rasModel.Cmu().value();
     const scalar Cmu25 = pow(Cmu, 0.25);
 
-    const scalar kappa = ras.kappa().value();
-    const scalar yPlusLam = ras.yPlusLam();
+    const scalar kappa = rasModel.kappa().value();
+    const scalar yPlusLam = rasModel.yPlusLam();
 
-    const scalarField& y = ras.y()[patch().index()];
+    const scalarField& y = rasModel.y()[patch().index()];
 
     volScalarField& G = const_cast<volScalarField&>
         (db().lookupObject<volScalarField>(GName_));
diff --git a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
index 3e076722a2..2b76be3c20 100644
--- a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
+++ b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
@@ -236,13 +236,13 @@ bool kEpsilon::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        C3_.readIfPresent(coeffDict_);
-        alphak_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
-        alphah_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        C3_.readIfPresent(coeffDict());
+        alphak_.readIfPresent(coeffDict());
+        alphaEps_.readIfPresent(coeffDict());
+        alphah_.readIfPresent(coeffDict());
 
         return true;
     }
diff --git a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H
index dd373c6fb3..199316246d 100644
--- a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H
+++ b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H
@@ -171,7 +171,7 @@ public:
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
index e8a7e06895..7636737f4e 100644
--- a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
@@ -325,18 +325,18 @@ bool kOmegaSST::read()
 {
     if (RASModel::read())
     {
-        alphaK1_.readIfPresent(coeffDict_);
-        alphaK2_.readIfPresent(coeffDict_);
-        alphaOmega1_.readIfPresent(coeffDict_);
-        alphaOmega2_.readIfPresent(coeffDict_);
-        alphah_.readIfPresent(coeffDict_);
-        gamma1_.readIfPresent(coeffDict_);
-        gamma2_.readIfPresent(coeffDict_);
-        beta1_.readIfPresent(coeffDict_);
-        beta2_.readIfPresent(coeffDict_);
-        betaStar_.readIfPresent(coeffDict_);
-        a1_.readIfPresent(coeffDict_);
-        c1_.readIfPresent(coeffDict_);
+        alphaK1_.readIfPresent(coeffDict());
+        alphaK2_.readIfPresent(coeffDict());
+        alphaOmega1_.readIfPresent(coeffDict());
+        alphaOmega2_.readIfPresent(coeffDict());
+        alphah_.readIfPresent(coeffDict());
+        gamma1_.readIfPresent(coeffDict());
+        gamma2_.readIfPresent(coeffDict());
+        beta1_.readIfPresent(coeffDict());
+        beta2_.readIfPresent(coeffDict());
+        betaStar_.readIfPresent(coeffDict());
+        a1_.readIfPresent(coeffDict());
+        c1_.readIfPresent(coeffDict());
 
         return true;
     }
diff --git a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H
index 8a948a5f77..ec57b0d3db 100644
--- a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H
+++ b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H
@@ -54,7 +54,7 @@ Description
 
     The default model coefficients correspond to the following:
     @verbatim
-        kOmegaSST
+        kOmegaSSTCoeffs
         {
             alphaK1     0.85034;
             alphaK2     1.0;
@@ -285,7 +285,7 @@ public:
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/compressible/RAS/laminar/laminar.H b/src/turbulenceModels/compressible/RAS/laminar/laminar.H
index fd9556a1f9..cfd5e57352 100644
--- a/src/turbulenceModels/compressible/RAS/laminar/laminar.H
+++ b/src/turbulenceModels/compressible/RAS/laminar/laminar.H
@@ -116,7 +116,7 @@ public:
         //- Correct the laminar viscosity
         void correct();
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         bool read();
 };
 
diff --git a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
index c08516aa27..23eb06705e 100644
--- a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
+++ b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
@@ -270,12 +270,12 @@ bool realizableKE::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        A0_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        alphak_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
-        alphah_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        A0_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        alphak_.readIfPresent(coeffDict());
+        alphaEps_.readIfPresent(coeffDict());
+        alphah_.readIfPresent(coeffDict());
 
         return true;
     }
diff --git a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H
index 49cab6c511..aa76c2a3c3 100644
--- a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H
+++ b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H
@@ -41,7 +41,7 @@ Description
 
     The default model coefficients correspond to the following:
     @verbatim
-        realizableKE
+        realizableKECoeffs
         {
             Cmu         0.09;
             A0          4.0;
@@ -186,7 +186,7 @@ public:
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
index 62559245df..18f61ea286 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
@@ -70,13 +70,13 @@ autoPtr<turbulenceModel> turbulenceModel::New
     const basicThermo& thermophysicalModel
 )
 {
-    word turbulenceModelTypeName;
+    word modelName;
 
-    // Enclose the creation of the turbulencePropertiesDict to ensure it is
-    // deleted before the turbulenceModel is created otherwise the dictionary
-    // is entered in the database twice
+    // Enclose the creation of the dictionary to ensure it is deleted
+    // before the turbulenceModel is created otherwise the dictionary is
+    // entered in the database twice
     {
-        IOdictionary turbulencePropertiesDict
+        IOdictionary dict
         (
             IOobject
             (
@@ -88,15 +88,13 @@ autoPtr<turbulenceModel> turbulenceModel::New
             )
         );
 
-        turbulencePropertiesDict.lookup("simulationType")
-            >> turbulenceModelTypeName;
+        dict.lookup("simulationType") >> modelName;
     }
 
-    Info<< "Selecting turbulence model type "
-        << turbulenceModelTypeName << endl;
+    Info<< "Selecting turbulence model type " << modelName << endl;
 
     turbulenceModelConstructorTable::iterator cstrIter =
-        turbulenceModelConstructorTablePtr_->find(turbulenceModelTypeName);
+        turbulenceModelConstructorTablePtr_->find(modelName);
 
     if (cstrIter == turbulenceModelConstructorTablePtr_->end())
     {
@@ -105,7 +103,7 @@ autoPtr<turbulenceModel> turbulenceModel::New
             "turbulenceModel::New(const volScalarField&, "
             "const volVectorField&, const surfaceScalarField&, "
             "basicThermo&)"
-        )   << "Unknown turbulenceModel type " << turbulenceModelTypeName
+        )   << "Unknown turbulenceModel type " << modelName
             << endl << endl
             << "Valid turbulenceModel types are :" << endl
             << turbulenceModelConstructorTablePtr_->toc()
diff --git a/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.C b/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
index 271b7c0b92..dd35b035ec 100644
--- a/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
+++ b/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
@@ -67,7 +67,7 @@ DeardorffDiffStress::DeardorffDiffStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            coeffDict(),
+            coeffDict_,
             0.094
         )
     ),
@@ -76,7 +76,7 @@ DeardorffDiffStress::DeardorffDiffStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "cm",
-            coeffDict(),
+            coeffDict_,
             4.13
         )
     )
diff --git a/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.H b/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
index 67d422d64b..9305473130 100644
--- a/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
+++ b/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
@@ -124,7 +124,7 @@ public:
         //- Correct Eddy-Viscosity and related properties
         virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C
index 427dd0799e..96ca79245d 100644
--- a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C
+++ b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C
@@ -51,7 +51,7 @@ GenEddyVisc::GenEddyVisc
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ce",
-            coeffDict(),
+            coeffDict_,
             1.048
         )
     ),
diff --git a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H
index 06b5d9c462..949650bdcd 100644
--- a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H
+++ b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H
@@ -122,7 +122,7 @@ public:
         //- Correct Eddy-Viscosity and related properties
         virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C b/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C
index 56f46d848c..19b660df6c 100644
--- a/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C
+++ b/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C
@@ -51,7 +51,7 @@ GenSGSStress::GenSGSStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ce",
-            coeffDict(),
+            coeffDict_,
             1.048
         )
     ),
@@ -61,7 +61,7 @@ GenSGSStress::GenSGSStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "couplingFactor",
-            coeffDict(),
+            coeffDict_,
             0.0
         )
     ),
diff --git a/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H b/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H
index 6ff3110062..bf1a0eb738 100644
--- a/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H
+++ b/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H
@@ -130,7 +130,7 @@ public:
         // This is the additional term due to the filtering of the NSE.
         virtual tmp<fvVectorMatrix> divDevBeff(volVectorField& U) const;
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
index 79962691bc..3ee9619340 100644
--- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
+++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
@@ -77,7 +77,7 @@ LESModel::LESModel
 
     turbulence_(lookup("turbulence")),
     printCoeffs_(lookupOrDefault<Switch>("printCoeffs", false)),
-    coeffDict_(subDict(type + "Coeffs")),
+    coeffDict_(subDictPtr(type + "Coeffs")),
 
     k0_("k0", dimVelocity*dimVelocity, SMALL),
     delta_(LESdelta::New("delta", U.mesh(), *this))
@@ -95,13 +95,13 @@ autoPtr<LESModel> LESModel::New
     transportModel& transport
 )
 {
-    word LESModelTypeName;
+    word modelName;
 
-    // Enclose the creation of the turbulencePropertiesDict to ensure it is
-    // deleted before the turbulenceModel is created otherwise the dictionary
-    // is entered in the database twice
+    // Enclose the creation of the dictionary to ensure it is deleted
+    // before the turbulenceModel is created otherwise the dictionary is
+    // entered in the database twice
     {
-        IOdictionary turbulencePropertiesDict
+        IOdictionary dict
         (
             IOobject
             (
@@ -113,13 +113,13 @@ autoPtr<LESModel> LESModel::New
             )
         );
 
-        turbulencePropertiesDict.lookup("LESModel") >> LESModelTypeName;
+        dict.lookup("LESModel") >> modelName;
     }
 
-    Info<< "Selecting LES turbulence model " << LESModelTypeName << endl;
+    Info<< "Selecting LES turbulence model " << modelName << endl;
 
     dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(LESModelTypeName);
+        dictionaryConstructorTablePtr_->find(modelName);
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
@@ -127,7 +127,7 @@ autoPtr<LESModel> LESModel::New
         (
             "LESModel::select(const volVectorField&, const "
             "surfaceScalarField&, transportModel&)"
-        )   << "Unknown LESModel type " << LESModelTypeName
+        )   << "Unknown LESModel type " << modelName
             << endl << endl
             << "Valid LESModel types are :" << endl
             << dictionaryConstructorTablePtr_->toc()
@@ -163,7 +163,10 @@ bool LESModel::read()
 {
     if (regIOobject::read())
     {
-        coeffDict_ = subDict(type() + "Coeffs");
+        if (const dictionary* dictPtr = subDictPtr(type() + "Coeffs"))
+        {
+            coeffDict_ <<= *dictPtr;
+        }
 
         delta_().read(*this);
 
diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H
index 4b0757d415..766cc63fc0 100644
--- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H
+++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H
@@ -37,7 +37,7 @@ Description
     This class defines the basic interface for an incompressible flow SGS
     model, and encapsulates data of value to all possible models. In
     particular this includes references to all the dependent fields (U,
-    phi), the physical viscosity nu, and the turbulenceProperties
+    phi), the physical viscosity nu, and the LESProperties
     dictionary which contains the model selection and model coefficients.
 
 SourceFiles
@@ -157,9 +157,10 @@ public:
 
     // Member Functions
 
-        //- Access the dictionary which provides info. about choice of
-        //  models, and all related data (particularly model coefficients).
-        inline dictionary& coeffDict()
+        //- Const access to the coefficients dictionary,
+        //  which provides info. about choice of models,
+        //  and all related data (particularly model coefficients).
+        inline const dictionary& coeffDict() const
         {
             return coeffDict_;
         }
@@ -248,7 +249,7 @@ public:
         //  gradU calculated locally.
         void correct();
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read() = 0;
 };
 
diff --git a/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.C b/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.C
index 3931684b6a..58368cc587 100644
--- a/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.C
+++ b/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.C
@@ -67,7 +67,7 @@ LRRDiffStress::LRRDiffStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            coeffDict(),
+            coeffDict_,
             0.09
         )
     ),
@@ -76,7 +76,7 @@ LRRDiffStress::LRRDiffStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "c1",
-            coeffDict(),
+            coeffDict_,
             1.8
         )
     ),
@@ -85,7 +85,7 @@ LRRDiffStress::LRRDiffStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "c2",
-            coeffDict(),
+            coeffDict_,
             0.6
         )
     )
diff --git a/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.H b/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.H
index 586d4a9f5d..1436b5ac3a 100644
--- a/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.H
+++ b/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.H
@@ -123,7 +123,7 @@ public:
         //- Correct Eddy-Viscosity and related properties
         virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.C b/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.C
index d19c2c7898..53a0773457 100644
--- a/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.C
+++ b/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.C
@@ -67,7 +67,7 @@ Smagorinsky::Smagorinsky
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            coeffDict(),
+            coeffDict_,
             0.094
         )
     )
diff --git a/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.H b/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.H
index 13966f4883..3c7b1ade93 100644
--- a/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.H
+++ b/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.H
@@ -125,7 +125,7 @@ public:
         //- Correct Eddy-Viscosity and related properties
         virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C
index f5848d6d4b..3ed4f3f5e5 100644
--- a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C
+++ b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C
@@ -58,7 +58,7 @@ Smagorinsky2::Smagorinsky2
         dimensioned<scalar>::lookupOrAddToDict
         (
             "cD2",
-            coeffDict(),
+            coeffDict_,
             0.02
         )
     )
diff --git a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.H b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.H
index 0962216ce5..015dda7a14 100644
--- a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.H
+++ b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.H
@@ -112,7 +112,7 @@ public:
         // This is the additional term due to the filtering of the NSE.
         virtual tmp<fvVectorMatrix> divDevBeff(volVectorField& U) const;
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C
index 11fd61b957..b185f9a20b 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C
@@ -160,7 +160,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaNut",
-            coeffDict(),
+            coeffDict_,
             1.5
         )
     ),
@@ -178,7 +178,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cb1",
-            coeffDict(),
+            coeffDict_,
             0.1355
         )
     ),
@@ -187,7 +187,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cb2",
-            coeffDict(),
+            coeffDict_,
             0.622
         )
     ),
@@ -196,7 +196,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cv1",
-            coeffDict(),
+            coeffDict_,
             7.1
         )
     ),
@@ -205,7 +205,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cv2",
-            coeffDict(),
+            coeffDict_,
             5.0
         )
     ),
@@ -214,7 +214,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "CDES",
-            coeffDict(),
+            coeffDict_,
             0.65
         )
     ),
@@ -223,7 +223,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            coeffDict(),
+            coeffDict_,
             0.07
         )
     ),
@@ -233,7 +233,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cw2",
-            coeffDict(),
+            coeffDict_,
             0.3
         )
     ),
@@ -242,7 +242,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cw3",
-            coeffDict(),
+            coeffDict_,
             2.0
         )
     ),
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H
index 60dfbcc555..f06ba30e48 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H
@@ -181,7 +181,7 @@ public:
         //- Correct nuTilda and related properties
         virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
index 4fc7c02057..f946e37609 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
@@ -154,7 +154,7 @@ SpalartAllmarasIDDES::SpalartAllmarasIDDES
         dimensioned<scalar>::lookupOrAddToDict
         (
             "fwStar",
-            coeffDict(),
+            coeffDict_,
             0.424
         )
     ),
@@ -163,7 +163,7 @@ SpalartAllmarasIDDES::SpalartAllmarasIDDES
         dimensioned<scalar>::lookupOrAddToDict
         (
             "cl",
-            coeffDict(),
+            coeffDict_,
             3.55
         )
     ),
@@ -172,7 +172,7 @@ SpalartAllmarasIDDES::SpalartAllmarasIDDES
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ct",
-            coeffDict(),
+            coeffDict_,
             1.63
         )
     )
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
index 8c7ca63ceb..b8e7bf5aff 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
@@ -116,7 +116,7 @@ public:
 
     // Member Functions
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
index e70fd66bf9..610c1bf96b 100644
--- a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
@@ -105,12 +105,14 @@ void nuSgsWallFunctionFvPatchScalarField::evaluate
     const Pstream::commsTypes
 )
 {
-    const LESModel& sgsModel
-        = db().lookupObject<LESModel>("LESProperties");
+    const LESModel& lesModel = db().lookupObject<LESModel>("LESProperties");
 
-    scalar kappa = readScalar(sgsModel.lookup("kappa"));
-
-    scalar E = readScalar(sgsModel.subDict("wallFunctionCoeffs").lookup("E"));
+    // TODO: make these lookups optional (or more robust)?
+    const scalar kappa = readScalar(lesModel.lookup("kappa"));
+    const scalar E = readScalar
+    (
+        lesModel.subDict("wallFunctionCoeffs").lookup("E")
+    );
 
     const scalarField& ry = patch().deltaCoeffs();
 
diff --git a/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.H b/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.H
index 1002d2bb07..a69f14e6ba 100644
--- a/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.H
+++ b/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.H
@@ -132,7 +132,7 @@ public:
         //- Correct Eddy-Viscosity and related properties
         void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H b/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H
index 17ed2c62ad..15f0ac56d1 100644
--- a/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H
+++ b/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H
@@ -139,7 +139,7 @@ public:
         //- Correct Eddy-Viscosity and related properties
         virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.H b/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.H
index 39a6636572..93e85a808b 100644
--- a/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.H
+++ b/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.H
@@ -139,7 +139,7 @@ public:
         //- Correct Eddy-Viscosity and related properties
         virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
index b4aca6c7f3..54a7c42c3d 100644
--- a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
+++ b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
@@ -128,7 +128,7 @@ kOmegaSSTSAS::kOmegaSSTSAS
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaK1",
-            coeffDict(),
+            coeffDict_,
             0.85034
         )
     ),
@@ -137,7 +137,7 @@ kOmegaSSTSAS::kOmegaSSTSAS
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaK2",
-            coeffDict(),
+            coeffDict_,
             1.0
         )
     ),
@@ -146,7 +146,7 @@ kOmegaSSTSAS::kOmegaSSTSAS
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaOmega1",
-            coeffDict(),
+            coeffDict_,
             0.5
         )
     ),
@@ -155,7 +155,7 @@ kOmegaSSTSAS::kOmegaSSTSAS
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaOmega2",
-            coeffDict(),
+            coeffDict_,
             0.85616
         )
     ),
@@ -164,7 +164,7 @@ kOmegaSSTSAS::kOmegaSSTSAS
         dimensioned<scalar>::lookupOrAddToDict
         (
             "gamma1",
-            coeffDict(),
+            coeffDict_,
             0.5532
         )
     ),
@@ -173,7 +173,7 @@ kOmegaSSTSAS::kOmegaSSTSAS
         dimensioned<scalar>::lookupOrAddToDict
         (
             "gamma2",
-            coeffDict(),
+            coeffDict_,
             0.4403
         )
     ),
@@ -182,7 +182,7 @@ kOmegaSSTSAS::kOmegaSSTSAS
         dimensioned<scalar>::lookupOrAddToDict
         (
             "beta1",
-            coeffDict(),
+            coeffDict_,
             0.075
         )
     ),
@@ -191,7 +191,7 @@ kOmegaSSTSAS::kOmegaSSTSAS
         dimensioned<scalar>::lookupOrAddToDict
         (
             "beta2",
-            coeffDict(),
+            coeffDict_,
             0.0828
         )
     ),
@@ -200,7 +200,7 @@ kOmegaSSTSAS::kOmegaSSTSAS
         dimensioned<scalar>::lookupOrAddToDict
         (
             "betaStar",
-            coeffDict(),
+            coeffDict_,
             0.09
         )
     ),
@@ -209,7 +209,7 @@ kOmegaSSTSAS::kOmegaSSTSAS
         dimensioned<scalar>::lookupOrAddToDict
         (
             "a1",
-            coeffDict(),
+            coeffDict_,
             0.31
         )
     ),
@@ -218,7 +218,7 @@ kOmegaSSTSAS::kOmegaSSTSAS
         dimensioned<scalar>::lookupOrAddToDict
         (
             "c1",
-            coeffDict(),
+            coeffDict_,
             10.0
         )
     ),
@@ -227,7 +227,7 @@ kOmegaSSTSAS::kOmegaSSTSAS
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaPhi",
-            coeffDict(),
+            coeffDict_,
             0.666667
         )
     ),
@@ -236,7 +236,7 @@ kOmegaSSTSAS::kOmegaSSTSAS
         dimensioned<scalar>::lookupOrAddToDict
         (
             "zetaTilda2",
-            coeffDict(),
+            coeffDict_,
             1.755
         )
     ),
@@ -245,7 +245,7 @@ kOmegaSSTSAS::kOmegaSSTSAS
         dimensioned<scalar>::lookupOrAddToDict
         (
             "FSAS",
-            coeffDict(),
+            coeffDict_,
             1.25
         )
     ),
@@ -258,7 +258,7 @@ kOmegaSSTSAS::kOmegaSSTSAS
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cmu",
-            coeffDict(),
+            coeffDict_,
             0.09
          )
     ),
diff --git a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
index e5b03aef68..7b1f5f919b 100644
--- a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
+++ b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
@@ -244,7 +244,7 @@ public:
         //  viscosity
         virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/LES/laminar/laminar.H b/src/turbulenceModels/incompressible/LES/laminar/laminar.H
index 576e5b91f5..45500d6172 100644
--- a/src/turbulenceModels/incompressible/LES/laminar/laminar.H
+++ b/src/turbulenceModels/incompressible/LES/laminar/laminar.H
@@ -111,7 +111,7 @@ public:
         //  i.e. the additional term in the filtered NSE.
         virtual tmp<fvVectorMatrix> divDevBeff(volVectorField& U) const;
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.H b/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.H
index 4848c6492e..1ff8fc07dd 100644
--- a/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.H
+++ b/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.H
@@ -161,7 +161,7 @@ public:
         //- Correct Eddy-Viscosity and related properties
         virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.H b/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.H
index de4f1d2983..3c03c188e6 100644
--- a/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.H
+++ b/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.H
@@ -137,7 +137,7 @@ public:
         //- Correct Eddy-Viscosity and related properties
         virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C
index d6a5de4ed4..28a0a1ed5a 100644
--- a/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C
+++ b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C
@@ -81,7 +81,7 @@ oneEqEddy::oneEqEddy
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            coeffDict(),
+            coeffDict_,
             0.094
         )
     )
diff --git a/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H
index c060f82d67..b8af50bc7a 100644
--- a/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H
+++ b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H
@@ -132,7 +132,7 @@ public:
         //- Correct Eddy-Viscosity and related properties
         virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H b/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H
index a2bd79bac3..3f4f55535f 100644
--- a/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H
+++ b/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H
@@ -115,7 +115,7 @@ public:
         //- Correct Eddy-Viscosity and related properties
         virtual void correct(const tmp<volTensorField>&);
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C b/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C
index 4d8a7edc44..4a16af3576 100644
--- a/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C
+++ b/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C
@@ -78,7 +78,7 @@ spectEddyVisc::spectEddyVisc
         dimensioned<scalar>::lookupOrAddToDict
         (
             "cB",
-            coeffDict(),
+            coeffDict_,
             8.22
         )
     ),
@@ -87,7 +87,7 @@ spectEddyVisc::spectEddyVisc
         dimensioned<scalar>::lookupOrAddToDict
         (
             "cK1",
-            coeffDict(),
+            coeffDict_,
             0.83
         )
     ),
@@ -96,7 +96,7 @@ spectEddyVisc::spectEddyVisc
         dimensioned<scalar>::lookupOrAddToDict
         (
             "cK2",
-            coeffDict(),
+            coeffDict_,
             1.03
         )
     ),
@@ -105,7 +105,7 @@ spectEddyVisc::spectEddyVisc
         dimensioned<scalar>::lookupOrAddToDict
         (
             "cK3",
-            coeffDict(),
+            coeffDict_,
             4.75
         )
     ),
@@ -114,7 +114,7 @@ spectEddyVisc::spectEddyVisc
         dimensioned<scalar>::lookupOrAddToDict
         (
             "cK4",
-            coeffDict(),
+            coeffDict_,
             2.55
         )
     )
diff --git a/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.H b/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.H
index 709c9ef07c..8c857a2a05 100644
--- a/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.H
+++ b/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.H
@@ -122,7 +122,7 @@ public:
         //- Correct Eddy-Viscosity and related properties
         virtual void correct(const tmp<volTensorField>&);
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.C b/src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.C
index 51e2decbf0..fa28751752 100644
--- a/src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.C
+++ b/src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.C
@@ -49,12 +49,11 @@ addToRunTimeSelectionTable(LESdelta, vanDriestDelta, dictionary);
 
 void vanDriestDelta::calcDelta()
 {
-    const LESModel& sgsModel
-        = mesh_.lookupObject<LESModel>("LESProperties");
+    const LESModel& lesModel = mesh_.lookupObject<LESModel>("LESProperties");
 
-    const volVectorField& U = sgsModel.U();
-    const volScalarField& nu = sgsModel.nu();
-    tmp<volScalarField> nuSgs = sgsModel.nuSgs();
+    const volVectorField& U = lesModel.U();
+    const volScalarField& nu = lesModel.nu();
+    tmp<volScalarField> nuSgs = lesModel.nuSgs();
 
     volScalarField ystar
     (
diff --git a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
index 0c361c97ff..9418a56519 100644
--- a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
+++ b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
@@ -259,16 +259,16 @@ bool LRR::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        Clrr1_.readIfPresent(coeffDict_);
-        Clrr2_.readIfPresent(coeffDict_);
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        Cs_.readIfPresent(coeffDict_);
-        Ceps_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        Clrr1_.readIfPresent(coeffDict());
+        Clrr2_.readIfPresent(coeffDict());
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        Cs_.readIfPresent(coeffDict());
+        Ceps_.readIfPresent(coeffDict());
+        alphaEps_.readIfPresent(coeffDict());
 
-        couplingFactor_.readIfPresent(coeffDict_);
+        couplingFactor_.readIfPresent(coeffDict());
 
         if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
         {
diff --git a/src/turbulenceModels/incompressible/RAS/LRR/LRR.H b/src/turbulenceModels/incompressible/RAS/LRR/LRR.H
index 45462d11e1..f8e23f1ae6 100644
--- a/src/turbulenceModels/incompressible/RAS/LRR/LRR.H
+++ b/src/turbulenceModels/incompressible/RAS/LRR/LRR.H
@@ -169,7 +169,7 @@ public:
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
index 3211885c93..92c72770a8 100644
--- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
@@ -188,10 +188,10 @@ bool LamBremhorstKE::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        alphaEps_.readIfPresent(coeffDict());
 
         return true;
     }
diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H
index de1ce8c1f2..b241d2da38 100644
--- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H
+++ b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H
@@ -146,7 +146,7 @@ public:
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index 60f32bf14f..e9b5d3a28e 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -283,19 +283,19 @@ bool LaunderGibsonRSTM::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        Clg1_.readIfPresent(coeffDict_);
-        Clg2_.readIfPresent(coeffDict_);
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        Cs_.readIfPresent(coeffDict_);
-        Ceps_.readIfPresent(coeffDict_);
-        alphaR_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
-        C1Ref_.readIfPresent(coeffDict_);
-        C2Ref_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        Clg1_.readIfPresent(coeffDict());
+        Clg2_.readIfPresent(coeffDict());
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        Cs_.readIfPresent(coeffDict());
+        Ceps_.readIfPresent(coeffDict());
+        alphaR_.readIfPresent(coeffDict());
+        alphaEps_.readIfPresent(coeffDict());
+        C1Ref_.readIfPresent(coeffDict());
+        C2Ref_.readIfPresent(coeffDict());
 
-        couplingFactor_.readIfPresent(coeffDict_);
+        couplingFactor_.readIfPresent(coeffDict());
 
         if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
         {
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
index 7cebb11d66..cb6f04491d 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
+++ b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
@@ -177,7 +177,7 @@ public:
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
index c3915d3392..fa0841645f 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -194,10 +194,10 @@ bool LaunderSharmaKE::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        alphaEps_.readIfPresent(coeffDict());
 
         return true;
     }
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
index 99ac4259d3..5c64d43253 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
@@ -161,7 +161,7 @@ public:
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
index 41e6a851b7..d48d13845c 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
@@ -292,16 +292,16 @@ bool LienCubicKE::read()
 {
     if (RASModel::read())
     {
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        alphak_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
-        A1_.readIfPresent(coeffDict_);
-        A2_.readIfPresent(coeffDict_);
-        Ctau1_.readIfPresent(coeffDict_);
-        Ctau2_.readIfPresent(coeffDict_);
-        Ctau3_.readIfPresent(coeffDict_);
-        alphaKsi_.readIfPresent(coeffDict_);
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        alphak_.readIfPresent(coeffDict());
+        alphaEps_.readIfPresent(coeffDict());
+        A1_.readIfPresent(coeffDict());
+        A2_.readIfPresent(coeffDict());
+        Ctau1_.readIfPresent(coeffDict());
+        Ctau2_.readIfPresent(coeffDict());
+        Ctau3_.readIfPresent(coeffDict());
+        alphaKsi_.readIfPresent(coeffDict());
 
         return true;
     }
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H
index 96c3980f19..21a500e33d 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H
@@ -154,7 +154,7 @@ public:
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
index 98dd13dbc3..63323abad0 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
@@ -335,20 +335,20 @@ bool LienCubicKELowRe::read()
 {
     if (RASModel::read())
     {
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        alphak_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
-        A1_.readIfPresent(coeffDict_);
-        A2_.readIfPresent(coeffDict_);
-        Ctau1_.readIfPresent(coeffDict_);
-        Ctau2_.readIfPresent(coeffDict_);
-        Ctau3_.readIfPresent(coeffDict_);
-        alphaKsi_.readIfPresent(coeffDict_);
-        CmuWall_.readIfPresent(coeffDict_);
-        Am_.readIfPresent(coeffDict_);
-        Aepsilon_.readIfPresent(coeffDict_);
-        Amu_.readIfPresent(coeffDict_);
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        alphak_.readIfPresent(coeffDict());
+        alphaEps_.readIfPresent(coeffDict());
+        A1_.readIfPresent(coeffDict());
+        A2_.readIfPresent(coeffDict());
+        Ctau1_.readIfPresent(coeffDict());
+        Ctau2_.readIfPresent(coeffDict());
+        Ctau3_.readIfPresent(coeffDict());
+        alphaKsi_.readIfPresent(coeffDict());
+        CmuWall_.readIfPresent(coeffDict());
+        Am_.readIfPresent(coeffDict());
+        Aepsilon_.readIfPresent(coeffDict());
+        Amu_.readIfPresent(coeffDict());
 
         return true;
     }
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H
index a9072f20a7..d692063511 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H
@@ -179,7 +179,7 @@ public:
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
index 2e2ac09834..b8b8ab7dbe 100644
--- a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
+++ b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
@@ -169,14 +169,14 @@ bool LienLeschzinerLowRe::read()
 {
     if (RASModel::read())
     {
-        coeffDict_.readIfPresent<scalar>("C1", C1);
-        coeffDict_.readIfPresent<scalar>("C2", C2);
-        coeffDict_.readIfPresent<scalar>("alphak", alphak);
-        coeffDict_.readIfPresent<scalar>("alphaEps", alphaEps);
-        coeffDict_.readIfPresent<scalar>("Cmu", Cmu);
-        coeffDict_.readIfPresent<scalar>("Am", Am);
-        coeffDict_.readIfPresent<scalar>("Aepsilon", Aepsilon);
-        coeffDict_.readIfPresent<scalar>("Amu", Amu);
+        coeffDict().readIfPresent<scalar>("C1", C1);
+        coeffDict().readIfPresent<scalar>("C2", C2);
+        coeffDict().readIfPresent<scalar>("alphak", alphak);
+        coeffDict().readIfPresent<scalar>("alphaEps", alphaEps);
+        coeffDict().readIfPresent<scalar>("Cmu", Cmu);
+        coeffDict().readIfPresent<scalar>("Am", Am);
+        coeffDict().readIfPresent<scalar>("Aepsilon", Aepsilon);
+        coeffDict().readIfPresent<scalar>("Amu", Amu);
 
         return true;
     }
diff --git a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H
index a7dd44f14b..90cd525bfc 100644
--- a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H
+++ b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H
@@ -149,7 +149,7 @@ public:
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
index 3cc48ff1b8..7ca59b6e6e 100644
--- a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
+++ b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
@@ -262,16 +262,16 @@ bool NonlinearKEShih::read()
 {
     if (RASModel::read())
     {
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        alphak_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
-        A1_.readIfPresent(coeffDict_);
-        A2_.readIfPresent(coeffDict_);
-        Ctau1_.readIfPresent(coeffDict_);
-        Ctau2_.readIfPresent(coeffDict_);
-        Ctau3_.readIfPresent(coeffDict_);
-        alphaKsi_.readIfPresent(coeffDict_);
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        alphak_.readIfPresent(coeffDict());
+        alphaEps_.readIfPresent(coeffDict());
+        A1_.readIfPresent(coeffDict());
+        A2_.readIfPresent(coeffDict());
+        Ctau1_.readIfPresent(coeffDict());
+        Ctau2_.readIfPresent(coeffDict());
+        Ctau3_.readIfPresent(coeffDict());
+        alphaKsi_.readIfPresent(coeffDict());
 
         return true;
     }
diff --git a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H
index 0ce167d702..366a3a5fb1 100644
--- a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H
+++ b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H
@@ -153,7 +153,7 @@ public:
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/RAS/QZeta/QZeta.C b/src/turbulenceModels/incompressible/RAS/QZeta/QZeta.C
index 946308c9cb..35210399ff 100644
--- a/src/turbulenceModels/incompressible/RAS/QZeta/QZeta.C
+++ b/src/turbulenceModels/incompressible/RAS/QZeta/QZeta.C
@@ -241,11 +241,11 @@ bool QZeta::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        alphaZeta_.readIfPresent(coeffDict_);
-        anisotropic_.readIfPresent("anisotropic", coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        alphaZeta_.readIfPresent(coeffDict());
+        anisotropic_.readIfPresent("anisotropic", coeffDict());
 
         return true;
     }
diff --git a/src/turbulenceModels/incompressible/RAS/QZeta/QZeta.H b/src/turbulenceModels/incompressible/RAS/QZeta/QZeta.H
index 62cff6e8d1..cb53bf116c 100644
--- a/src/turbulenceModels/incompressible/RAS/QZeta/QZeta.H
+++ b/src/turbulenceModels/incompressible/RAS/QZeta/QZeta.H
@@ -160,7 +160,7 @@ public:
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
index d06bc6652b..272d0f60fe 100644
--- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
+++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
@@ -79,9 +79,9 @@ RASModel::RASModel
 
     turbulence_(lookup("turbulence")),
     printCoeffs_(lookupOrDefault<Switch>("printCoeffs", false)),
-    coeffDict_(subDict(type + "Coeffs")),
+    coeffDict_(subDictPtr(type + "Coeffs")),
 
-    wallFunctionDict_(subDict("wallFunctionCoeffs")),
+    wallFunctionDict_(subDictPtr("wallFunctionCoeffs")),
     kappa_
     (
         dimensioned<scalar>::lookupOrAddToDict
@@ -131,13 +131,13 @@ autoPtr<RASModel> RASModel::New
     transportModel& transport
 )
 {
-    word RASModelTypeName;
+    word modelName;
 
-    // Enclose the creation of the turbulencePropertiesDict to ensure it is
-    // deleted before the RASModel is created otherwise the dictionary
-    // is entered in the database twice
+    // Enclose the creation of the dictionary to ensure it is deleted
+    // before the turbulenceModel is created otherwise the dictionary is
+    // entered in the database twice
     {
-        IOdictionary turbulencePropertiesDict
+        IOdictionary dict
         (
             IOobject
             (
@@ -149,14 +149,13 @@ autoPtr<RASModel> RASModel::New
             )
         );
 
-        turbulencePropertiesDict.lookup("RASModel")
-            >> RASModelTypeName;
+        dict.lookup("RASModel") >> modelName;
     }
 
-    Info<< "Selecting RAS turbulence model " << RASModelTypeName << endl;
+    Info<< "Selecting RAS turbulence model " << modelName << endl;
 
     dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(RASModelTypeName);
+        dictionaryConstructorTablePtr_->find(modelName);
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
@@ -164,7 +163,7 @@ autoPtr<RASModel> RASModel::New
         (
             "RASModel::New(const volVectorField&, "
             "const surfaceScalarField&, transportModel&)"
-        )   << "Unknown RASModel type " << RASModelTypeName
+        )   << "Unknown RASModel type " << modelName
             << endl << endl
             << "Valid RASModel types are :" << endl
             << dictionaryConstructorTablePtr_->toc()
@@ -241,9 +240,17 @@ bool RASModel::read()
     if (regIOobject::read())
     {
         lookup("turbulence") >> turbulence_;
-        coeffDict_ = subDict(type() + "Coeffs");
 
-        wallFunctionDict_ = subDict("wallFunctionCoeffs");
+        if (const dictionary* dictPtr = subDictPtr(type() + "Coeffs"))
+        {
+            coeffDict_ <<= *dictPtr;
+        }
+
+        if (const dictionary* dictPtr = subDictPtr("wallFunctionCoeffs"))
+        {
+            wallFunctionDict_ <<= *dictPtr;
+        }
+
         kappa_.readIfPresent(wallFunctionDict_);
         E_.readIfPresent(wallFunctionDict_);
         Cmu_.readIfPresent(wallFunctionDict_);
diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
index 963af37ddd..c934488bb3 100644
--- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
+++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
@@ -331,7 +331,7 @@ public:
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct() = 0;
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read() = 0;
 };
 
diff --git a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
index 533aca878a..bc10cdc478 100644
--- a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -221,13 +221,13 @@ bool RNGkEpsilon::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        alphak_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
-        eta0_.readIfPresent(coeffDict_);
-        beta_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        alphak_.readIfPresent(coeffDict());
+        alphaEps_.readIfPresent(coeffDict());
+        eta0_.readIfPresent(coeffDict());
+        beta_.readIfPresent(coeffDict());
 
         return true;
     }
diff --git a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H
index 31acc52092..77da01f919 100644
--- a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H
+++ b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H
@@ -157,7 +157,7 @@ public:
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
index c69d403575..228c519703 100644
--- a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -316,15 +316,15 @@ bool SpalartAllmaras::read()
 {
     if (RASModel::read())
     {
-        alphaNut_.readIfPresent(coeffDict_);
+        alphaNut_.readIfPresent(coeffDict());
 
-        Cb1_.readIfPresent(coeffDict_);
-        Cb2_.readIfPresent(coeffDict_);
+        Cb1_.readIfPresent(coeffDict());
+        Cb2_.readIfPresent(coeffDict());
         Cw1_ = Cb1_/sqr(kappa_) + alphaNut_*(1.0 + Cb2_);
-        Cw2_.readIfPresent(coeffDict_);
-        Cw3_.readIfPresent(coeffDict_);
-        Cv1_.readIfPresent(coeffDict_);
-        Cv2_.readIfPresent(coeffDict_);
+        Cw2_.readIfPresent(coeffDict());
+        Cw3_.readIfPresent(coeffDict());
+        Cv1_.readIfPresent(coeffDict());
+        Cv2_.readIfPresent(coeffDict());
 
         return true;
     }
diff --git a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H
index bc48b5954d..7d99fe3028 100644
--- a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H
@@ -173,7 +173,7 @@ public:
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
index d19cdd757f..3c880b108f 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
@@ -108,16 +108,15 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::updateCoeffs()
     }
 
     // Lookup Cmu corresponding to the turbulence model selected
-    const incompressible::RASModel& RAS =
-        db().lookupObject<incompressible::RASModel>("RASProperties");
-    scalar Cmu = readScalar(RAS.coeffDict().lookup("Cmu"));
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
-    scalar Cmu75 = pow(Cmu, 0.75);
+    const scalar Cmu = readScalar(rasModel.coeffDict().lookup("Cmu"));
+    const scalar Cmu75 = pow(Cmu, 0.75);
 
-    const fvPatchField<scalar>& k =
+    const fvPatchField<scalar>& kp =
         patch().lookupPatchField<volScalarField, scalar>("k");
 
-    operator==(Cmu75*k*sqrt(k)/mixingLength_);
+    operator==(Cmu75*kp*sqrt(kp)/mixingLength_);
 
     fixedValueFvPatchField<scalar>::updateCoeffs();
 }
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
index 33b52b6c99..acff657d95 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
@@ -76,7 +76,7 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField
 :
     fixedValueFvPatchField<scalar>(p, iF, dict),
     mixingLength_(readScalar(dict.lookup("mixingLength"))),
-    kName_(dict.lookup("k"))
+    kName_(dict.lookupOrDefault<word>("k", "k"))
 {}
 
 turbulentMixingLengthFrequencyInletFvPatchScalarField::
@@ -113,11 +113,10 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs()
     }
 
     // Lookup Cmu corresponding to the turbulence model selected
-    const incompressible::RASModel& RAS =
-        db().lookupObject<incompressible::RASModel>("RASProperties");
-    scalar Cmu = readScalar(RAS.coeffDict().lookup("Cmu"));
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
-    scalar Cmu25 = pow(Cmu, 0.25);
+    const scalar Cmu = readScalar(rasModel.coeffDict().lookup("Cmu"));
+    const scalar Cmu25 = pow(Cmu, 0.25);
 
     const fvPatchField<scalar>& kp =
         patch().lookupPatchField<volScalarField, scalar>(kName_);
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
index 371d912c8a..6f5adfface 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
@@ -149,15 +149,15 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
 
 void epsilonWallFunctionFvPatchScalarField::updateCoeffs()
 {
-    const RASModel& ras = db().lookupObject<RASModel>("RASProperties");
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
-    const scalar Cmu = ras.Cmu().value();
+    const scalar Cmu = rasModel.Cmu().value();
     const scalar Cmu25 = pow(Cmu, 0.25);
     const scalar Cmu75 = pow(Cmu, 0.75);
-    const scalar kappa = ras.kappa().value();
-    const scalar yPlusLam = ras.yPlusLam();
+    const scalar kappa = rasModel.kappa().value();
+    const scalar yPlusLam = rasModel.yPlusLam();
 
-    const scalarField& y = ras.y()[patch().index()];
+    const scalarField& y = rasModel.y()[patch().index()];
 
     volScalarField& G = const_cast<volScalarField&>
         (db().lookupObject<volScalarField>(GName_));
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C
index 138e783333..66fb5e3758 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C
@@ -177,15 +177,15 @@ void nutRoughWallFunctionFvPatchScalarField::rmap
 
 void nutRoughWallFunctionFvPatchScalarField::updateCoeffs()
 {
-    const RASModel& ras = db().lookupObject<RASModel>("RASProperties");
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
-    const scalar Cmu = ras.Cmu().value();
+    const scalar Cmu = rasModel.Cmu().value();
     const scalar Cmu25 = pow(Cmu, 0.25);
-    const scalar kappa = ras.kappa().value();
-    const scalar E = ras.E().value();
-    scalar yPlusLam = ras.yPlusLam();
+    const scalar kappa = rasModel.kappa().value();
+    const scalar E = rasModel.E().value();
+    scalar yPlusLam = rasModel.yPlusLam();
 
-    const scalarField& y = ras.y()[patch().index()];
+    const scalarField& y = rasModel.y()[patch().index()];
 
     const scalarField& k = db().lookupObject<volScalarField>(kName_);
 
@@ -209,7 +209,7 @@ void nutRoughWallFunctionFvPatchScalarField::updateCoeffs()
         if (KsPlus > 2.25)
         {
             Edash = E/fnRough(KsPlus, Cs_[faceI], kappa);
-            yPlusLam = ras.yPlusLam(kappa, Edash);
+            yPlusLam = rasModel.yPlusLam(kappa, Edash);
         }
 
         if (debug)
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
index 2d7bfc9cd2..2cf0f985d4 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
@@ -130,10 +130,10 @@ void nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::evaluate
     const Pstream::commsTypes
 )
 {
-    const RASModel& ras = db().lookupObject<RASModel>("RASProperties");
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
-    const scalar kappa = ras.kappa().value();
-    const scalar E = ras.E().value();
+    const scalar kappa = rasModel.kappa().value();
+    const scalar E = rasModel.E().value();
     const scalar yPlusLam = 11.225;
 
     // The reciprical of the distance to the adjacent cell centre.
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
index 394c1ce7cf..4c8d457aff 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
@@ -115,11 +115,11 @@ void nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::evaluate
     const Pstream::commsTypes
 )
 {
-    const RASModel& ras = db().lookupObject<RASModel>("RASProperties");
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
-    scalar kappa = ras.kappa().value();
-    scalar E = ras.E().value();
-    scalar yPlusLam = ras.yPlusLam();
+    const scalar kappa = rasModel.kappa().value();
+    const scalar E = rasModel.E().value();
+    const scalar yPlusLam = rasModel.yPlusLam();
 
     const scalarField& ry = patch().deltaCoeffs();
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C
index 112ae23025..9e0db0b1e6 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C
@@ -115,10 +115,10 @@ void nutSpalartAllmarasWallFunctionFvPatchScalarField::evaluate
     const Pstream::commsTypes
 )
 {
-    const RASModel& ras = db().lookupObject<RASModel>("RASProperties");
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
-    scalar kappa = ras.kappa().value();
-    scalar E = ras.E().value();
+    const scalar kappa = rasModel.kappa().value();
+    const scalar E = rasModel.E().value();
 
     const scalarField& ry = patch().deltaCoeffs();
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
index 8e89f18d96..9e83ef304e 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
@@ -112,15 +112,15 @@ nutWallFunctionFvPatchScalarField
 
 void nutWallFunctionFvPatchScalarField::updateCoeffs()
 {
-    const RASModel& ras = db().lookupObject<RASModel>("RASProperties");
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
-    const scalar Cmu = ras.Cmu().value();
+    const scalar Cmu = rasModel.Cmu().value();
     const scalar Cmu25 = pow(Cmu, 0.25);
-    const scalar kappa = ras.kappa().value();
-    const scalar E = ras.E().value();
-    const scalar yPlusLam = ras.yPlusLam();
+    const scalar kappa = rasModel.kappa().value();
+    const scalar E = rasModel.E().value();
+    const scalar yPlusLam = rasModel.yPlusLam();
 
-    const scalarField& y = ras.y()[patch().index()];
+    const scalarField& y = rasModel.y()[patch().index()];
 
     const volScalarField& k = db().lookupObject<volScalarField>(kName_);
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
index d4351bf243..0ef12d37c3 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
@@ -149,15 +149,15 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
 
 void omegaWallFunctionFvPatchScalarField::updateCoeffs()
 {
-    const RASModel& ras = db().lookupObject<RASModel>("RASProperties");
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
-    const scalar Cmu = ras.Cmu().value();
+    const scalar Cmu = rasModel.Cmu().value();
     const scalar Cmu25 = pow(Cmu, 0.25);
 
-    const scalar kappa = ras.kappa().value();
-    const scalar yPlusLam = ras.yPlusLam();
+    const scalar kappa = rasModel.kappa().value();
+    const scalar yPlusLam = rasModel.yPlusLam();
 
-    const scalarField& y = ras.y()[patch().index()];
+    const scalarField& y = rasModel.y()[patch().index()];
 
     volScalarField& G = const_cast<volScalarField&>
         (db().lookupObject<volScalarField>(GName_));
diff --git a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
index 1f65b2d2ba..cbbc645798 100644
--- a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
+++ b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
@@ -193,10 +193,10 @@ bool kEpsilon::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        alphaEps_.readIfPresent(coeffDict());
 
         return true;
     }
diff --git a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H
index cefab547e1..1724f81e6c 100644
--- a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H
+++ b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H
@@ -157,7 +157,7 @@ public:
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
index d29291885a..916a3cdb34 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
+++ b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
@@ -202,10 +202,10 @@ bool kOmega::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        beta_.readIfPresent(coeffDict_);
-        alphaK_.readIfPresent(coeffDict_);
-        alphaOmega_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        beta_.readIfPresent(coeffDict());
+        alphaK_.readIfPresent(coeffDict());
+        alphaOmega_.readIfPresent(coeffDict());
 
         return true;
     }
diff --git a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H
index 649a13abe7..3c1a2cbd9b 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H
+++ b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H
@@ -187,7 +187,7 @@ public:
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
index 2ae7d8be6a..850205159d 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
@@ -307,17 +307,17 @@ bool kOmegaSST::read()
 {
     if (RASModel::read())
     {
-        alphaK1_.readIfPresent(coeffDict_);
-        alphaK2_.readIfPresent(coeffDict_);
-        alphaOmega1_.readIfPresent(coeffDict_);
-        alphaOmega2_.readIfPresent(coeffDict_);
-        gamma1_.readIfPresent(coeffDict_);
-        gamma2_.readIfPresent(coeffDict_);
-        beta1_.readIfPresent(coeffDict_);
-        beta2_.readIfPresent(coeffDict_);
-        betaStar_.readIfPresent(coeffDict_);
-        a1_.readIfPresent(coeffDict_);
-        c1_.readIfPresent(coeffDict_);
+        alphaK1_.readIfPresent(coeffDict());
+        alphaK2_.readIfPresent(coeffDict());
+        alphaOmega1_.readIfPresent(coeffDict());
+        alphaOmega2_.readIfPresent(coeffDict());
+        gamma1_.readIfPresent(coeffDict());
+        gamma2_.readIfPresent(coeffDict());
+        beta1_.readIfPresent(coeffDict());
+        beta2_.readIfPresent(coeffDict());
+        betaStar_.readIfPresent(coeffDict());
+        a1_.readIfPresent(coeffDict());
+        c1_.readIfPresent(coeffDict());
 
         return true;
     }
diff --git a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H
index 4563853801..efb8d88a29 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H
+++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H
@@ -55,7 +55,7 @@ Description
 
     The default model coefficients correspond to the following:
     @verbatim
-        kOmegaSST
+        kOmegaSSTCoeffs
         {
             alphaK1     0.85034;
             alphaK2     1.0;
@@ -270,7 +270,7 @@ public:
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/RAS/laminar/laminar.H b/src/turbulenceModels/incompressible/RAS/laminar/laminar.H
index 1335592ece..b139f0fad3 100644
--- a/src/turbulenceModels/incompressible/RAS/laminar/laminar.H
+++ b/src/turbulenceModels/incompressible/RAS/laminar/laminar.H
@@ -104,7 +104,7 @@ public:
         //- Correct the laminar viscosity
         virtual void correct();
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
index d92a765ee2..576453df04 100644
--- a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
+++ b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
@@ -246,11 +246,11 @@ bool realizableKE::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        A0_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        alphak_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        A0_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        alphak_.readIfPresent(coeffDict());
+        alphaEps_.readIfPresent(coeffDict());
 
         return true;
     }
diff --git a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H
index 2a00d6dab2..0dac3f1670 100644
--- a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H
+++ b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H
@@ -41,7 +41,7 @@ Description
 
     The default model coefficients correspond to the following:
     @verbatim
-        realizableKE
+        realizableKECoeffs
         {
             Cmu         0.09;
             A0          4.0;
@@ -174,7 +174,7 @@ public:
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
index 8d0a82267b..da4c39dcaa 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
+++ b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
@@ -67,13 +67,13 @@ autoPtr<turbulenceModel> turbulenceModel::New
     transportModel& transport
 )
 {
-    word turbulenceModelTypeName;
+    word modelName;
 
-    // Enclose the creation of the turbulencePropertiesDict to ensure it is
-    // deleted before the turbulenceModel is created otherwise the dictionary
-    // is entered in the database twice
+    // Enclose the creation of the dictionary to ensure it is deleted
+    // before the turbulenceModel is created otherwise the dictionary is
+    // entered in the database twice
     {
-        IOdictionary turbulencePropertiesDict
+        IOdictionary dict
         (
             IOobject
             (
@@ -85,15 +85,13 @@ autoPtr<turbulenceModel> turbulenceModel::New
             )
         );
 
-        turbulencePropertiesDict.lookup("simulationType")
-            >> turbulenceModelTypeName;
+        dict.lookup("simulationType") >> modelName;
     }
 
-    Info<< "Selecting turbulence model type "
-        << turbulenceModelTypeName << endl;
+    Info<< "Selecting turbulence model type " << modelName << endl;
 
     turbulenceModelConstructorTable::iterator cstrIter =
-        turbulenceModelConstructorTablePtr_->find(turbulenceModelTypeName);
+        turbulenceModelConstructorTablePtr_->find(modelName);
 
     if (cstrIter == turbulenceModelConstructorTablePtr_->end())
     {
@@ -101,7 +99,7 @@ autoPtr<turbulenceModel> turbulenceModel::New
         (
             "turbulenceModel::New(const volVectorField&, "
             "const surfaceScalarField&, transportModel&)"
-        )   << "Unknown turbulenceModel type " << turbulenceModelTypeName
+        )   << "Unknown turbulenceModel type " << modelName
             << endl << endl
             << "Valid turbulenceModel types are :" << endl
             << turbulenceModelConstructorTablePtr_->toc()

From 312aba6ef246053a0d6589931b80410944b182cd Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 8 May 2009 17:02:58 +0100
Subject: [PATCH 098/175] corrected indices for mass transfer due to phase
 change

---
 .../parcels/Templates/ReactingParcel/ReactingParcel.C        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index 237b0dda39..7527690087 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -102,7 +102,7 @@ void Foam::ReactingParcel<ParcelType>::calc
     scalar dhTrans = 0.0;
 
     // Mass transfer due to phase change
-    scalarField dMassPC(td.cloud().gases().size(), 0.0);
+    scalarField dMassPC(Y_.size(), 0.0);
 
 
     // Phase change
@@ -172,7 +172,8 @@ void Foam::ReactingParcel<ParcelType>::calc
         // Transfer mass lost from particle to carrier mass source
         forAll(dMassPC, i)
         {
-            td.cloud().rhoTrans(i)[cellI] += np0*dMassPC[i];
+            label id = td.cloud().composition().localToGlobalGasId(0, i);
+            td.cloud().rhoTrans(id)[cellI] += np0*dMassPC[i];
         }
 
         // Update momentum transfer

From 0bc18a26f624c58eed1c6902be51bd1cd4a0fba0 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Mon, 11 May 2009 10:52:51 +0200
Subject: [PATCH 099/175] bugfix decomposePar

- explicitly remove any previously decomposed 'mut' and 'nut' when
  decomposing fields since they can otherwise prevent the turbulence model
  from being upgraded properly.
  Removing all decomposed fields first might be a better idea in the
  long-term, but would probably be slower.
---
 .../parallelProcessing/decomposePar/decomposePar.C     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index 644511564e..fef8c71aa1 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -540,6 +540,16 @@ int main(int argc, char *argv[])
 
         processorDb.setTime(runTime);
 
+        // remove files remnants that can cause horrible problems
+        // - mut and nut are used to mark the new turbulence models,
+        //   their existence prevents old models from being upgraded
+        {
+            fileName timeDir(processorDb.path()/processorDb.timeName());
+
+            rm(timeDir/"mut");
+            rm(timeDir/"nut");
+        }
+
         // read the mesh
         fvMesh procMesh
         (

From 4366d8df2caff1934ff145730699e54e36e200c2 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Mon, 11 May 2009 15:10:31 +0200
Subject: [PATCH 100/175] cosmetics - adjust copyright dates

---
 applications/solvers/incompressible/pimpleFoam/pimpleFoam.C   | 2 +-
 .../utilities/mesh/conversion/polyDualMesh/meshDualiser.C     | 2 +-
 .../utilities/mesh/conversion/polyDualMesh/meshDualiser.H     | 2 +-
 .../utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C  | 2 +-
 src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.C         | 2 +-
 src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.H         | 2 +-
 src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C                | 2 +-
 src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.H                | 2 +-
 src/OpenFOAM/matrices/scalarMatrices/SVD/SVDI.H               | 2 +-
 src/meshTools/searchableSurface/searchableSurfaceCollection.C | 2 +-
 src/meshTools/searchableSurface/searchableSurfaceCollection.H | 4 ++--
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
index bcc60b7b5e..844cc33352 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C b/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C
index 121becd895..ad7affddae 100644
--- a/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C
+++ b/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.H b/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.H
index dafcd0a74d..00937b3449 100644
--- a/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.H
+++ b/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C b/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C
index 8b03d89542..ffb2cb7daa 100644
--- a/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C
+++ b/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.C b/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.C
index a31058eace..4655c302bd 100644
--- a/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.C
+++ b/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.H b/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.H
index ae8ceffc1c..dc912c5ddc 100644
--- a/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.H
+++ b/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C
index 23490b1547..585c8c2dda 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C
+++ b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2005 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.H b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.H
index 48e581198a..28104917be 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.H
+++ b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2005 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVDI.H b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVDI.H
index 298aac1aeb..82d6c5a6c2 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVDI.H
+++ b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVDI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/meshTools/searchableSurface/searchableSurfaceCollection.C b/src/meshTools/searchableSurface/searchableSurfaceCollection.C
index 7c79c2779e..11b37bf97b 100644
--- a/src/meshTools/searchableSurface/searchableSurfaceCollection.C
+++ b/src/meshTools/searchableSurface/searchableSurfaceCollection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/meshTools/searchableSurface/searchableSurfaceCollection.H b/src/meshTools/searchableSurface/searchableSurfaceCollection.H
index c85eaa1026..9c39923747 100644
--- a/src/meshTools/searchableSurface/searchableSurfaceCollection.H
+++ b/src/meshTools/searchableSurface/searchableSurfaceCollection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,7 @@ namespace Foam
 // Forward declaration of classes
 
 /*---------------------------------------------------------------------------*\
-                           Class searchableSurfaceCollection Declaration
+                 Class searchableSurfaceCollection Declaration
 \*---------------------------------------------------------------------------*/
 
 class searchableSurfaceCollection

From f983e0b42e623d2e72e3de76e492d7947d3f2936 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Mon, 11 May 2009 21:19:26 +0100
Subject: [PATCH 101/175] Correct handling of MANPATH so that the system
 settings are not overridden.

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

diff --git a/etc/apps/cint/bashrc b/etc/apps/cint/bashrc
index 577923968a..3ecfd85517 100644
--- a/etc/apps/cint/bashrc
+++ b/etc/apps/cint/bashrc
@@ -41,7 +41,7 @@ do
         export CINTSYSDIR
         export PATH=$PATH:$CINTSYSDIR/bin
         export MANPATH=$MANPATH:$CINTSYSDIR/doc
-        export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$CINTSYSDIR/lib
+        export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$CINTSYSDIR/lib
         break
     fi
 done
diff --git a/etc/bashrc b/etc/bashrc
index 26dc8c2dfc..17b84d853d 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -256,7 +256,7 @@ cleanEnv=`$cleanProg "$PATH"` && PATH="$cleanEnv"
 cleanEnv=`$cleanProg "$LD_LIBRARY_PATH"` && LD_LIBRARY_PATH="$cleanEnv"
 
 #- Clean MANPATH
-cleanEnv=`$cleanProg "$MANPATH"` && MANPATH="$cleanEnv"
+cleanEnv=`$cleanProg "$MANPATH"` && MANPATH="$cleanEnv:"
 
 export PATH LD_LIBRARY_PATH MANPATH
 
diff --git a/etc/cshrc b/etc/cshrc
index f4147422f9..0073521a33 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -257,7 +257,7 @@ endif
 setenv LD_LIBRARY_PATH `$cleanProg "$LD_LIBRARY_PATH"`
 
 #- Clean MANPATH
-setenv MANPATH `$cleanProg "$MANPATH"`
+setenv MANPATH `$cleanProg "$MANPATH"`:
 
 #- Clean LD_PRELOAD
 if ( $?LD_PRELOAD ) then

From f2d00b32307a1c086062fe0b5a1c42c294be7e05 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Mon, 11 May 2009 21:19:55 +0100
Subject: [PATCH 102/175] Improve reference handling.

---
 .../cfdTools/general/findRefCell/findRefCell.C    | 13 ++++++++++++-
 .../cfdTools/general/findRefCell/findRefCell.H    | 15 +++++++++++----
 src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C   | 12 ++++--------
 src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H   |  2 +-
 4 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C b/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C
index d815b809a3..ed450ea488 100644
--- a/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C
+++ b/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C
@@ -34,7 +34,7 @@ void Foam::setRefCell
     const dictionary& dict,
     label& refCelli,
     scalar& refValue,
-    bool forceReference
+    const bool forceReference
 )
 {
     if (field.needReference() || forceReference)
@@ -119,4 +119,15 @@ void Foam::setRefCell
 }
 
 
+Foam::scalar Foam::getRefCellValue
+(
+    const volScalarField& field,
+    const label refCelli
+)
+{
+    scalar refCellValue = (refCelli >= 0 ? field[refCelli] : 0.0);
+    return returnReduce<label>(refCellValue, sumOp<scalar>());
+}
+
+
 // ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.H b/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.H
index 9f09a9efea..4017d3c3eb 100644
--- a/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.H
+++ b/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.H
@@ -49,11 +49,18 @@ namespace Foam
 //  but which is not on a cyclic, symmetry or processor patch.
 void setRefCell
 (
-    const volScalarField&,
-    const dictionary&,
-    label& refCellI,
+    const volScalarField& field,
+    const dictionary& dict,
+    label& refCelli,
     scalar& refValue,
-    bool forceReference = false
+    const bool forceReference = false
+);
+
+//- Return the current value of field in the reference cell
+scalar getRefCellValue
+(
+    const volScalarField& field,
+    const label refCelli
 );
 
 }
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index 78fede73f8..5ad5dca8cd 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -472,22 +472,18 @@ void Foam::fvMatrix<Type>::setValues
 }
 
 
-// Set reference level for solution
 template<class Type>
 void Foam::fvMatrix<Type>::setReference
 (
-    const label cell,
+    const label celli,
     const Type& value,
     const bool forceReference
 )
 {
-    if (psi_.needReference() || forceReference)
+    if (celli >= 0 && (psi_.needReference() || forceReference))
     {
-        if (cell >= 0)
-        {
-            source()[cell] += diag()[cell]*value;
-            diag()[cell] += diag()[cell];
-        }
+        source()[celli] += diag()[celli]*value;
+        diag()[celli] += diag()[celli];
     }
 }
 
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
index 8ae502cb57..4fbc2430d7 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
@@ -326,7 +326,7 @@ public:
             //- Set reference level for solution
             void setReference
             (
-                const label cell,
+                const label celli,
                 const Type& value,
                 const bool forceReference = false
             );

From 0ee817a060d196ffd10fd5f1d91f5133121ff6fa Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Mon, 11 May 2009 23:19:56 +0100
Subject: [PATCH 103/175] Also added a separate specification of the static
 pressure level but the location for the specification is the same as that for
 the pd level.

---
 .../multiphase/interDyMFoam/Make/options        |  6 ++----
 .../multiphase/interDyMFoam/createFields.H      | 17 +++--------------
 .../multiphase/interDyMFoam/interDyMFoam.C      |  3 +--
 .../solvers/multiphase/interFoam/createFields.H | 17 +++++++++++++++++
 .../solvers/multiphase/interFoam/interFoam.C    | 10 ++++++++++
 .../multiphaseInterFoam/createFields.H          | 17 +++++++++++++++++
 .../multiphaseInterFoam/multiphaseInterFoam.C   | 10 ++++++++++
 .../twoLiquidMixingFoam/createFields.H          | 17 +++++++++++++++++
 .../twoLiquidMixingFoam/twoLiquidMixingFoam.C   | 10 ++++++++++
 .../ras/damBreakWithObstacle/system/fvSolution  |  9 +++------
 .../ras/sloshingTank2D/system/fvSolution        | 15 +++------------
 .../ras/sloshingTank2D3DoF/system/fvSolution    | 15 +++------------
 .../ras/sloshingTank3D/system/fvSolution        | 15 +++------------
 .../ras/sloshingTank3D3DoF/system/fvSolution    | 15 +++------------
 .../ras/sloshingTank3D6DoF/system/fvSolution    | 15 +++------------
 15 files changed, 105 insertions(+), 86 deletions(-)

diff --git a/applications/solvers/multiphase/interDyMFoam/Make/options b/applications/solvers/multiphase/interDyMFoam/Make/options
index 74498326a9..b9aa770576 100644
--- a/applications/solvers/multiphase/interDyMFoam/Make/options
+++ b/applications/solvers/multiphase/interDyMFoam/Make/options
@@ -7,8 +7,7 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude
+    -I$(LIB_SRC)/dynamicFvMesh/lnInclude
 
 EXE_LIBS = \
     -linterfaceProperties \
@@ -18,5 +17,4 @@ EXE_LIBS = \
     -lfiniteVolume \
     -ldynamicMesh \
     -lmeshTools \
-    -ldynamicFvMesh \
-    -lsampling
+    -ldynamicFvMesh
diff --git a/applications/solvers/multiphase/interDyMFoam/createFields.H b/applications/solvers/multiphase/interDyMFoam/createFields.H
index 0f1efe717f..bcceb9d748 100644
--- a/applications/solvers/multiphase/interDyMFoam/createFields.H
+++ b/applications/solvers/multiphase/interDyMFoam/createFields.H
@@ -116,34 +116,23 @@
         pd + rho*(g & mesh.C())
     );
 
-    autoPtr<probes> pRefProbe;
     label pdRefCell = 0;
     scalar pdRefValue = 0.0;
+    setRefCell(pd, mesh.solutionDict().subDict("PISO"), pdRefCell, pdRefValue);
+
     scalar pRefValue = 0.0;
 
     if (pd.needReference())
     {
-        pRefProbe.set
-        (
-            new probes
-            (
-                "pRefProbe",
-                mesh,
-                mesh.solutionDict().subDict("PISO").subDict("pRefProbe")
-            )
-        );
-
         pRefValue = readScalar
         (
             mesh.solutionDict().subDict("PISO").lookup("pRefValue")
         );
 
-        pdRefCell = pRefProbe->cells()[0];
-
         p += dimensionedScalar
         (
             "p",
             p.dimensions(),
-            pRefValue - pRefProbe->sample<scalar>("p")()[0]
+            pRefValue - getRefCellValue(p, pdRefCell)
         );
     }
diff --git a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
index 0386e6625c..046503a8c4 100644
--- a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
+++ b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
@@ -40,7 +40,6 @@ Description
 #include "interfaceProperties.H"
 #include "twoPhaseMixture.H"
 #include "turbulenceModel.H"
-#include "probes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -123,7 +122,7 @@ int main(int argc, char *argv[])
             (
                 "p",
                 p.dimensions(),
-                pRefValue - pRefProbe->sample<scalar>("p")()[0]
+                pRefValue - getRefCellValue(p, pdRefCell)
             );
         }
 
diff --git a/applications/solvers/multiphase/interFoam/createFields.H b/applications/solvers/multiphase/interFoam/createFields.H
index 53dd01672a..7063774752 100644
--- a/applications/solvers/multiphase/interFoam/createFields.H
+++ b/applications/solvers/multiphase/interFoam/createFields.H
@@ -106,6 +106,23 @@
     scalar pdRefValue = 0.0;
     setRefCell(pd, mesh.solutionDict().subDict("PISO"), pdRefCell, pdRefValue);
 
+    scalar pRefValue = 0.0;
+
+    if (pd.needReference())
+    {
+        pRefValue = readScalar
+        (
+            mesh.solutionDict().subDict("PISO").lookup("pRefValue")
+        );
+
+        p += dimensionedScalar
+        (
+            "p",
+            p.dimensions(),
+            pRefValue - getRefCellValue(p, pdRefCell)
+        );
+    }
+
 
     // Construct interface from alpha1 distribution
     interfaceProperties interface(alpha1, U, twoPhaseProperties);
diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C
index 7d2048037a..4dd86bd8f7 100644
--- a/applications/solvers/multiphase/interFoam/interFoam.C
+++ b/applications/solvers/multiphase/interFoam/interFoam.C
@@ -91,6 +91,16 @@ int main(int argc, char *argv[])
 
         p = pd + rho*gh;
 
+        if (pd.needReference())
+        {
+            p += dimensionedScalar
+            (
+                "p",
+                p.dimensions(),
+                pRefValue - getRefCellValue(p, pdRefCell)
+            );
+        }
+
         turbulence->correct();
 
         runTime.write();
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H b/applications/solvers/multiphase/multiphaseInterFoam/createFields.H
index 9119631d0c..07650fd4dd 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/createFields.H
@@ -68,6 +68,23 @@
     scalar pdRefValue = 0.0;
     setRefCell(pd, mesh.solutionDict().subDict("PISO"), pdRefCell, pdRefValue);
 
+    scalar pRefValue = 0.0;
+
+    if (pd.needReference())
+    {
+        pRefValue = readScalar
+        (
+            mesh.solutionDict().subDict("PISO").lookup("pRefValue")
+        );
+
+        p += dimensionedScalar
+        (
+            "p",
+            p.dimensions(),
+            pRefValue - getRefCellValue(p, pdRefCell)
+        );
+    }
+
 
     // Construct incompressible turbulence model
     autoPtr<incompressible::turbulenceModel> turbulence
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
index d0626cbf05..c5fdb5f3c2 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
@@ -83,6 +83,16 @@ int main(int argc, char *argv[])
 
         p = pd + rho*gh;
 
+        if (pd.needReference())
+        {
+            p += dimensionedScalar
+            (
+                "p",
+                p.dimensions(),
+                pRefValue - getRefCellValue(p, pdRefCell)
+            );
+        }
+
         turbulence->correct();
 
         runTime.write();
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H b/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
index bd7c3e2c9f..a38135dc19 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
@@ -95,6 +95,23 @@
     scalar pdRefValue = 0.0;
     setRefCell(pd, mesh.solutionDict().subDict("PISO"), pdRefCell, pdRefValue);
 
+    scalar pRefValue = 0.0;
+
+    if (pd.needReference())
+    {
+        pRefValue = readScalar
+        (
+            mesh.solutionDict().subDict("PISO").lookup("pRefValue")
+        );
+
+        p += dimensionedScalar
+        (
+            "p",
+            p.dimensions(),
+            pRefValue - getRefCellValue(p, pdRefCell)
+        );
+    }
+
 
     // Construct incompressible turbulence model
     autoPtr<incompressible::turbulenceModel> turbulence
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
index be8eea9061..1caf455708 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
@@ -75,6 +75,16 @@ int main(int argc, char *argv[])
 
         p = pd + rho*gh;
 
+        if (pd.needReference())
+        {
+            p += dimensionedScalar
+            (
+                "p",
+                p.dimensions(),
+                pRefValue - getRefCellValue(p, pdRefCell)
+            );
+        }
+
         turbulence->correct();
 
         runTime.write();
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution
index 36d56bb947..2ca306273d 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution
@@ -121,13 +121,10 @@ PISO
     nAlphaCorr      1;
     nAlphaSubCycles 3;
     cAlpha          1;
-    pdRefCell       0;
+
+    pdRefPoint      (0.51 0.51 0.51);
     pdRefValue      0;
-    pRefProbe
-    {
-        fields          ( pd );
-        probeLocations  ( ( 0.51 0.51 0.51 ) );
-    }
+    pRefValue       0;
 }
 
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution
index 2688ec1f98..c9dccc239e 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution
@@ -98,19 +98,10 @@ PISO
     nAlphaSubCycles 3;
     cAlpha          1.5;
     correctPhi      no;
-    pRefProbe
-    {
-        fields          
-        (
-            p
-        );
-        probeLocations
-        (
-            ( 0 0 0.15 )
-        );
-    }
 
-    pRefValue       100000;
+    pdRefPoint      (0 0 0.15);
+    pdRefValue      0;
+    pRefValue       1e5;
 }
 
 relaxationFactors
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution
index ce22769b82..c9dccc239e 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution
@@ -98,19 +98,10 @@ PISO
     nAlphaSubCycles 3;
     cAlpha          1.5;
     correctPhi      no;
-    pRefProbe
-    {
-        fields
-        (
-            p
-        );
-        probeLocations
-        (
-            ( 0 0 0.15 )
-        );
-    }
 
-    pRefValue       100000;
+    pdRefPoint      (0 0 0.15);
+    pdRefValue      0;
+    pRefValue       1e5;
 }
 
 relaxationFactors
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution
index ce22769b82..c9dccc239e 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution
@@ -98,19 +98,10 @@ PISO
     nAlphaSubCycles 3;
     cAlpha          1.5;
     correctPhi      no;
-    pRefProbe
-    {
-        fields
-        (
-            p
-        );
-        probeLocations
-        (
-            ( 0 0 0.15 )
-        );
-    }
 
-    pRefValue       100000;
+    pdRefPoint      (0 0 0.15);
+    pdRefValue      0;
+    pRefValue       1e5;
 }
 
 relaxationFactors
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution
index ce22769b82..c9dccc239e 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution
@@ -98,19 +98,10 @@ PISO
     nAlphaSubCycles 3;
     cAlpha          1.5;
     correctPhi      no;
-    pRefProbe
-    {
-        fields
-        (
-            p
-        );
-        probeLocations
-        (
-            ( 0 0 0.15 )
-        );
-    }
 
-    pRefValue       100000;
+    pdRefPoint      (0 0 0.15);
+    pdRefValue      0;
+    pRefValue       1e5;
 }
 
 relaxationFactors
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution
index ce22769b82..c9dccc239e 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution
@@ -98,19 +98,10 @@ PISO
     nAlphaSubCycles 3;
     cAlpha          1.5;
     correctPhi      no;
-    pRefProbe
-    {
-        fields
-        (
-            p
-        );
-        probeLocations
-        (
-            ( 0 0 0.15 )
-        );
-    }
 
-    pRefValue       100000;
+    pdRefPoint      (0 0 0.15);
+    pdRefValue      0;
+    pRefValue       1e5;
 }
 
 relaxationFactors

From 72362de6b1c64917bede6e1b112a7362be516dcb Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 12 May 2009 12:37:25 +0200
Subject: [PATCH 104/175] foamToEnsight* fixes and tweaks

foamToEnsight:
    - add -noPatches option
    - had incorrect part# when the internalMesh was not output
    - case file is always ascii

foamToEnsightParts:
    - fixed field selection bug,
      no fields were selected when a single time-step was selected
---
 .../dataConversion/foamToEnsight/checkData.H  |  27 +-
 .../foamToEnsight/checkMeshMoving.H           |  26 +-
 .../foamToEnsight/ensightCaseHeader.H         |   5 -
 .../foamToEnsight/ensightField.C              |  66 ++--
 .../foamToEnsight/ensightMesh.C               | 317 +++++++++---------
 .../foamToEnsight/ensightMesh.H               |  13 +-
 .../foamToEnsight/foamToEnsight.C             | 246 +++++++-------
 .../foamToEnsightParts/checkHasMovingMesh.H   |   6 +-
 .../foamToEnsightParts/findFields.H           |  77 +++--
 .../foamToEnsightParts/foamToEnsightParts.C   |  29 +-
 .../foamToEnsightParts/moveMesh.H             |   4 +-
 .../foamToEnsightParts/validateFields.H       | 105 ------
 12 files changed, 420 insertions(+), 501 deletions(-)
 delete mode 100644 applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCaseHeader.H
 delete mode 100644 applications/utilities/postProcessing/dataConversion/foamToEnsightParts/validateFields.H

diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkData.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkData.H
index 59be3c5dc9..1144833a01 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkData.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkData.H
@@ -1,18 +1,21 @@
-for (int n1=startTime; n1<endTime; n1++)
+// ignore special fields or fields that we don't handle
+//
+bool variableGood = true;
+for (label n1=startTime; n1<endTime && variableGood; ++n1)
 {
+    // ignore _0 fields
     if (fieldName.size() > 2 && fieldName(fieldName.size() - 2, 2) == "_0")
     {
         variableGood = false;
-        break;
     }
-
-    IOobject fieldObjectHeader
-    (
-        fieldName,
-        Times[n1].name(),
-        mesh,
-        IOobject::NO_READ
-    );
-
-    variableGood = variableGood && fieldObjectHeader.headerOk();
+    else
+    {
+        variableGood = IOobject
+        (
+            fieldName,
+            Times[n1].name(),
+            mesh,
+            IOobject::NO_READ
+        ).headerOk();
+    }
 }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkMeshMoving.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkMeshMoving.H
index e6e46c8f86..123036f63a 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkMeshMoving.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/checkMeshMoving.H
@@ -1,19 +1,19 @@
-bool meshMoving = true;
+// check for "points" in all of the result directories
 
+bool meshMoving = true;
 if (Times.size() > 2)
 {
-   for(label n2=2; n2<Times.size(); n2++)
-   {
-       IOobject tmpPoints
-       (
-           "points",
-           Times[n2].name(),
-           polyMesh::meshSubDir,
-           mesh,
-           IOobject::NO_READ
-       );
-       meshMoving = meshMoving && tmpPoints.headerOk();
-   }
+    for (label n1=2; n1<Times.size() && meshMoving; ++n1)
+    {
+        meshMoving = IOobject
+        (
+            "points",
+            Times[n1].name(),
+            polyMesh::meshSubDir,
+            mesh,
+            IOobject::NO_READ
+        ).headerOk();
+    }
 }
 else
 {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCaseHeader.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCaseHeader.H
deleted file mode 100644
index cc81cb4659..0000000000
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCaseHeader.H
+++ /dev/null
@@ -1,5 +0,0 @@
-if (Pstream::master())
-{
-    ensightCaseFile << "FORMAT" << nl;
-    ensightCaseFile << "type: ensight gold" << nl << nl;
-}
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
index 980a3c6153..64452a05f7 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
@@ -275,8 +275,8 @@ template<class Type>
 bool writePatchField
 (
     const Foam::Field<Type>& pf,
-    const Foam::label patchi,
-    const Foam::label ensightPatchi,
+    const Foam::label patchI,
+    const Foam::label ensightPatchI,
     const Foam::faceSets& boundaryFaceSet,
     const Foam::ensightMesh::nFacePrimitives& nfp,
     const Foam::labelList& patchProcessors,
@@ -289,7 +289,7 @@ bool writePatchField
         {
             ensightFile
                 << "part" << nl
-                << setw(10) << ensightPatchi << nl;
+                << setw(10) << ensightPatchI << nl;
         }
 
         writeAllFaceData
@@ -335,8 +335,8 @@ template<class Type>
 bool writePatchFieldBinary
 (
     const Foam::Field<Type>& pf,
-    const Foam::label patchi,
-    const Foam::label ensightPatchi,
+    const Foam::label patchI,
+    const Foam::label ensightPatchI,
     const Foam::faceSets& boundaryFaceSet,
     const Foam::ensightMesh::nFacePrimitives& nfp,
     const Foam::labelList& patchProcessors,
@@ -348,7 +348,7 @@ bool writePatchFieldBinary
         if (Pstream::master())
         {
             writeEnsDataBinary("part",ensightFile);
-            writeEnsDataBinary(ensightPatchi,ensightFile);
+            writeEnsDataBinary(ensightPatchI,ensightFile);
         }
 
         writeAllFaceDataBinary
@@ -411,14 +411,14 @@ void writePatchField
     const HashTable<ensightMesh::nFacePrimitives>&
         nPatchPrims = eMesh.nPatchPrims();
 
-    label patchi = -1;
+    label patchI = -1;
 
     if (patchIndices.found(patchName))
     {
-        patchi = patchIndices.find(patchName)();
+        patchI = patchIndices.find(patchName)();
     }
 
-    label ensightPatchi = 2;
+    label ensightPatchI = eMesh.patchPartOffset();
 
     for
     (
@@ -429,7 +429,7 @@ void writePatchField
     )
     {
         if (iter.key() == patchName) break;
-        ensightPatchi++;
+        ensightPatchI++;
     }
 
 
@@ -472,14 +472,14 @@ void writePatchField
         ensightFile << pTraits<Type>::typeName << nl;
     }
 
-    if (patchi >= 0)
+    if (patchI >= 0)
     {
         writePatchField
         (
             pf,
-            patchi,
-            ensightPatchi,
-            boundaryFaceSets[patchi],
+            patchI,
+            ensightPatchI,
+            boundaryFaceSets[patchI],
             nPatchPrims.find(patchName)(),
             patchProcessors,
             ensightFile
@@ -493,7 +493,7 @@ void writePatchField
         (
             Field<Type>(),
             -1,
-            ensightPatchi,
+            ensightPatchI,
             nullFaceSets,
             nPatchPrims.find(patchName)(),
             patchProcessors,
@@ -621,7 +621,7 @@ void ensightFieldAscii
         writeAllData("nfaced", vf, polys, meshCellSets.nPolys, ensightFile);
     }
 
-    label ensightPatchi = 2;
+    label ensightPatchI = eMesh.patchPartOffset();
 
     for
     (
@@ -637,23 +637,23 @@ void ensightFieldAscii
         {
             if (patchIndices.found(patchName))
             {
-                label patchi = patchIndices.find(patchName)();
+                label patchI = patchIndices.find(patchName)();
 
                 if
                 (
                     writePatchField
                     (
-                        vf.boundaryField()[patchi],
-                        patchi,
-                        ensightPatchi,
-                        boundaryFaceSets[patchi],
+                        vf.boundaryField()[patchI],
+                        patchI,
+                        ensightPatchI,
+                        boundaryFaceSets[patchI],
                         nPatchPrims.find(patchName)(),
                         patchProcessors,
                         ensightFile
                     )
                 )
                 {
-                    ensightPatchi++;
+                    ensightPatchI++;
                 }
 
             }
@@ -667,7 +667,7 @@ void ensightFieldAscii
                     (
                         Field<Type>(),
                         -1,
-                        ensightPatchi,
+                        ensightPatchI,
                         nullFaceSet,
                         nPatchPrims.find(patchName)(),
                         patchProcessors,
@@ -675,7 +675,7 @@ void ensightFieldAscii
                     )
                 )
                 {
-                    ensightPatchi++;
+                    ensightPatchI++;
                 }
             }
         }
@@ -793,7 +793,7 @@ void ensightFieldBinary
         writeAllDataBinary("nfaced", vf, polys, meshCellSets.nPolys, ensightFile);
     }
 
-    label ensightPatchi = 2;
+    label ensightPatchI = eMesh.patchPartOffset();
 
     for
     (
@@ -809,23 +809,23 @@ void ensightFieldBinary
         {
             if (patchIndices.found(patchName))
             {
-                label patchi = patchIndices.find(patchName)();
+                label patchI = patchIndices.find(patchName)();
 
                 if
                 (
                     writePatchFieldBinary
                     (
-                        vf.boundaryField()[patchi],
-                        patchi,
-                        ensightPatchi,
-                        boundaryFaceSets[patchi],
+                        vf.boundaryField()[patchI],
+                        patchI,
+                        ensightPatchI,
+                        boundaryFaceSets[patchI],
                         nPatchPrims.find(patchName)(),
                         patchProcessors,
                         ensightFile
                     )
                 )
                 {
-                    ensightPatchi++;
+                    ensightPatchI++;
                 }
 
             }
@@ -839,7 +839,7 @@ void ensightFieldBinary
                     (
                         Field<Type>(),
                         -1,
-                        ensightPatchi,
+                        ensightPatchI,
                         nullFaceSet,
                         nPatchPrims.find(patchName)(),
                         patchProcessors,
@@ -847,7 +847,7 @@ void ensightFieldBinary
                     )
                 )
                 {
-                    ensightPatchi++;
+                    ensightPatchI++;
                 }
             }
         }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
index b69a9264c1..94f8c19c3f 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
@@ -89,8 +89,9 @@ Foam::ensightMesh::ensightMesh
     const bool binary
 )
 :
-    binary_(binary),
     mesh_(mesh),
+    binary_(binary),
+    patchPartOffset_(2),
     meshCellSets_(mesh_.nCells()),
     boundaryFaceSets_(mesh_.boundary().size()),
     allPatchNames_(0),
@@ -98,48 +99,6 @@ Foam::ensightMesh::ensightMesh
     patchNames_(0),
     nPatchPrims_(0)
 {
-    forAll (mesh_.boundaryMesh(), patchi)
-    {
-        if
-        (
-            typeid(mesh_.boundaryMesh()[patchi])
-         != typeid(processorPolyPatch)
-        )
-        {
-            if (!allPatchNames_.found(mesh_.boundaryMesh()[patchi].name()))
-            {
-                allPatchNames_.insert
-                (
-                    mesh_.boundaryMesh()[patchi].name(),
-                    labelList(1, Pstream::myProcNo())
-                );
-
-                patchIndices_.insert
-                (
-                    mesh_.boundaryMesh()[patchi].name(),
-                    patchi
-                );
-            }
-        }
-    }
-
-    combineReduce(allPatchNames_, concatPatchNames());
-
-    if (args.options().found("patches"))
-    {
-        wordList patchNameList(IStringStream(args.options()["patches"])());
-
-        if (patchNameList.empty())
-        {
-            patchNameList = allPatchNames_.toc();
-        }
-
-        forAll (patchNameList, i)
-        {
-            patchNames_.insert(patchNameList[i]);
-        }
-    }
-
     const cellShapeList& cellShapes = mesh.cellShapes();
 
     const cellModel& tet = *(cellModeller::lookup("tet"));
@@ -148,51 +107,101 @@ Foam::ensightMesh::ensightMesh
     const cellModel& wedge = *(cellModeller::lookup("wedge"));
     const cellModel& hex = *(cellModeller::lookup("hex"));
 
-    labelList& tets = meshCellSets_.tets;
-    labelList& pyrs = meshCellSets_.pyrs;
-    labelList& prisms = meshCellSets_.prisms;
-    labelList& wedges = meshCellSets_.wedges;
-    labelList& hexes = meshCellSets_.hexes;
-    labelList& polys = meshCellSets_.polys;
-
-    // Count the shapes
-    label nTets = 0;
-    label nPyrs = 0;
-    label nPrisms = 0;
-    label nWedges = 0;
-    label nHexes = 0;
-    label nPolys = 0;
-
-    if (patchNames_.empty())
+    if (!args.options().found("noPatches"))
     {
-        forAll(cellShapes, celli)
+        forAll (mesh_.boundaryMesh(), patchI)
         {
-            const cellShape& cellShape = cellShapes[celli];
+            if
+            (
+                typeid(mesh_.boundaryMesh()[patchI])
+             != typeid(processorPolyPatch)
+            )
+            {
+                if (!allPatchNames_.found(mesh_.boundaryMesh()[patchI].name()))
+                {
+                    allPatchNames_.insert
+                    (
+                        mesh_.boundaryMesh()[patchI].name(),
+                        labelList(1, Pstream::myProcNo())
+                    );
+
+                    patchIndices_.insert
+                    (
+                        mesh_.boundaryMesh()[patchI].name(),
+                        patchI
+                    );
+                }
+            }
+        }
+
+        combineReduce(allPatchNames_, concatPatchNames());
+
+        if (args.options().found("patches"))
+        {
+            wordList patchNameList(IStringStream(args.options()["patches"])());
+
+            if (patchNameList.empty())
+            {
+                patchNameList = allPatchNames_.toc();
+            }
+
+            forAll (patchNameList, i)
+            {
+                patchNames_.insert(patchNameList[i]);
+            }
+        }
+    }
+
+    if (patchNames_.size())
+    {
+        // no internalMesh
+        patchPartOffset_ = 1;
+    }
+    else
+    {
+        // Count the shapes
+        labelList& tets = meshCellSets_.tets;
+        labelList& pyrs = meshCellSets_.pyrs;
+        labelList& prisms = meshCellSets_.prisms;
+        labelList& wedges = meshCellSets_.wedges;
+        labelList& hexes = meshCellSets_.hexes;
+        labelList& polys = meshCellSets_.polys;
+
+        label nTets = 0;
+        label nPyrs = 0;
+        label nPrisms = 0;
+        label nWedges = 0;
+        label nHexes = 0;
+        label nPolys = 0;
+
+        forAll(cellShapes, cellI)
+        {
+            const cellShape& cellShape = cellShapes[cellI];
             const cellModel& cellModel = cellShape.model();
 
             if (cellModel == tet)
             {
-                tets[nTets++] = celli;
+                tets[nTets++] = cellI;
             }
             else if (cellModel == pyr)
             {
-                pyrs[nPyrs++] = celli;
+                pyrs[nPyrs++] = cellI;
             }
             else if (cellModel == prism)
             {
-                prisms[nPrisms++] = celli;
+                prisms[nPrisms++] = cellI;
             }
             else if (cellModel == wedge)
             {
-                wedges[nWedges++] = celli;
+                wedges[nWedges++] = cellI;
             }
             else if (cellModel == hex)
             {
-                hexes[nHexes++] = celli;
+                hexes[nHexes++] = cellI;
             }
             else
             {
-                polys[nPolys++] = celli;
+                polys[nPolys++] = cellI;
             }
         }
 
@@ -219,49 +228,52 @@ Foam::ensightMesh::ensightMesh
         reduce(meshCellSets_.nPolys, sumOp<label>());
     }
 
-
-    forAll (mesh.boundary(), patchi)
+    if (!args.options().found("noPatches"))
     {
-        if (mesh.boundary()[patchi].size())
+        forAll (mesh.boundary(), patchI)
         {
-            const polyPatch& p = mesh.boundaryMesh()[patchi];
-
-            labelList& tris = boundaryFaceSets_[patchi].tris;
-            labelList& quads = boundaryFaceSets_[patchi].quads;
-            labelList& polys = boundaryFaceSets_[patchi].polys;
-
-            tris.setSize(p.size());
-            quads.setSize(p.size());
-            polys.setSize(p.size());
-
-            label nTris = 0;
-            label nQuads = 0;
-            label nPolys = 0;
-
-            forAll(p, facei)
+            if (mesh.boundary()[patchI].size())
             {
-                const face& f = p[facei];
+                const polyPatch& p = mesh.boundaryMesh()[patchI];
 
-                if (f.size() == 3)
+                labelList& tris = boundaryFaceSets_[patchI].tris;
+                labelList& quads = boundaryFaceSets_[patchI].quads;
+                labelList& polys = boundaryFaceSets_[patchI].polys;
+
+                tris.setSize(p.size());
+                quads.setSize(p.size());
+                polys.setSize(p.size());
+
+                label nTris = 0;
+                label nQuads = 0;
+                label nPolys = 0;
+
+                forAll(p, faceI)
                 {
-                    tris[nTris++] = facei;
-                }
-                else if (f.size() == 4)
-                {
-                    quads[nQuads++] = facei;
-                }
-                else
-                {
-                    polys[nPolys++] = facei;
+                    const face& f = p[faceI];
+
+                    if (f.size() == 3)
+                    {
+                        tris[nTris++] = faceI;
+                    }
+                    else if (f.size() == 4)
+                    {
+                        quads[nQuads++] = faceI;
+                    }
+                    else
+                    {
+                        polys[nPolys++] = faceI;
+                    }
                 }
+
+                tris.setSize(nTris);
+                quads.setSize(nQuads);
+                polys.setSize(nPolys);
             }
-
-            tris.setSize(nTris);
-            quads.setSize(nQuads);
-            polys.setSize(nPolys);
         }
     }
 
+
     forAllConstIter(HashTable<labelList>, allPatchNames_, iter)
     {
         const word& patchName = iter.key();
@@ -271,12 +283,12 @@ Foam::ensightMesh::ensightMesh
         {
             if (patchIndices_.found(patchName))
             {
-                label patchi = patchIndices_.find(patchName)();
+                label patchI = patchIndices_.find(patchName)();
 
-                nfp.nPoints = mesh.boundaryMesh()[patchi].localPoints().size();
-                nfp.nTris = boundaryFaceSets_[patchi].tris.size();
-                nfp.nQuads = boundaryFaceSets_[patchi].quads.size();
-                nfp.nPolys = boundaryFaceSets_[patchi].polys.size();
+                nfp.nPoints = mesh.boundaryMesh()[patchI].localPoints().size();
+                nfp.nTris   = boundaryFaceSets_[patchI].tris.size();
+                nfp.nQuads  = boundaryFaceSets_[patchI].quads.size();
+                nfp.nPolys  = boundaryFaceSets_[patchI].polys.size();
             }
         }
 
@@ -304,9 +316,9 @@ void Foam::ensightMesh::writePoints
     OFstream& ensightGeometryFile
 ) const
 {
-    forAll(pointsComponent, pointi)
+    forAll(pointsComponent, pointI)
     {
-        ensightGeometryFile<< setw(12) << float(pointsComponent[pointi]) << nl;
+        ensightGeometryFile<< setw(12) << float(pointsComponent[pointI]) << nl;
     }
 }
 
@@ -380,9 +392,9 @@ void Foam::ensightMesh::writePrims
     {
         const cellShape& cellPoints = cellShapes[i];
 
-        forAll(cellPoints, pointi)
+        forAll(cellPoints, pointI)
         {
-            ensightGeometryFile<< setw(10) << cellPoints[pointi] + po;
+            ensightGeometryFile<< setw(10) << cellPoints[pointI] + po;
         }
         ensightGeometryFile << nl;
     }
@@ -415,9 +427,9 @@ void Foam::ensightMesh::writePrimsBinary
         {
             const cellShape& cellPoints = cellShapes[i];
 
-            forAll(cellPoints, pointi)
+            forAll(cellPoints, pointI)
             {
-                temp[n] = cellPoints[pointi] + po;
+                temp[n] = cellPoints[pointI] + po;
                 n++;
             }
         }
@@ -457,10 +469,10 @@ void Foam::ensightMesh::writePolys
         {
             const labelList& cf = cellFaces[polys[i]];
 
-            forAll(cf, facei)
+            forAll(cf, faceI)
             {
                 ensightGeometryFile
-                    << setw(10) << faces[cf[facei]].size() << nl;
+                    << setw(10) << faces[cf[faceI]].size() << nl;
             }
         }
 
@@ -468,13 +480,13 @@ void Foam::ensightMesh::writePolys
         {
             const labelList& cf = cellFaces[polys[i]];
 
-            forAll(cf, facei)
+            forAll(cf, faceI)
             {
-                const face& f = faces[cf[facei]];
+                const face& f = faces[cf[faceI]];
 
-                forAll(f, pointi)
+                forAll(f, pointI)
                 {
-                    ensightGeometryFile << setw(10) << f[pointi] + po;
+                    ensightGeometryFile << setw(10) << f[pointI] + po;
                 }
                 ensightGeometryFile << nl;
             }
@@ -513,11 +525,11 @@ void Foam::ensightMesh::writePolysBinary
         {
             const labelList& cf = cellFaces[polys[i]];
 
-            forAll(cf, facei)
+            forAll(cf, faceI)
             {
                 writeEnsDataBinary
                 (
-                    faces[cf[facei]].size(),
+                    faces[cf[faceI]].size(),
                     ensightGeometryFile
                 );
             }
@@ -527,13 +539,13 @@ void Foam::ensightMesh::writePolysBinary
         {
             const labelList& cf = cellFaces[polys[i]];
 
-            forAll(cf, facei)
+            forAll(cf, faceI)
             {
-                const face& f = faces[cf[facei]];
+                const face& f = faces[cf[faceI]];
 
-                forAll(f, pointi)
+                forAll(f, pointI)
                 {
-                    writeEnsDataBinary(f[pointi] + po,ensightGeometryFile);
+                    writeEnsDataBinary(f[pointI] + po,ensightGeometryFile);
                 }
             }
         }
@@ -648,9 +660,9 @@ void Foam::ensightMesh::writeFacePrims
         {
             const face& patchFace = patchFaces[i];
 
-            forAll(patchFace, pointi)
+            forAll(patchFace, pointI)
             {
-                ensightGeometryFile << setw(10) << patchFace[pointi] + po;
+                ensightGeometryFile << setw(10) << patchFace[pointI] + po;
             }
             ensightGeometryFile << nl;
         }
@@ -690,11 +702,11 @@ void Foam::ensightMesh::writeFacePrimsBinary
         {
             const face& patchFace = patchFaces[i];
 
-            forAll(patchFace, pointi)
+            forAll(patchFace, pointI)
             {
                 writeEnsDataBinary
                 (
-                    patchFace[pointi] + po,
+                    patchFace[pointI] + po,
                     ensightGeometryFile
                 );
             }
@@ -892,7 +904,7 @@ void Foam::ensightMesh::writeAscii
             postProcPath/ensightGeometryFileName,
             runTime.writeFormat(),
             runTime.writeVersion(),
-            runTime.writeCompression()
+            IOstream::UNCOMPRESSED
         );
     }
 
@@ -909,8 +921,8 @@ void Foam::ensightMesh::writeAscii
         ensightGeometryFile.precision(5);
 
         ensightGeometryFile
-            << "OpenFOAM Geometry File " << nl
-            << "OpenFOAM version " << Foam::FOAMversion << nl
+            << "EnSight Geometry File" << nl
+            << "written from OpenFOAM-" << Foam::FOAMversion << nl
             << "node id assign" << nl
             << "element id assign" << nl;
     }
@@ -927,7 +939,7 @@ void Foam::ensightMesh::writeAscii
             ensightGeometryFile
                 << "part" << nl
                 << setw(10) << 1 << nl
-                << "FOAM cells" << nl
+                << "internalMesh" << nl
                 << "coordinates" << nl
                 << setw(10) << nPoints
                 << endl;
@@ -1038,7 +1050,7 @@ void Foam::ensightMesh::writeAscii
     }
 
 
-    label ensightPatchi = 2;
+    label ensightPatchI = patchPartOffset_;
 
     forAllConstIter(HashTable<labelList>, allPatchNames_, iter)
     {
@@ -1049,7 +1061,7 @@ void Foam::ensightMesh::writeAscii
             const word& patchName = iter.key();
             const nFacePrimitives& nfp = nPatchPrims_.find(patchName)();
 
-            const labelList *trisPtr = NULL;
+            const labelList *trisPtr  = NULL;
             const labelList *quadsPtr = NULL;
             const labelList *polysPtr = NULL;
 
@@ -1058,15 +1070,15 @@ void Foam::ensightMesh::writeAscii
 
             if (patchIndices_.found(iter.key()))
             {
-                label patchi = patchIndices_.find(iter.key())();
-                const polyPatch& p = mesh_.boundaryMesh()[patchi];
+                label patchI = patchIndices_.find(iter.key())();
+                const polyPatch& p = mesh_.boundaryMesh()[patchI];
 
-                trisPtr = &boundaryFaceSets_[patchi].tris;
-                quadsPtr = &boundaryFaceSets_[patchi].quads;
-                polysPtr = &boundaryFaceSets_[patchi].polys;
+                trisPtr  = &boundaryFaceSets_[patchI].tris;
+                quadsPtr = &boundaryFaceSets_[patchI].quads;
+                polysPtr = &boundaryFaceSets_[patchI].polys;
 
                 patchPointsPtr = &(p.localPoints());
-                patchFacesPtr = &(p.localFaces());
+                patchFacesPtr  = &(p.localFaces());
             }
 
             const labelList& tris = *trisPtr;
@@ -1083,7 +1095,7 @@ void Foam::ensightMesh::writeAscii
                 {
                     ensightGeometryFile
                         << "part" << nl
-                        << setw(10) << ensightPatchi++ << nl
+                        << setw(10) << ensightPatchI++ << nl
                         << patchName << nl
                         << "coordinates" << nl
                         << setw(10) << nfp.nPoints
@@ -1235,11 +1247,11 @@ void Foam::ensightMesh::writeBinary
 
     if (Pstream::master())
     {
-        writeEnsDataBinary("C binary",ensightGeometryFile);
-        writeEnsDataBinary("OpenFOAM Geometry File",ensightGeometryFile);
-        writeEnsDataBinary("Binary format",ensightGeometryFile);
-        writeEnsDataBinary("node id assign",ensightGeometryFile);
-        writeEnsDataBinary("element id assign",ensightGeometryFile);
+        writeEnsDataBinary("C binary", ensightGeometryFile);
+        writeEnsDataBinary("EnSight Geometry File", ensightGeometryFile);
+        writeEnsDataBinary("written from OpenFOAM", ensightGeometryFile);
+        writeEnsDataBinary("node id assign", ensightGeometryFile);
+        writeEnsDataBinary("element id assign", ensightGeometryFile);
     }
 
     labelList pointOffsets(Pstream::nProcs(), 0);
@@ -1364,8 +1376,7 @@ void Foam::ensightMesh::writeBinary
 
     }
 
-    label ensightPatchi = 2;
-
+    label ensightPatchI = patchPartOffset_;
     label iCount = 0;
 
     forAllConstIter(HashTable<labelList>, allPatchNames_, iter)
@@ -1387,12 +1398,12 @@ void Foam::ensightMesh::writeBinary
 
             if (patchIndices_.found(iter.key()))
             {
-                label patchi = patchIndices_.find(iter.key())();
-                const polyPatch& p = mesh_.boundaryMesh()[patchi];
+                label patchI = patchIndices_.find(iter.key())();
+                const polyPatch& p = mesh_.boundaryMesh()[patchI];
 
-                trisPtr = &boundaryFaceSets_[patchi].tris;
-                quadsPtr = &boundaryFaceSets_[patchi].quads;
-                polysPtr = &boundaryFaceSets_[patchi].polys;
+                trisPtr = &boundaryFaceSets_[patchI].tris;
+                quadsPtr = &boundaryFaceSets_[patchI].quads;
+                polysPtr = &boundaryFaceSets_[patchI].polys;
 
                 patchPointsPtr = &(p.localPoints());
                 patchFacesPtr = &(p.localFaces());
@@ -1411,7 +1422,7 @@ void Foam::ensightMesh::writeBinary
                 if (Pstream::master())
                 {
                     writeEnsDataBinary("part",ensightGeometryFile);
-                    writeEnsDataBinary(ensightPatchi++,ensightGeometryFile);
+                    writeEnsDataBinary(ensightPatchI++,ensightGeometryFile);
                     //writeEnsDataBinary(patchName.c_str(),ensightGeometryFile);
                     writeEnsDataBinary(iter.key().c_str(),ensightGeometryFile);
                     writeEnsDataBinary("coordinates",ensightGeometryFile);
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.H
index fff8b797ab..6a3cb82470 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.H
@@ -78,11 +78,14 @@ class ensightMesh
 
     // Private data
 
+        //- Reference to the OpenFOAM mesh
+        const fvMesh& mesh_;
+
         //- Set binary file output
         bool binary_;
 
-        //- Reference to the OpenFOAM mesh
-        const fvMesh& mesh_;
+        //- The ensight part id for the first patch
+        label patchPartOffset_;
 
         cellSets meshCellSets_;
 
@@ -286,6 +289,12 @@ public:
                 return nPatchPrims_;
             }
 
+            //- The ensight part id for the first patch
+            label patchPartOffset() const
+            {
+                return patchPartOffset_;
+            }
+
 
     // I-O
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
index 10d261bca5..5dc6af99f3 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
@@ -23,7 +23,9 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Description
-    Translates FOAM data to EnSight format
+    Translates FOAM data to EnSight format.
+
+    An Ensight part is created for the internalMesh and for each patch.
 
 Usage
     - foamToEnsight [OPTION] \n
@@ -32,8 +34,16 @@ Usage
     @param -ascii \n
     Write Ensight data in ASCII format instead of "C Binary"
 
+    @param -patches patchList \n
+    Specify particular patches to write.
+    Specifying an empty list suppresses writing the internalMesh.
+
+    @param -noPatches \n
+    Suppress writing any patches.
+
 Note
     Parallel support for cloud data is not supported
+    - writes to @a EnSight directory to avoid collisions with foamToEnsightParts
 
 \*---------------------------------------------------------------------------*/
 
@@ -82,10 +92,11 @@ bool inFileNameList
 
 int main(int argc, char *argv[])
 {
-    argList::validOptions.insert("patches", "patch list");
     argList::validOptions.insert("ascii", "" );
-#   include "addTimeOptions.H"
+    argList::validOptions.insert("patches", "patchList");
+    argList::validOptions.insert("noPatches", "");
 
+#   include "addTimeOptions.H"
 #   include "setRootCase.H"
 
     // Check options
@@ -114,29 +125,28 @@ int main(int argc, char *argv[])
         regionPrefix = regionName;
     }
 
-    const label nTypes = 2;
-    const word fieldTypes[] =
+    const label nVolFieldTypes = 5;
+    const word volFieldTypes[] =
     {
         volScalarField::typeName,
-        volVectorField::typeName
+        volVectorField::typeName,
+        volSphericalTensorField::typeName,
+        volSymmTensorField::typeName,
+        volTensorField::typeName
     };
 
-    // Create the output folder
-    const word postProcDir = "EnSight";
-
     // Path to EnSight folder at case level only
     // - For parallel cases, data only written from master
-//    fileName postProcPath = runTime.path()/postProcDir;
-    fileName postProcPath = args.rootPath()/args.globalCaseName()/postProcDir;
+    fileName ensightDir = args.rootPath()/args.globalCaseName()/"EnSight";
 
     if (Pstream::master())
     {
-        if (isDir(postProcPath))
+        if (isDir(ensightDir))
         {
-            rmDir(postProcPath);
+            rmDir(ensightDir);
         }
 
-        mkDir(postProcPath);
+        mkDir(ensightDir);
     }
 
     // Start of case file header output
@@ -147,36 +157,23 @@ int main(int argc, char *argv[])
     OFstream *ensightCaseFilePtr = NULL;
     if (Pstream::master())
     {
-        fileName ensightCaseFileName = prepend + "case";
+        fileName caseFileName = prepend + "case";
+        Info<< nl << "write case: " << caseFileName.c_str() << endl;
 
-        if (!binary)
-        {
-            ensightCaseFilePtr = new OFstream
-            (
-                postProcPath/ensightCaseFileName,
-                runTime.writeFormat(),
-                runTime.writeVersion(),
-                runTime.writeCompression()
-            );
-        }
-        else
-        {
-            ensightCaseFilePtr = new OFstream
-            (
-                postProcPath/ensightCaseFileName,
-                runTime.writeFormat(),
-                runTime.writeVersion(),
-                IOstream::UNCOMPRESSED
-            );
-        }
+        // the case file is always ASCII
+        ensightCaseFilePtr = new OFstream
+        (
+            ensightDir/caseFileName,
+            IOstream::ASCII
+        );
 
-        Info<< nl << "Case file is " << ensightCaseFileName << endl;
+        *ensightCaseFilePtr
+            << "FORMAT" << nl
+            << "type: ensight gold" << nl << nl;
     }
 
     OFstream& ensightCaseFile = *ensightCaseFilePtr;
 
-#   include "ensightCaseHeader.H"
-
     // Construct the EnSight mesh
     ensightMesh eMesh(mesh, args, binary);
 
@@ -188,19 +185,20 @@ int main(int argc, char *argv[])
 #   include "checkMeshMoving.H"
 
     wordHashSet allCloudNames;
-    word geomCaseFileName = prepend + "000";
     if (Pstream::master())
     {
+        word geomFileName = prepend + "000";
+
         // test pre check variable if there is a moving mesh
-        if (meshMoving == true)
+        if (meshMoving)
         {
-            geomCaseFileName = prepend + "***";
+            geomFileName = prepend + "***";
         }
 
         ensightCaseFile
             << "GEOMETRY" << nl
             << "model:        1     "
-            << (geomCaseFileName + ".mesh").c_str() << nl;
+            << (geomFileName + ".mesh").c_str() << nl;
     }
 
     // Identify if lagrangian data exists at each time, and add clouds
@@ -304,7 +302,7 @@ int main(int argc, char *argv[])
         {
             eMesh.write
             (
-                postProcPath,
+                ensightDir,
                 prepend,
                 timeIndex,
                 ensightCaseFile
@@ -324,94 +322,94 @@ int main(int argc, char *argv[])
         // Cell field data output
         // ~~~~~~~~~~~~~~~~~~~~~~
 
-        for (label i=0; i<nTypes; i++)
+        for (label i=0; i<nVolFieldTypes; i++)
         {
-            wordList fieldNames = objects.names(fieldTypes[i]);
+            wordList fieldNames = objects.names(volFieldTypes[i]);
 
             for (label j=0; j<fieldNames.size(); j++)
             {
                 word fieldName = fieldNames[j];
 
-                bool variableGood = true;
-
 #               include "checkData.H"
 
-                if (variableGood)
+                if (!variableGood)
                 {
-                    IOobject fieldObject
-                    (
-                        fieldName,
-                        mesh.time().timeName(),
-                        mesh,
-                        IOobject::MUST_READ,
-                        IOobject::NO_WRITE
-                    );
+                    continue;
+                }
 
-                    if (fieldTypes[i] == volScalarField::typeName)
-                    {
-                        ensightField<scalar>
-                        (
-                            fieldObject,
-                            eMesh,
-                            postProcPath,
-                            prepend,
-                            timeIndex,
-                            binary,
-                            ensightCaseFile
-                        );
-                    }
-                    else if (fieldTypes[i] == volVectorField::typeName)
-                    {
-                        ensightField<vector>
-                        (
-                            fieldObject,
-                            eMesh,
-                            postProcPath,
-                            prepend,
-                            timeIndex,
-                            binary,
-                            ensightCaseFile
-                        );
-                    }
-                    else if (fieldTypes[i] == volSphericalTensorField::typeName)
-                    {
-                        ensightField<sphericalTensor>
-                        (
-                            fieldObject,
-                            eMesh,
-                            postProcPath,
-                            prepend,
-                            timeIndex,
-                            binary,
-                            ensightCaseFile
-                        );
-                    }
-                    else if (fieldTypes[i] == volSymmTensorField::typeName)
-                    {
-                        ensightField<symmTensor>
-                        (
-                            fieldObject,
-                            eMesh,
-                            postProcPath,
-                            prepend,
-                            timeIndex,
-                            binary,
-                            ensightCaseFile
-                        );
-                    }
-                    else if (fieldTypes[i] == volTensorField::typeName)
-                    {
-                        ensightField<tensor>
-                        (
-                            fieldObject,
-                            eMesh,
-                            postProcPath,
-                            prepend,
-                            timeIndex,
-                            binary,
-                            ensightCaseFile
-                        );
-                    }
+                IOobject fieldObject
+                (
+                    fieldName,
+                    mesh.time().timeName(),
+                    mesh,
+                    IOobject::MUST_READ,
+                    IOobject::NO_WRITE
+                );
+
+                if (volFieldTypes[i] == volScalarField::typeName)
+                {
+                    ensightField<scalar>
+                    (
+                        fieldObject,
+                        eMesh,
+                        ensightDir,
+                        prepend,
+                        timeIndex,
+                        binary,
+                        ensightCaseFile
+                    );
+                }
+                else if (volFieldTypes[i] == volVectorField::typeName)
+                {
+                    ensightField<vector>
+                    (
+                        fieldObject,
+                        eMesh,
+                        ensightDir,
+                        prepend,
+                        timeIndex,
+                        binary,
+                        ensightCaseFile
+                    );
+                }
+                else if (volFieldTypes[i] == volSphericalTensorField::typeName)
+                {
+                    ensightField<sphericalTensor>
+                    (
+                        fieldObject,
+                        eMesh,
+                        ensightDir,
+                        prepend,
+                        timeIndex,
+                        binary,
+                        ensightCaseFile
+                    );
+                }
+                else if (volFieldTypes[i] == volSymmTensorField::typeName)
+                {
+                    ensightField<symmTensor>
+                    (
+                        fieldObject,
+                        eMesh,
+                        ensightDir,
+                        prepend,
+                        timeIndex,
+                        binary,
+                        ensightCaseFile
+                    );
+                }
+                else if (volFieldTypes[i] == volTensorField::typeName)
+                {
+                    ensightField<tensor>
+                    (
+                        fieldObject,
+                        eMesh,
+                        ensightDir,
+                        prepend,
+                        timeIndex,
+                        binary,
+                        ensightCaseFile
+                    );
                 }
             }
         }
@@ -434,7 +432,7 @@ int main(int argc, char *argv[])
             ensightParticlePositions
             (
                 mesh,
-                postProcPath,
+                ensightDir,
                 timeFile,
                 cloudName,
                 cloudExists
@@ -460,7 +458,7 @@ int main(int argc, char *argv[])
                     ensightCloudField<scalar>
                     (
                         fieldObject,
-                        postProcPath,
+                        ensightDir,
                         prepend,
                         timeIndex,
                         cloudName,
@@ -473,7 +471,7 @@ int main(int argc, char *argv[])
                     ensightCloudField<vector>
                     (
                         fieldObject,
-                        postProcPath,
+                        ensightDir,
                         prepend,
                         timeIndex,
                         cloudName,
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/checkHasMovingMesh.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/checkHasMovingMesh.H
index a9367daf8e..a5a2dd7d2d 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/checkHasMovingMesh.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/checkHasMovingMesh.H
@@ -6,15 +6,13 @@ if (timeDirs.size() > 1)
     hasMovingMesh = true;
     for (label i=0; i < timeDirs.size() && hasMovingMesh; ++i)
     {
-        IOobject io
+        hasMovingMesh = IOobject
         (
             "points",
             timeDirs[i].name(),
             polyMesh::meshSubDir,
             mesh,
             IOobject::NO_READ
-        );
-        
-        hasMovingMesh = io.headerOk();
+        ).headerOk();
     }
 }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H
index edfbb5ae7d..63ef5eef21 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H
@@ -1,40 +1,40 @@
-// check the final time directory for
+// check the final time directory for the following:
 
 // 1. volume fields
 HashTable<word> volumeFields;
 
 // 2. the fields for each cloud:
-HashTable<HashTable<word> > cloudFields;
+HashTable< HashTable<word> > cloudFields;
 
-if (timeDirs.size() > 1)
+if (timeDirs.size())
 {
     IOobjectList objs(mesh, timeDirs[timeDirs.size()-1].name());
 
     forAllConstIter(IOobjectList, objs, fieldIter)
     {
         const IOobject& obj = *fieldIter();
+        const word& fieldName = obj.name();
+        const word& fieldType = obj.headerClassName();
 
-        if
-        (
-            obj.headerClassName() == volScalarField::typeName
-         || obj.headerClassName() == volVectorField::typeName
-        )
+        if (fieldName.size() > 2 && fieldName(fieldName.size()-2, 2) == "_0")
         {
-            // Add field and field type
-            volumeFields.insert
-            (
-                obj.name(),
-                obj.headerClassName()
-            );
+            // ignore _0 fields
+        }
+        else if (volFieldTypes.found(fieldType))
+        {
+            // simply ignore types that we don't handle
+            volumeFields.insert(fieldName, fieldType);
         }
     }
 
-    // now check for lagrangian/<cloudName>
 
+    //
+    // now check for lagrangian/<cloudName>
+    //
     fileNameList cloudDirs = readDir
     (
         runTime.path()
-      / timeDirs[timeDirs.size() - 1].name()
+      / timeDirs[timeDirs.size()-1].name()
       / regionPrefix
       / cloud::prefix,
         fileName::DIRECTORY
@@ -47,42 +47,59 @@ if (timeDirs.size() > 1)
         // Create a new hash table for each cloud
         cloudFields.insert(cloudName, HashTable<word>());
 
-        // Identify the new cloud in the hash table
+        // Identify the new cloud within the hash table
         HashTable<HashTable<word> >::iterator cloudIter =
             cloudFields.find(cloudName);
 
-        IOobjectList cloudObjs
+        IOobjectList objs
         (
             mesh,
-            timeDirs[timeDirs.size() - 1].name(),
+            timeDirs[timeDirs.size()-1].name(),
             cloud::prefix/cloudName
         );
 
         bool hasPositions = false;
-        forAllConstIter(IOobjectList, cloudObjs, fieldIter)
+        forAllConstIter(IOobjectList, objs, fieldIter)
         {
             const IOobject obj = *fieldIter();
+            const word& fieldName = obj.name();
+            const word& fieldType = obj.headerClassName();
 
-            if (obj.name() == "positions")
+            if (fieldName == "positions")
             {
                 hasPositions = true;
             }
-            else
+            else if (cloudFieldTypes.found(fieldType))
             {
-                // Add field and field type
-                cloudIter().insert
-                (
-                    obj.name(),
-                    obj.headerClassName()
-                );
+                // simply ignore types that we don't handle
+                cloudIter().insert(fieldName, fieldType);
             }
         }
 
-        // drop this cloud if it has no positions
-        if (!hasPositions)
+        // drop this cloud if it has no positions or is otherwise empty
+        if (!hasPositions || cloudIter().empty())
         {
+            Info<< "removing cloud " << cloudName << endl;
             cloudFields.erase(cloudIter);
         }
     }
+
+    //
+    // verify that the variable is present for all times
+    //
+    for (label i=0; volumeFields.size() && i < timeDirs.size(); ++i)
+    {
+        IOobjectList objs(mesh, timeDirs[i].name());
+
+        forAllIter(HashTable<word>, volumeFields, fieldIter)
+        {
+            const word& fieldName = fieldIter.key();
+
+            if (!objs.found(fieldName))
+            {
+                volumeFields.erase(fieldIter);
+            }
+        }
+    }
 }
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
index af2dee175a..651224d17c 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
@@ -83,23 +83,19 @@ int main(int argc, char *argv[])
     argList::validOptions.insert("index",  "start");
     argList::validOptions.insert("noMesh", "");
 
-    const word volFieldTypes[] =
-    {
-        volScalarField::typeName,
-        volVectorField::typeName,
-        volSphericalTensorField::typeName,
-        volSymmTensorField::typeName,
-        volTensorField::typeName,
-        word::null
-    };
+    // the volume field types that we handle
+    wordHashSet volFieldTypes;
+    volFieldTypes.insert(volScalarField::typeName);
+    volFieldTypes.insert(volVectorField::typeName);
+    volFieldTypes.insert(volSphericalTensorField::typeName);
+    volFieldTypes.insert(volSymmTensorField::typeName);
+    volFieldTypes.insert(volTensorField::typeName);
 
-    const word sprayFieldTypes[] =
-    {
-        scalarIOField::typeName,
-        vectorIOField::typeName,
-        tensorIOField::typeName,
-        word::null
-    };
+    // the lagrangian field types that we handle
+    wordHashSet cloudFieldTypes;
+    cloudFieldTypes.insert(scalarIOField::typeName);
+    cloudFieldTypes.insert(vectorIOField::typeName);
+    cloudFieldTypes.insert(tensorIOField::typeName);
 
     const char* geometryName = "geometry";
 
@@ -168,7 +164,6 @@ int main(int argc, char *argv[])
 
 #   include "checkHasMovingMesh.H"
 #   include "findFields.H"
-#   include "validateFields.H"
 
     if (hasMovingMesh && optNoMesh)
     {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/moveMesh.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/moveMesh.H
index 546148c7cf..284a0df35b 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/moveMesh.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/moveMesh.H
@@ -11,8 +11,6 @@
     {
         // Read new points
         io.readOpt() = IOobject::MUST_READ;
-        pointIOField newPoints(io);
-
-        mesh.movePoints(newPoints);
+        mesh.movePoints(pointIOField(io));
     }
 }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/validateFields.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/validateFields.H
deleted file mode 100644
index 6c640b41fa..0000000000
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/validateFields.H
+++ /dev/null
@@ -1,105 +0,0 @@
-// ignore special fields or fields that we don't handle
-//
-forAllIter(HashTable<word>, volumeFields, fieldIter)
-{
-    const word& fieldName = fieldIter.key();
-    const word& fieldType = fieldIter();
-
-    // ignore _0 fields
-    if (fieldName.size() > 2 && fieldName(fieldName.size() - 2, 2) == "_0")
-    {
-        volumeFields.erase(fieldIter);
-    }
-    else
-    {
-        // remove types that we don't handle:
-        bool invalid = true;
-        for (label typeI=0; invalid && volFieldTypes[typeI].size(); ++typeI)
-        {
-            if (fieldType == volFieldTypes[typeI])
-            {
-                invalid = false;
-            }
-        }
-
-        if (invalid)
-        {
-            Info<< "ignoring " << fieldType << ": " << fieldName << endl;
-            volumeFields.erase(fieldIter);
-        }
-    }
-}
-
-// verify that the variable is present for all times
-//
-for (label i=0; volumeFields.size() && i < timeDirs.size(); ++i)
-{
-    IOobjectList objs(mesh, timeDirs[i].name());
-
-    forAllIter(HashTable<word>, volumeFields, fieldIter)
-    {
-        const word& fieldName = fieldIter.key();
-
-        if (!objs.found(fieldName))
-        {
-            volumeFields.erase(fieldIter);
-        }
-    }
-}
-
-
-
-// ignore fields that we don't handle
-//
-forAllIter(HashTable<HashTable<word> >, cloudFields, cloudIter)
-{
-    const word& cloudName = cloudIter.key();
-
-    forAllIter(HashTable<word>, cloudIter(), fieldIter)
-    {
-        const word& fieldName = fieldIter.key();
-        const word& fieldType = fieldIter();
-
-        // remove types that we don't handle:
-        bool invalid = true;
-        for (label typeI=0; invalid && sprayFieldTypes[typeI].size(); ++typeI)
-        {
-            if (fieldType == sprayFieldTypes[typeI])
-            {
-                invalid = false;
-            }
-        }
-
-        if (invalid)
-        {
-            Info<< "ignoring " << fieldType << ": " << fieldName << endl;
-            cloudIter().erase(fieldIter);
-        }
-    }
-
-    if (cloudIter().empty())
-    {
-        Info<< "removing cloud " << cloudName << endl;
-        cloudFields.erase(cloudIter);
-    }
-}
-
-// DEBUGGING
-// Info<<"final fields (";
-// forAllConstIter(HashTable<word>, volumeFields, fieldIter)
-// {
-//     Info<< " " << fieldIter.key();
-// }
-//
-// Info<< " )\n";
-//
-// forAllConstIter(HashTable<HashTable<word> >, cloudFields, cloudIter)
-// {
-//     Info<<"final fields for lagrangian/" << cloudIter.key() << " (";
-//     forAllConstIter(HashTable<word>, cloudIter(), fieldIter)
-//     {
-//         Info<< " " << fieldIter.key();
-//     }
-//     Info<< " )\n";
-// }
-

From 92766a441852d02a66ba8f51a5aed28f7c9c3e53 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 12 May 2009 13:23:11 +0100
Subject: [PATCH 105/175] removed link to local coalCombustion library

---
 applications/solvers/Lagrangian/reactingParcelFoam/Make/options | 1 -
 1 file changed, 1 deletion(-)

diff --git a/applications/solvers/Lagrangian/reactingParcelFoam/Make/options b/applications/solvers/Lagrangian/reactingParcelFoam/Make/options
index 21575a94ae..b0e474c308 100644
--- a/applications/solvers/Lagrangian/reactingParcelFoam/Make/options
+++ b/applications/solvers/Lagrangian/reactingParcelFoam/Make/options
@@ -26,7 +26,6 @@ EXE_LIBS = \
     -lcompressibleLESModels \
     -llagrangian \
     -llagrangianIntermediate \
-    -lcoalCombustion\
     -lspecie \
     -lbasicThermophysicalModels \
     -lliquids \

From d45bae5db4185ee9926d7486585cf74ead1f91b2 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 12 May 2009 13:23:51 +0100
Subject: [PATCH 106/175] better naming of mass transfer fields

---
 .../clouds/Templates/ReactingCloud/ReactingCloud.C            | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
index 4fec0e0666..86ed6862e4 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -109,7 +109,9 @@ Foam::ReactingCloud<ParcelType>::ReactingCloud
             (
                 IOobject
                 (
-                    this->name() + "rhoTrans" + Foam::name(i),
+                    this->name()
+                      + "rhoTrans_"
+                      + thermo.composition().Y()[i].name(),
                     this->db().time().timeName(),
                     this->db(),
                     IOobject::NO_READ,

From 8f21831abe001af8c630137f4745d280cb011fb9 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 12 May 2009 13:24:13 +0100
Subject: [PATCH 107/175] typo

---
 .../parcels/Templates/KinematicParcel/KinematicParcel.C         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index 583f3ed303..5dd28f50cc 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -81,7 +81,7 @@ void Foam::KinematicParcel<ParcelType>::calc
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     const scalar np0 = nParticle_;
     const scalar d0 = d_;
-    const scalar U0 = U_;
+    const vector U0 = U_;
     const scalar rho0 = rho_;
     const scalar mass0 = mass();
 

From b778c94ca91f9f26ab10a6fdc8cb2e30f51455ae Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 12 May 2009 13:24:48 +0100
Subject: [PATCH 108/175] bugix: was returning wrong index

---
 .../CompositionModel/CompositionModel/CompositionModel.C        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
index d71e98d2b3..fb385fd0d9 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
@@ -263,7 +263,7 @@ Foam::label Foam::CompositionModel<CloudType>::localToGlobalGasId
             << nl << abort(FatalError);
     }
 
-    return id;
+    return gid;
 }
 
 

From 58aa677a7445c7519ca9a6ec6ea00ec70f4c7f9d Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 12 May 2009 18:31:13 +0100
Subject: [PATCH 109/175] bugfix: removed reference to tmp field

---
 .../alphaSgsJayatillekeWallFunctionFvPatchScalarField.C         | 2 +-
 .../alphaSgsWallFunctionFvPatchScalarField.C                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.C
index 10838a6dac..b868d8baa5 100644
--- a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.C
@@ -191,7 +191,7 @@ void alphaSgsJayatillekeWallFunctionFvPatchScalarField::evaluate
     const label patchI = patch().index();
 
     const scalarField& muw = lesModel.mu().boundaryField()[patchI];
-    const scalarField& muSgsw = lesModel.muSgs()().boundaryField()[patchI];
+    const scalarField muSgsw = lesModel.muSgs()().boundaryField()[patchI];
 
     const scalarField& alphaw = lesModel.alpha().boundaryField()[patchI];
     scalarField& alphaSgsw = *this;
diff --git a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.C
index 3c697c5c17..5d59e7f6d7 100644
--- a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.C
@@ -137,7 +137,7 @@ void alphaSgsWallFunctionFvPatchScalarField::evaluate
     const scalar Prt = lesModel.Prt().value();
 
     // Get the turbulent viscosity at the wall
-    const scalarField& muSgsw =
+    const scalarField muSgsw =
         lesModel.muSgs()().boundaryField()[patch().index()];
 
     operator==(muSgsw/Prt);

From f2c061d425c151d16573f4037454089c05752c1a Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 12 May 2009 18:50:57 +0100
Subject: [PATCH 110/175] using ROOTVSMALL instead of SMALL

---
 .../HeatTransferModel/HeatTransferModel/HeatTransferModel.C     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
index 93a621d098..37b5276269 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
@@ -118,7 +118,7 @@ Foam::scalar Foam::HeatTransferModel<CloudType>::Cu
     const scalar muc
 ) const
 {
-    const scalar Re = rhoc*mag(Ur)*dp/(muc + SMALL);
+    const scalar Re = rhoc*mag(Ur)*dp/(muc + ROOTVSMALL);
 
 //    const scalar Pr = muc/alphac;
     const scalar Pr = this->Pr();

From 326dd9f0fd0edec60be264acfe7d675839284107 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 12 May 2009 18:51:45 +0100
Subject: [PATCH 111/175] added cellMass() function

---
 .../Templates/KinematicParcel/KinematicParcel.H        |  3 +++
 .../Templates/KinematicParcel/KinematicParcelI.H       | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index c2ed55c2c0..f90c86b918 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -341,6 +341,9 @@ public:
             //  routine
             inline label faceInterpolation() const;
 
+            //- Cell owner mass
+            inline scalar massCell(const label cellI) const;
+
             //- Particle mass
             inline scalar mass() const;
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
index edf4b0771e..bf4545032a 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
@@ -290,6 +290,16 @@ inline Foam::label Foam::KinematicParcel<ParcelType>::faceInterpolation() const
 }
 
 
+template <class ParcelType>
+inline Foam::scalar Foam::KinematicParcel<ParcelType>::massCell
+(
+    const label cellI
+) const
+{
+    return rhoc_*this->cloud().pMesh().cellVolumes()[cellI];
+}
+
+
 template <class ParcelType>
 inline Foam::scalar Foam::KinematicParcel<ParcelType>::mass() const
 {

From 0d2fd6b2524a3c4dbd32862fafe8a80db00d410c Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Wed, 13 May 2009 00:02:36 +0100
Subject: [PATCH 112/175] Added stabilisation to the nut update.

---
 .../nutRoughWallFunctionFvPatchScalarField.C  | 56 +++++++++++--------
 1 file changed, 32 insertions(+), 24 deletions(-)

diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C
index 138e783333..42e537295e 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C
@@ -49,21 +49,20 @@ scalar nutRoughWallFunctionFvPatchScalarField::fnRough
     const scalar kappa
 ) const
 {
-    // Set deltaB based on non-dimensional roughness height
-    scalar deltaB = 0.0;
+    // Return fn based on non-dimensional roughness height
+
     if (KsPlus < 90.0)
     {
-        deltaB =
-            1.0/kappa
-            *log((KsPlus - 2.25)/87.75 + Cs*KsPlus)
-            *sin(0.4258*(log(KsPlus) - 0.811));
+        return pow
+        (
+            (KsPlus - 2.25)/87.75 + Cs*KsPlus,
+            sin(0.4258*(log(KsPlus) - 0.811))
+        );
     }
     else
     {
-        deltaB = 1.0/kappa*log(1.0 + Cs*KsPlus);
+        return (1.0 + Cs*KsPlus);
     }
-
-    return exp(min(deltaB*kappa, 50.0));
 }
 
 
@@ -183,7 +182,7 @@ void nutRoughWallFunctionFvPatchScalarField::updateCoeffs()
     const scalar Cmu25 = pow(Cmu, 0.25);
     const scalar kappa = ras.kappa().value();
     const scalar E = ras.E().value();
-    scalar yPlusLam = ras.yPlusLam();
+    const scalar yPlusLam = ras.yPlusLam();
 
     const scalarField& y = ras.y()[patch().index()];
 
@@ -199,17 +198,35 @@ void nutRoughWallFunctionFvPatchScalarField::updateCoeffs()
         label faceCellI = patch().faceCells()[faceI];
 
         scalar uStar = Cmu25*sqrt(k[faceCellI]);
-
         scalar yPlus = uStar*y[faceI]/nuw[faceI];
-
         scalar KsPlus = uStar*Ks_[faceI]/nuw[faceI];
 
         scalar Edash = E;
-        scalar yPlusLamNew = yPlusLam;
+
         if (KsPlus > 2.25)
         {
             Edash = E/fnRough(KsPlus, Cs_[faceI], kappa);
-            yPlusLam = ras.yPlusLam(kappa, Edash);
+        }
+
+        if (yPlus > yPlusLam)
+        {
+            scalar limitingNutw = max(nutw[faceI], nuw[faceI]);
+
+            // To avoid oscillations limit the change in the wall viscosity
+            // which is particularly important if it temporarily becomes zero
+            nutw[faceI] =
+                max
+                (
+                    min
+                    (
+                        nuw[faceI]*(yPlus*kappa/log(Edash*yPlus) - 1),
+                        2*limitingNutw
+                    ), 0.5*limitingNutw
+                );
+        }
+        else
+        {
+            nutw[faceI] = 0.0;
         }
 
         if (debug)
@@ -217,18 +234,9 @@ void nutRoughWallFunctionFvPatchScalarField::updateCoeffs()
             Info<< "yPlus = " << yPlus
                 << ", KsPlus = " << KsPlus
                 << ", Edash = " << Edash
-                << ", yPlusLam = " << yPlusLam
+                << ", nutw = " << nutw[faceI]
                 << endl;
         }
-
-        if (yPlus > yPlusLamNew)
-        {
-            nutw[faceI] = nuw[faceI]*(yPlus*kappa/log(Edash*yPlus) - 1);
-        }
-        else
-        {
-            nutw[faceI] = 0.0;
-        }
     }
 }
 

From 2aec8f2820fa07b3dfd1fe48820cdec173f11b3a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Wed, 13 May 2009 11:31:44 +0200
Subject: [PATCH 113/175] renamed buildParaView3.5-cvs -> buildParaView and
 reworked

- get version from $ParaView_VERSION or from -version option
- added QT gui support (useful when compiling enGrid)
- update files for finding cmake-2.6.4 as well
- added bin/engridFoam for calling a version of enGrid that uses the
  paraview libraries compiled with/for OpenFOAM
- added foam3rdParty change directory alias
---
 bin/{buildParaView3.5-cvs => buildParaView} |  83 ++++++---
 bin/buildParaView-python                    |   1 +
 bin/buildParaView3.5-cvs-python             |   1 -
 bin/engridFoam                              |  66 +++++++
 bin/tools/buildParaView3.4                  | 192 --------------------
 bin/tools/buildParaViewFunctions            |  85 +++++----
 etc/aliases.csh                             |   1 +
 etc/aliases.sh                              |   1 +
 etc/apps/cint/bashrc                        |   2 +-
 etc/apps/cint/cshrc                         |   4 +-
 etc/apps/ensight/bashrc                     |   4 +-
 etc/apps/ensight/cshrc                      |   6 +-
 etc/apps/paraview/bashrc                    |  26 ++-
 etc/apps/paraview/cshrc                     |  23 ++-
 etc/apps/paraview3/bashrc                   |   4 +-
 etc/apps/paraview3/cshrc                    |   6 +-
 16 files changed, 214 insertions(+), 291 deletions(-)
 rename bin/{buildParaView3.5-cvs => buildParaView} (72%)
 create mode 120000 bin/buildParaView-python
 delete mode 120000 bin/buildParaView3.5-cvs-python
 create mode 100755 bin/engridFoam
 delete mode 100755 bin/tools/buildParaView3.4

diff --git a/bin/buildParaView3.5-cvs b/bin/buildParaView
similarity index 72%
rename from bin/buildParaView3.5-cvs
rename to bin/buildParaView
index f12a158973..76a0264e69 100755
--- a/bin/buildParaView3.5-cvs
+++ b/bin/buildParaView
@@ -24,38 +24,38 @@
 #     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
 # Script
-#     buildParaView3.5-cvs
+#     buildParaView
 #
 # Description
-#     Build and install ParaView
-#     - run from folder above ParaView source folder or place the
-#       ParaView source under $WM_THIRD_PARTY_DIR
+#     Build and install paraview
+#     - run from folder above paraview source folder or place the
+#       paraview source under $WM_THIRD_PARTY_DIR
 #
 #------------------------------------------------------------------------------
 . $WM_PROJECT_DIR/bin/tools/buildParaViewFunctions
 
-PARAVIEW_SRC=paraview-3.5-cvs
-PARAVIEW_MAJOR_VERSION=3.5
-
 # User options:
 # ~~~~~~~~~~~~~
 
 # MPI support:
-WITH_MPI=OFF
+withMPI=false
 MPI_MAX_PROCS=32
 
 # Python support:
 # note: script will try to determine the appropriate python library.
 #       If it fails, specify the path using the PYTHON_LIBRARY variable
-WITH_PYTHON=OFF
+withPYTHON=false
 PYTHON_LIBRARY=""
-# PYTHON_LIBRARY="/usr/lib64/libpython2.5.so.1.0"
+# PYTHON_LIBRARY="/usr/lib64/libpython2.6.so.1.0"
 
 # MESA graphics support:
-WITH_MESA=OFF
-MESA_INCLUDE_DIR="/usr/include/GL"
+withMESA=false
+MESA_INCLUDE="/usr/include/GL"
 MESA_LIBRARY="/usr/lib64/libOSMesa.so"
 
+# extra QT gui support (useful for re-using the installation for engrid)
+withQTSUPPORT=true
+
 #
 # No further editing below this line
 #------------------------------------------------------------------------------
@@ -65,13 +65,15 @@ usage() {
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 
-usage: ${0##*/} [OPTION]
+usage: $Script [OPTION]
 options:
-  -fast      for repeated builds (-make -install) *use with caution*
-  -mpi       with mpi (if not already enabled)
-  -python    with python (if not already enabled)
-  -mesa      with mesa (if not already enabled)
-  -verbose   verbose output in Makefiles
+  -rebuild      for repeated builds (-make -install) *use with caution*
+  -mpi          with mpi (if not already enabled)
+  -python       with python (if not already enabled)
+  -mesa         with mesa (if not already enabled)
+  -qt           with extra Qt gui support (if not already enabled)
+  -verbose      verbose output in Makefiles
+  -version VER  specify an alternative version (default: $ParaView_VERSION)
   -help
 
 For finer control, the build stages can be also selected individually
@@ -82,25 +84,34 @@ For finer control, the build stages can be also selected individually
   -install
   [-envpath]    alter absolute paths in CMake files to use env variables
 
-Build and install $PARAVIEW_SRC
-  - run from folder above the ParaView source folder or place the
-    ParaView source under \$WM_THIRD_PARTY_DIR
+Build and install paraview-$ParaView_VERSION
+  - run from folder above the ParaView source folder or place the ParaView
+    source under \$WM_THIRD_PARTY_DIR ($WM_THIRD_PARTY_DIR)
 
 USAGE
    exit 1
 }
 
-# add options based on script name:
-case "$Script" in *-mpi*)    WITH_MPI=ON;; esac
-case "$Script" in *-python*) WITH_PYTHON=ON;; esac
-case "$Script" in *-mesa*)   WITH_MESA=ON;; esac
+#------------------------------------------------------------------------------
 
+#
+# add options based on script name:
+#
+case "$Script" in *-mpi*)    withMPI=true;; esac
+case "$Script" in *-python*) withPYTHON=true;; esac
+case "$Script" in *-mesa*)   withMESA=true;; esac
+case "$Script" in *-qt*)     withQTSUPPORT=true;; esac
+
+#
+# various building stages
+#
 runCONFIG=true
 runMAKE=true
 runMAKEDOC=true
 runINSTALL=true
 runENVPATH=false
 
+
 # parse options
 while [ "$#" -gt 0 ]
 do
@@ -144,7 +155,7 @@ do
         runENVPATH=true
         shift
         ;;
-    -fast)               # shortcut for rebuild
+    -rebuild)            # shortcut for rebuilding
         runCONFIG=false
         runMAKE=true
         runMAKEDOC=false
@@ -152,36 +163,48 @@ do
         shift
         ;;
     -mpi)
-        WITH_MPI=ON
+        withMPI=true
         shift
         ;;
     -python)
-        WITH_PYTHON=ON
+        withPYTHON=true
         shift
         ;;
     -mesa)
-        WITH_MESA=ON
+        withMESA=true
+        shift
+        ;;
+    -qt)
+        withQTSUPPORT=true
         shift
         ;;
     -verbose)
-        VERBOSE=ON
+        withVERBOSE=true
         shift
         ;;
+    -version)
+        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+        export ParaView_VERSION=$2
+        shift 2
+        ;;
     *)
         usage "unknown option/argument: '$*'"
         ;;
     esac
 done
 
+
 # Set configure options
 #~~~~~~~~~~~~~~~~~~~~~~
 addVerbosity        # verbose makefiles
 addMpiSupport       # set MPI-specific options
 addPythonSupport    # set Python-specific options
 addMesaSupport      # set MESA-specific options
+addQtSupport        # add extra Qt support
 
 getPaths            # discover where things are or should be put
 
+
 # Build and install
 # ~~~~~~~~~~~~~~~~~
 [ $runCONFIG  = true ] && configParaView
diff --git a/bin/buildParaView-python b/bin/buildParaView-python
new file mode 120000
index 0000000000..5c6464acd1
--- /dev/null
+++ b/bin/buildParaView-python
@@ -0,0 +1 @@
+buildParaView
\ No newline at end of file
diff --git a/bin/buildParaView3.5-cvs-python b/bin/buildParaView3.5-cvs-python
deleted file mode 120000
index d3ed3924a8..0000000000
--- a/bin/buildParaView3.5-cvs-python
+++ /dev/null
@@ -1 +0,0 @@
-buildParaView3.5-cvs
\ No newline at end of file
diff --git a/bin/engridFoam b/bin/engridFoam
new file mode 100755
index 0000000000..37e61b0569
--- /dev/null
+++ b/bin/engridFoam
@@ -0,0 +1,66 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  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
+#
+# Script
+#     engridFoam
+#
+# Description
+#     start engrid using the paraview libraries from OpenFOAM
+#
+#------------------------------------------------------------------------------
+usage() {
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat<<USAGE
+
+usage: ${0##*/} [OPTION]
+options:
+  -help
+
+* start engrid using the paraview-$ParaView_VERSION libraries
+  passes through engrid options unmodified
+
+USAGE
+    exit 1
+}
+
+# report usage
+[ "$1" = "-h" -o "$1" = "-help" ] && usage
+
+# set the major version "<digits>.<digits>"
+ParaView_MAJOR_VERSION=$(echo $ParaView_VERSION | \
+    sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/')
+
+
+bindir=$WM_THIRD_PARTY_DIR/engrid/platforms/$WM_ARCH
+libdir="$ParaView_DIR/lib/paraview-$ParaView_MAJOR_VERSION"
+
+[ -x $bindir/engrid ] || usage "engrid executable not found in $bindir"
+[ -d $libdir ] || usage "paraview libraries not found"
+
+export LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH
+echo "starting $bindir/engrid $@"
+eval "exec $bindir/engrid $@ &"
+
+#------------------------------------------------------------------------------
diff --git a/bin/tools/buildParaView3.4 b/bin/tools/buildParaView3.4
deleted file mode 100755
index ebdaae111f..0000000000
--- a/bin/tools/buildParaView3.4
+++ /dev/null
@@ -1,192 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# =========                 |
-# \\      /  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
-#
-# Script
-#     buildParaView3.3-cvs
-#
-# Description
-#     Build and install ParaView
-#     - run from folder above ParaView source folder or place the
-#       ParaView source under $WM_THIRD_PARTY_DIR
-#
-#------------------------------------------------------------------------------
-. $WM_PROJECT_DIR/bin/tools/buildParaViewFunctions
-
-PARAVIEW_SRC=paraview-3.4
-PARAVIEW_MAJOR_VERSION=3.4
-
-# User options:
-# ~~~~~~~~~~~~~
-
-# MPI support:
-WITH_MPI=OFF
-MPI_MAX_PROCS=32
-
-# Python support:
-# note: script will try to determine the appropriate python library.
-#       If it fails, specify the path using the PYTHON_LIBRARY variable
-WITH_PYTHON=OFF
-PYTHON_LIBRARY=""
-# PYTHON_LIBRARY="/usr/lib64/libpython2.5.so.1.0"
-
-# MESA graphics support:
-WITH_MESA=OFF
-
-#
-# No further editing below this line
-#------------------------------------------------------------------------------
-Script=${0##*/}
-
-usage() {
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
-    cat<<USAGE
-
-usage: ${0##*/} [OPTION]
-options:
-  -fast      for repeated builds (-make -install) *use with caution*
-  -mpi       with mpi (if not already enabled)
-  -python    with python (if not already enabled)
-  -mesa      with mesa (if not already enabled)
-  -verbose   verbose output in Makefiles
-  -help
-
-For finer control, the build stages can be also selected individually
-(mutually exclusive)
-  -config
-  -make
-  -makedoc
-  -install
-  [-envpath]    alter absolute paths in CMake files to use env variables
-
-Build and install $PARAVIEW_SRC
-  - run from folder above the ParaView source folder or place the
-    ParaView source under \$WM_THIRD_PARTY_DIR
-
-USAGE
-   exit 1
-}
-
-# add options based on script name:
-case "$Script" in *-mpi*)    WITH_MPI=ON;; esac
-case "$Script" in *-python*) WITH_PYTHON=ON;; esac
-case "$Script" in *-mesa*)   WITH_MESA=ON;; esac
-
-runCONFIG=true
-runMAKE=true
-runMAKEDOC=true
-runINSTALL=true
-runENVPATH=false
-
-# parse options
-while [ "$#" -gt 0 ]
-do
-    case "$1" in
-    -h | -help)
-        usage
-        ;;
-    -config)             # stage 1: config only
-        runCONFIG=true
-        runMAKE=false
-        runMAKEDOC=false
-        runINSTALL=false
-        shift
-        ;;
-    -make)               # stage 2: make only
-        runCONFIG=false
-        runMAKE=true
-        runMAKEDOC=false
-        runINSTALL=false
-        shift
-        ;;
-    -makedoc)            # stage 3: generate html documentation
-        runCONFIG=false
-        runMAKE=false
-        runMAKEDOC=true
-        runINSTALL=false
-        shift
-        ;;
-    -install)            # stage 4: install only
-        runCONFIG=false
-        runMAKE=false
-        runMAKEDOC=false
-        runINSTALL=true
-        shift
-        ;;
-    -envpath)            # optional: change cmake files to use env variables
-        runCONFIG=false
-        runMAKE=false
-        runMAKEDOC=false
-        runINSTALL=false
-        runENVPATH=true
-        shift
-        ;;
-    -fast)               # shortcut for rebuild
-        runCONFIG=false
-        runMAKE=true
-        runMAKEDOC=false
-        runINSTALL=true
-        shift
-        ;;
-    -mpi)
-        WITH_MPI=ON
-        shift
-        ;;
-    -python)
-        WITH_PYTHON=ON
-        shift
-        ;;
-    -mesa)
-        WITH_MESA=ON
-        shift
-        ;;
-    -verbose)
-        VERBOSE=ON
-        shift
-        ;;
-    *)
-        usage "unknown option/argument: '$*'"
-        ;;
-    esac
-done
-
-# Set configure options
-#~~~~~~~~~~~~~~~~~~~~~~
-addVerbosity        # verbose makefiles
-addMpiSupport       # set MPI-specific options
-addPythonSupport    # set Python-specific options
-addMesaSupport      # set MESA-specific options
-
-getPaths            # discover where things are or should be put
-
-# Build and install
-# ~~~~~~~~~~~~~~~~~
-[ $runCONFIG  = true ] && configParaView
-[ $runMAKE    = true ] && makeParaView
-[ $runENVPATH = true ] && fixCMakeFiles
-[ $runMAKEDOC = true ] && makeDocs
-[ $runINSTALL = true ] && installParaView
-
-echo "done"
-#------------------------------------------------------------------------------
diff --git a/bin/tools/buildParaViewFunctions b/bin/tools/buildParaViewFunctions
index f1da2c0e3e..f1c6ffaed6 100644
--- a/bin/tools/buildParaViewFunctions
+++ b/bin/tools/buildParaViewFunctions
@@ -53,7 +53,7 @@ addCMakeVariable()
 #
 addVerbosity()
 {
-    [ "$VERBOSE" = ON ] && addCMakeVariable  CMAKE_VERBOSE_MAKEFILE=TRUE
+    [ "$withVERBOSE" = true ] && addCMakeVariable  CMAKE_VERBOSE_MAKEFILE=TRUE
 }
 
 
@@ -62,7 +62,7 @@ addVerbosity()
 #
 addMpiSupport()
 {
-    [ "$WITH_MPI" = ON ] || return
+    [ "${withMPI:=false}" = true ] || return
     OBJ_ADD="$OBJ_ADD-mpi"
 
     addCMakeVariable  PARAVIEW_USE_MPI=ON VTK_USE_MPI=ON
@@ -78,7 +78,7 @@ addMpiSupport()
 #
 addPythonSupport()
 {
-    [ "$WITH_PYTHON" = ON ] || return
+    [ "${withPYTHON:=false}" = true ] || return
     OBJ_ADD="$OBJ_ADD-py"
 
     if pythonBin=$(which python 2>/dev/null)
@@ -105,25 +105,18 @@ addPythonSupport()
         [ -e "$PYTHON_LIBRARY" ] || {
             echo "    Please set the variable PYTHON_LIBRARY to the full"
             echo "    path to (and including) libpython, or deactivate"
-            echo "    python support by setting WITH_PYTHON=OFF"
+            echo "    python support by setting withPYTHON=false"
             exit 1
         }
 
         pythonMajor=$(echo $PYTHON_LIBRARY | sed 's/.*libpython\(.*\)\.so.*/\1/')
         pythonInclude=/usr/include/python$pythonMajor
 
-        [ -e "$PYTHON_LIBRARY" ] || {
-            echo "    Please set the variable PYTHON_LIBRARY to the full"
-            echo "    path to (and including) libpython, or deactivate"
-            echo "    python support by setting WITH_PYTHON=OFF"
-            exit 1
-        }
-
         # note - we could also allow for a PYTHON_INCLUDE variable ...
-        [ -e "$pythonInclude" ] || {
-            echo "    No python include headers found"
+        [ -d "$pythonInclude" ] || {
+            echo "    No python headers found in $pythonInclude/"
             echo "    Please install python headers or deactivate "
-            echo "    python support by setting WITH_PYTHON=OFF"
+            echo "    python support by setting withPYTHON=false"
             exit 1
         }
 
@@ -140,8 +133,8 @@ addPythonSupport()
 
         unset pythonBin pythonInclude pythonMajor
     else
-        echo "*** Error: python not installed"
-        echo "***        Deactivate python support by setting WITH_PYTHON=OFF"
+        echo "*** Error: python not found"
+        echo "***        Deactivate python support by setting withPYTHON=false"
         exit 1
     fi
 }
@@ -152,26 +145,33 @@ addPythonSupport()
 #
 addMesaSupport()
 {
-    [ "$WITH_MESA" = ON ] || return
+    [ "${withMESA:=false}" = true ] || return
 
-    if [ -d "$MESA_INCLUDE_DIR" -a -f "$MESA_LIBRARY" ]
+    if [ -d "$MESA_INCLUDE" -a -f "$MESA_LIBRARY" ]
     then
         OBJ_ADD="$OBJ_ADD-mesa"
 
         addCMakeVariable  VTK_OPENGL_HAS_OSMESA=ON
-        addCMakeVariable  OSMESA_INCLUDE_DIR=$MESA_INCLUDE_DIR
+        addCMakeVariable  OSMESA_INCLUDE_DIR=$MESA_INCLUDE
         addCMakeVariable  OSMESA_LIBRARY=$MESA_LIBRARY
 
     else
        echo "*** Error: no MESA information found"
-       echo "***        Deactivate MESA support by setting WITH_MESA=OFF, or"
-       echo "***        correct paths given by:"
-       echo "***        - MESA_INCLUDE_DIR ($MESA_INCLUDE_DIR)"
+       echo "***        Deactivate MESA support by setting withMESA=false, or"
+       echo "***        correct the paths given by:"
+       echo "***        - MESA_INCLUDE ($MESA_INCLUDE)"
        echo "***        - MESA_LIBRARY ($MESA_LIBRARY)"
        exit 1
     fi
 }
 
+addQtSupport()
+{
+    [ "${withQTSUPPORT:=false}" = true ] || return
+
+    addCMakeVariable "PARAVIEW_BUILD_QT_GUI=ON"
+}
+
 
 #
 # discover where things are or should be put
@@ -181,24 +181,32 @@ getPaths()
     # set paraview environment
     for i in $PWD $WM_THIRD_PARTY_DIR
     do
-        ParaView_INST_DIR=$i/$PARAVIEW_SRC
+        ParaView_INST_DIR=$i/paraview-$ParaView_VERSION
         [ -d $ParaView_INST_DIR ] && break
     done
 
     if [ ! -d "$ParaView_INST_DIR" ]
     then
         # last chance: maybe already in the paraview directory
-        [ "${PWD##*/}" = $PARAVIEW_SRC ] && ParaView_INST_DIR=$PWD
+        if [ "${PWD##*/}" = "paraview-$ParaView_VERSION" ]
+        then
+            ParaView_INST_DIR=$PWD
+        fi
 
         [ -d "$ParaView_INST_DIR" ] || {
-            echo "did not find $PARAVIEW_SRC in these directories:"
+            echo "did not find paraview-$ParaView_VERSION in these directories:"
             echo "  PWD=$PWD"
             echo "  WM_THIRD_PARTY_DIR=$WM_THIRD_PARTY_DIR"
+            echo
             echo "abort build"
             exit 1
         }
     fi
 
+    # set the major version "<digits>.<digits>"
+    ParaView_MAJOR_VERSION=$(echo $ParaView_VERSION | \
+        sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/')
+
     # ParaView_DIR=$ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER$OBJ_ADD
     ParaView_DIR=$ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER
     echo "ParaView_DIR=$ParaView_DIR"
@@ -221,10 +229,11 @@ configParaView()
     cd $ParaView_DIR
 
     echo "----"
-    echo "Configuring $PARAVIEW_SRC"
-    echo "    MPI support    : $WITH_MPI"
-    echo "    Python support : $WITH_PYTHON"
-    echo "    MESA support   : $WITH_MESA"
+    echo "Configuring paraview-$ParaView_VERSION (major version: $ParaView_MAJOR_VERSION)"
+    echo "    MPI    support : ${withMPI:-false}"
+    echo "    Python support : ${withPYTHON:-false}"
+    echo "    MESA   support : ${withMESA:-false}"
+    echo "    Qt dev support : ${withQTSUPPORT:-false}"
     echo "    Source         : $ParaView_INST_DIR"
     echo "    Target         : $ParaView_DIR"
     echo "----"
@@ -266,10 +275,10 @@ makeParaView()
     fi
     echo "    Done make"
 
-    echo "    For quicker development, linking lib/paraview-$PARAVIEW_MAJOR_VERSION/ -> bin/"
-    rm -rf lib/paraview-$PARAVIEW_MAJOR_VERSION
+    echo "    For quicker development, linking lib/paraview-$ParaView_MAJOR_VERSION/ -> bin/"
+    rm -rf lib/paraview-$ParaView_MAJOR_VERSION
     mkdir lib 2>/dev/null
-    ( cd lib && ln -s ../bin paraview-$PARAVIEW_MAJOR_VERSION )
+    ( cd lib && ln -s ../bin paraview-$ParaView_MAJOR_VERSION )
 }
 
 
@@ -317,7 +326,7 @@ fixCMakeFiles()
     fixHardLinks ParaView_INST_DIR "$ParaView_INST_DIR" '*.cmake'
 
     # Replace path with env variable: MPI_ARCH_PATH
-    if [ "$WITH_MPI" = ON ]
+    if [ "${withMPI:=false}" = true ]
     then
         fixHardLinks MPI_ARCH_PATH "$MPI_ARCH_PATH" '*.cmake'
     fi
@@ -359,10 +368,10 @@ installParaView()
     echo "disabled 'make install' for now, just use links"
 
     # about.txt may be missing
-    paraviewLibDir="$ParaView_DIR/lib/paraview-$PARAVIEW_MAJOR_VERSION"
+    paraviewLibDir="$ParaView_DIR/lib/paraview-$ParaView_MAJOR_VERSION"
     if [ -d "$paraviewLibDir" -a ! -e "$paraviewLibDir/about.txt" ]
     then
-        echo "paraview-$PARAVIEW_MAJOR_VERSION installed - $(date)" > $paraviewLibDir/about.txt
+        echo "paraview-$ParaView_MAJOR_VERSION installed - $(date)" > $paraviewLibDir/about.txt
     fi
 
 cat<< INFO
@@ -380,9 +389,9 @@ INFO
 
 
 # clear all the variables used before using any of the functions
-unset VERBOSE
-unset WITH_MPI WITH_MESA
-unset WITH_PYTHON PYTHON_LIBRARY
+unset withMPI withQTSUPPORT withVERBOSE
+unset withMESA   MESA_INCLUDE   MESA_LIBRARY
+unset withPYTHON PYTHON_INCLUDE PYTHON_LIBRARY
 unset CMAKE_VARIABLES
 unset OBJ_ADD
 
diff --git a/etc/aliases.csh b/etc/aliases.csh
index a86caa89ef..fd7f183a36 100644
--- a/etc/aliases.csh
+++ b/etc/aliases.csh
@@ -56,5 +56,6 @@ alias app 'cd $FOAM_APP'
 alias util 'cd $FOAM_UTILITIES'
 alias sol 'cd $FOAM_SOLVERS'
 alias tut 'cd $FOAM_TUTORIALS'
+alias foam3rdParty 'cd $WM_THIRD_PARTY_DIR'
 
 # -----------------------------------------------------------------------------
diff --git a/etc/aliases.sh b/etc/aliases.sh
index a1d8685ba6..b193802246 100644
--- a/etc/aliases.sh
+++ b/etc/aliases.sh
@@ -56,5 +56,6 @@ alias app='cd $FOAM_APP'
 alias util='cd $FOAM_UTILITIES'
 alias sol='cd $FOAM_SOLVERS'
 alias tut='cd $FOAM_TUTORIALS'
+alias foam3rdParty='cd $WM_THIRD_PARTY_DIR'
 
 # -----------------------------------------------------------------------------
diff --git a/etc/apps/cint/bashrc b/etc/apps/cint/bashrc
index 577923968a..51b9a3400e 100644
--- a/etc/apps/cint/bashrc
+++ b/etc/apps/cint/bashrc
@@ -27,7 +27,7 @@
 #
 # Description
 #     Setup file for cint
-#     Sourced from OpenFOAM-?.?/etc/bashrc
+#     Sourced from OpenFOAM-*/etc/bashrc
 #
 #------------------------------------------------------------------------------
 
diff --git a/etc/apps/cint/cshrc b/etc/apps/cint/cshrc
index 6807b32a3d..f2c38c481a 100644
--- a/etc/apps/cint/cshrc
+++ b/etc/apps/cint/cshrc
@@ -26,8 +26,8 @@
 #     cint/cshrc
 #
 # Description
-#     Startup File for cint
-#     Sourced from OpenFOAM-?.?/etc/cshrc
+#     Setup file for cint
+#     Sourced from OpenFOAM-*/etc/cshrc
 #
 #------------------------------------------------------------------------------
 
diff --git a/etc/apps/ensight/bashrc b/etc/apps/ensight/bashrc
index ffd07ab71d..100f65ae5d 100644
--- a/etc/apps/ensight/bashrc
+++ b/etc/apps/ensight/bashrc
@@ -23,11 +23,11 @@
 #     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
 # Script
-#     ensightFoam/bashrc
+#     ensight/bashrc
 #
 # Description
 #     Setup file for Ensight 8.?
-#     Sourced from OpenFOAM-?.?/etc/bashrc
+#     Sourced from OpenFOAM-*/etc/bashrc
 #
 #------------------------------------------------------------------------------
 
diff --git a/etc/apps/ensight/cshrc b/etc/apps/ensight/cshrc
index 52335c6b56..ae7f3d6095 100644
--- a/etc/apps/ensight/cshrc
+++ b/etc/apps/ensight/cshrc
@@ -23,11 +23,11 @@
 #     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
 # Script
-#     ensightFoam/cshrc
+#     ensight/cshrc
 #
 # Description
-#     Startup File for Ensight 8.?.
-#     Sourced from OpenFOAM-?.?/etc/cshrc
+#     Setup file for Ensight 8.?
+#     Sourced from OpenFOAM-*/etc/cshrc
 #
 #------------------------------------------------------------------------------
 
diff --git a/etc/apps/paraview/bashrc b/etc/apps/paraview/bashrc
index f31ec9058a..a6e2c08051 100644
--- a/etc/apps/paraview/bashrc
+++ b/etc/apps/paraview/bashrc
@@ -26,22 +26,29 @@
 #     paraview/bashrc
 #
 # Description
-#     Setup file for Paraview.
-#     Sourced from OpenFOAM-?.?/etc/bashrc
+#     Setup file for paraview-2.x
+#     Sourced from OpenFOAM-*/etc/bashrc
 #
 #------------------------------------------------------------------------------
 
-export CMAKE_HOME=$WM_THIRD_PARTY_DIR/cmake-2.4.6/platforms/$WM_ARCH
-
-if [ -r $CMAKE_HOME ]
-then
-    export PATH=$CMAKE_HOME/bin:$PATH
-fi
+# determine the cmake to be used
+unset CMAKE_HOME
+for cmake in cmake-2.6.4 cmake-2.6.2 cmake-2.4.6
+do
+    cmake=$WM_THIRD_PARTY_DIR/$cmake/platforms/$WM_ARCH
+    if [ -r $cmake ]
+    then
+        export CMAKE_HOME=$cmake
+        export PATH=$CMAKE_HOME/bin:$PATH
+        break
+    fi
+done
 
+paraviewMajor=paraview-2.4
 export ParaView_VERSION=2.4.4
 
 export ParaView_INST_DIR=$WM_THIRD_PARTY_DIR/ParaView$ParaView_VERSION
-export ParaView_DIR=$ParaView_INST_DIR/lib/paraview-2.4
+export ParaView_DIR=$ParaView_INST_DIR/lib/$paraviewMajor
 
 if [ -r $ParaView_INST_DIR ]
 then
@@ -56,4 +63,5 @@ then
     export VTK_DIR=$ParaView_DIR/VTK
 fi
 
+unset cmake paraviewMajor
 # -----------------------------------------------------------------------------
diff --git a/etc/apps/paraview/cshrc b/etc/apps/paraview/cshrc
index 130efc1102..a1552a5116 100644
--- a/etc/apps/paraview/cshrc
+++ b/etc/apps/paraview/cshrc
@@ -26,21 +26,27 @@
 #     paraview/cshrc
 #
 # Description
-#     Startup File for Paraview.
-#     Sourced from OpenFOAM-?.?/etc/cshrc
+#     Setup file for paraview-2.x
+#     Sourced from OpenFOAM-*/etc/cshrc
 #
 #------------------------------------------------------------------------------
 
-setenv CMAKE_HOME $WM_THIRD_PARTY_DIR/cmake-2.4.6/platforms/$WM_ARCH
-
-if ( -r $CMAKE_HOME ) then
-    set path=($CMAKE_HOME/bin $path)
-endif
+# determine the cmake to be used
+unsetenv CMAKE_HOME
+foreach cmake ( cmake-2.6.4 cmake-2.6.2 cmake-2.4.6 )
+    set cmake=$WM_THIRD_PARTY_DIR/$cmake/platforms/$WM_ARCH
+    if ( -r $cmake ) then
+        setenv CMAKE_HOME $cmake
+        set path=($CMAKE_HOME/bin $path)
+        break
+    endif
+end
 
+set paraviewMajor=paraview-2.4
 setenv ParaView_VERSION 2.4.4
 
 setenv ParaView_INST_DIR $WM_THIRD_PARTY_DIR/ParaView$ParaView_VERSION
-setenv ParaView_DIR $ParaView_INST_DIR/lib/paraview-2.4
+setenv ParaView_DIR $ParaView_INST_DIR/lib/$paraviewMajor
 
 if ( -r $ParaView_INST_DIR ) then
     setenv PV_INTERFACE_PATH $FOAM_UTILITIES/postProcessing/graphics/PVFoamReader/PVFoamReader/Make
@@ -53,4 +59,5 @@ if ( -r $ParaView_DIR ) then
     setenv VTK_DIR $ParaView_DIR/VTK
 endif
 
+unset cmake paraviewMajor
 # -----------------------------------------------------------------------------
diff --git a/etc/apps/paraview3/bashrc b/etc/apps/paraview3/bashrc
index 2120bf5d56..f49288b36e 100644
--- a/etc/apps/paraview3/bashrc
+++ b/etc/apps/paraview3/bashrc
@@ -27,7 +27,7 @@
 #
 # Description
 #     Setup file for paraview-3.x
-#     Sourced from OpenFOAM-?.?/etc/bashrc
+#     Sourced from OpenFOAM-*/etc/bashrc
 #
 # Note
 #     The env. variable 'ParaView_DIR' is required for building plugins
@@ -35,7 +35,7 @@
 
 # determine the cmake to be used
 unset CMAKE_HOME
-for cmake in cmake-2.6.2 cmake-2.4.6
+for cmake in cmake-2.6.4 cmake-2.6.2 cmake-2.4.6
 do
     cmake=$WM_THIRD_PARTY_DIR/$cmake/platforms/$WM_ARCH
     if [ -r $cmake ]
diff --git a/etc/apps/paraview3/cshrc b/etc/apps/paraview3/cshrc
index 5ad99a1030..1c500f4962 100644
--- a/etc/apps/paraview3/cshrc
+++ b/etc/apps/paraview3/cshrc
@@ -26,8 +26,8 @@
 #     paraview3/cshrc
 #
 # Description
-#     Startup File for paraview-3.x
-#     Sourced from OpenFOAM-?.?/etc/cshrc
+#     Setup file for paraview-3.x
+#     Sourced from OpenFOAM-*/etc/cshrc
 #
 # Note
 #     The env. variable 'ParaView_DIR' is required for building plugins
@@ -35,7 +35,7 @@
 
 # determine the cmake to be used
 unsetenv CMAKE_HOME
-foreach cmake ( cmake-2.6.2 cmake-2.4.6 )
+foreach cmake ( cmake-2.6.4 cmake-2.6.2 cmake-2.4.6 )
     set cmake=$WM_THIRD_PARTY_DIR/$cmake/platforms/$WM_ARCH
     if ( -r $cmake ) then
         setenv CMAKE_HOME $cmake

From b9eafd250ad967fc9fcdf55e25da9d357217edfa Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 13 May 2009 12:24:32 +0100
Subject: [PATCH 114/175] - min rho, T and p now required in constantProperties

- added (cumulative) contributions due to transfer of mass, mom and energy when
  evaluating cell properties
---
 .../KinematicParcel/KinematicParcel.C         | 11 ++++++++--
 .../KinematicParcel/KinematicParcel.H         |  6 ++++++
 .../KinematicParcel/KinematicParcelI.H        |  9 +++++++++
 .../Templates/ReactingParcel/ReactingParcel.C | 20 +++++++++++++++----
 .../Templates/ReactingParcel/ReactingParcel.H |  6 ++++++
 .../ReactingParcel/ReactingParcelI.H          |  9 +++++++++
 .../Templates/ThermoParcel/ThermoParcel.C     | 16 +++++++++++----
 .../Templates/ThermoParcel/ThermoParcel.H     | 17 +++++++++++-----
 .../Templates/ThermoParcel/ThermoParcelI.H    |  9 +++++++++
 9 files changed, 88 insertions(+), 15 deletions(-)

diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index 5dd28f50cc..ad564e6d89 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -39,7 +39,7 @@ void Foam::KinematicParcel<ParcelType>::updateCellQuantities
 )
 {
     rhoc_ = td.rhoInterp().interpolate(this->position(), cellI);
-    if (rhoc_ < SMALL)
+    if (rhoc_ < td.constProps().rhoMin())
     {
         WarningIn
         (
@@ -49,10 +49,17 @@ void Foam::KinematicParcel<ParcelType>::updateCellQuantities
                 "const scalar, "
                 "const label"
             ")"
-        )   << "Density < " << SMALL << " in cell " << cellI << nl << endl;
+        )   << "Limiting density in cell " << cellI << " to "
+            << td.constProps().rhoMin() <<  nl << endl;
+
+        rhoc_ = td.constProps().rhoMin();
     }
 
     Uc_ = td.UInterp().interpolate(this->position(), cellI);
+
+    // Apply correction to cell velocity to account for momentum transfer
+    Uc_ += td.cloud().UTrans()[cellI]/(massCell(cellI));
+
     muc_ = td.muInterp().interpolate(this->position(), cellI);
 
     // Apply dispersion components to carrier phase velocity
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index f90c86b918..d5ccfd84b2 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -89,6 +89,9 @@ public:
             //- Constant properties dictionary
             const dictionary dict_;
 
+            //- Minimum density [kg/m3]
+            const scalar rhoMin_;
+
             //- Particle density [kg/m3] (constant)
             const scalar rho0_;
 
@@ -106,6 +109,9 @@ public:
             //- Return const access to the constant properties dictionary
             inline const dictionary& dict() const;
 
+            //- Return const access to the minimum density
+            inline scalar rhoMin() const;
+
             //- Return const access to the particle density
             inline scalar rho0() const;
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
index bf4545032a..2adc0e944d 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
@@ -33,6 +33,7 @@ inline Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties
 )
 :
     dict_(parentDict.subDict("constantProperties")),
+    rhoMin_(dimensionedScalar(dict_.lookup("rhoMin")).value()),
     rho0_(dimensionedScalar(dict_.lookup("rho0")).value()),
     minParticleMass_
     (
@@ -99,6 +100,14 @@ Foam::KinematicParcel<ParcelType>::constantProperties::dict() const
 }
 
 
+template <class ParcelType>
+inline Foam::scalar
+Foam::KinematicParcel<ParcelType>::constantProperties::rhoMin() const
+{
+    return rhoMin_;
+}
+
+
 template <class ParcelType>
 inline Foam::scalar
 Foam::KinematicParcel<ParcelType>::constantProperties::rho0() const
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index 7527690087..4529d4e077 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -40,7 +40,7 @@ void Foam::ReactingParcel<ParcelType>::updateCellQuantities
     ThermoParcel<ParcelType>::updateCellQuantities(td, dt, cellI);
 
     pc_ = td.pInterp().interpolate(this->position(), cellI);
-    if (pc_ < SMALL)
+    if (pc_ < td.constProps().pMin())
     {
         WarningIn
         (
@@ -50,8 +50,19 @@ void Foam::ReactingParcel<ParcelType>::updateCellQuantities
                 "const scalar, "
                 "const label"
             ")"
-        )   << "Pressure < " << SMALL << " in cell " << cellI << nl << endl;
+        )   << "Limiting pressure in cell " << cellI << " to "
+            << td.constProps().pMin() <<  nl << endl;
+
+        pc_ = td.constProps().pMin();
     }
+
+    // Apply correction to cell density to account for mass transfer
+    scalar addedMass = 0.0;
+    forAll(td.cloud().rhoTrans(), i)
+    {
+        addedMass += td.cloud().rhoTrans(i)[cellI];
+    }
+    this->rhoc_ += addedMass/td.cloud().pMesh().cellVolumes()[cellI];
 }
 
 
@@ -259,15 +270,16 @@ Foam::scalar Foam::ReactingParcel<ParcelType>::calcPhaseChange
         return 0.0;
     }
 
+    // Calculate mass transfer due to phase change
     td.cloud().phaseChange().calculate
     (
         dt,
         cellI,
         d,
-        min(T, td.constProps().Tbp()), // Limiting to boiling temperature
+        min(T, td.constProps().Tbp()), // Limit to boiling temperature
         pc_,
         this->Tc_,
-        this->muc_/this->rhoc_,
+        this->muc_/(this->rhoc_ + ROOTVSMALL),
         U - this->Uc_,
         dMassPC
     );
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index f876fa6401..429ceffea3 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -80,6 +80,9 @@ public:
     {
         // Private data
 
+            //- Minimum pressure [Pa]
+            const scalar pMin_;
+
             //- Constant volume flag - e.g. during mass transfer
             Switch constantVolume_;
 
@@ -97,6 +100,9 @@ public:
 
         // Access
 
+            //- Return const access to the minimum pressure
+            inline scalar pMin() const;
+
             //- Return const access to the constant volume flag
             inline Switch constantVolume() const;
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
index 0cc40887d4..344eb09398 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
@@ -33,6 +33,7 @@ inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties
 )
 :
     ThermoParcel<ParcelType>::constantProperties(parentDict),
+    pMin_(dimensionedScalar(this->dict().lookup("pMin")).value()),
     constantVolume_(this->dict().lookup("constantVolume")),
     Tbp_(dimensionedScalar(this->dict().lookup("Tbp")).value()),
     Tvap_(dimensionedScalar(this->dict().lookup("Tvap")).value())
@@ -106,6 +107,14 @@ inline Foam::ReactingParcel<ParcelType>::ReactingParcel
 
 // * * * * * * * * * constantProperties Member Functions * * * * * * * * * * //
 
+template<class ParcelType>
+inline Foam::scalar
+Foam::ReactingParcel<ParcelType>::constantProperties::pMin() const
+{
+    return pMin_;
+}
+
+
 template<class ParcelType>
 inline Foam::Switch
 Foam::ReactingParcel<ParcelType>::constantProperties::constantVolume() const
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
index e13420e56d..8b5a722d30 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -39,8 +39,15 @@ void Foam::ThermoParcel<ParcelType>::updateCellQuantities
 {
     KinematicParcel<ParcelType>::updateCellQuantities(td, dt, cellI);
 
+    cpc_ = td.cpInterp().interpolate(this->position(), cellI);
+
     Tc_ = td.TInterp().interpolate(this->position(), cellI);
-    if (Tc_ < SMALL)
+
+    // Apply correction to cell temperature to account for enthalpy transfer
+    scalar cpMean = td.cpInterp().psi()[cellI];
+    Tc_ += td.cloud().hTrans()[cellI]/(cpMean*this->massCell(cellI));
+
+    if (Tc_ < td.constProps().TMin())
     {
         WarningIn
         (
@@ -50,10 +57,11 @@ void Foam::ThermoParcel<ParcelType>::updateCellQuantities
                 "const scalar, "
                 "const label"
             ")"
-        )   << "Temperature < " << SMALL << " in cell " << cellI << nl << endl;
-    }
+        )   << "Limiting temperature in cell " << cellI << " to "
+            << td.constProps().TMin() <<  nl << endl;
 
-    cpc_ = td.cpInterp().interpolate(this->position(), cellI);
+        Tc_ = td.constProps().TMin();
+    }
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
index c7ba92ab84..18a36dc024 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
@@ -85,6 +85,9 @@ public:
             //- Particle initial temperature [K]
             const scalar T0_;
 
+            //- Minimum temperature [K]
+            const scalar TMin_;
+
             //- Particle specific heat capacity [J/(kg.K)]
             const scalar cp0_;
 
@@ -104,18 +107,22 @@ public:
 
             // Access
 
-                //- Return const access to particle initial temperature [K]
+                //- Return const access to the particle initial temperature [K]
                 inline scalar T0() const;
 
-                //- Return const access to particle specific heat capacity
+                //- Return const access to minimum temperature [K]
+                inline scalar TMin() const;
+
+                //- Return const access to the particle specific heat capacity
                 //  [J/(kg.K)]
                 inline scalar cp0() const;
 
-                //- Return const access to Particle emissivity [] (radiation)
+                //- Return const access to the particle emissivity []
+                //  Active for radiation only
                 inline scalar epsilon0() const;
 
-                //- Return const access to Particle scattering factor []
-                //  (radiation)
+                //- Return const access to the particle scattering factor []
+                //  Active for radiation only
                 inline scalar f0() const;
     };
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
index 1a2c0326d3..6e929b6e69 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
@@ -34,6 +34,7 @@ inline Foam::ThermoParcel<ParcelType>::constantProperties::constantProperties
 :
     KinematicParcel<ParcelType>::constantProperties(parentDict),
     T0_(dimensionedScalar(this->dict().lookup("T0")).value()),
+    TMin_(dimensionedScalar(this->dict().lookup("TMin")).value()),
     cp0_(dimensionedScalar(this->dict().lookup("cp0")).value()),
     epsilon0_(dimensionedScalar(this->dict().lookup("epsilon0")).value()),
     f0_(dimensionedScalar(this->dict().lookup("f0")).value())
@@ -110,6 +111,14 @@ Foam::ThermoParcel<ParcelType>::constantProperties::T0() const
 }
 
 
+template <class ParcelType>
+inline Foam::scalar
+Foam::ThermoParcel<ParcelType>::constantProperties::TMin() const
+{
+    return TMin_;
+}
+
+
 template <class ParcelType>
 inline Foam::scalar
 Foam::ThermoParcel<ParcelType>::constantProperties::cp0() const

From d89df4142e3975c6ed4c8c43ff65ae0040f316c3 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Thu, 14 May 2009 13:25:02 +0100
Subject: [PATCH 115/175] renamed

---
 applications/solvers/Lagrangian/kinematicParcelFoam/Make/files | 3 ---
 .../solvers/Lagrangian/uncoupledKinematicParcelFoam/Make/files | 3 +++
 .../Make/options                                               | 0
 .../createFields.H                                             | 0
 .../uncoupledKinematicParcelFoam.C}                            | 0
 5 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 applications/solvers/Lagrangian/kinematicParcelFoam/Make/files
 create mode 100644 applications/solvers/Lagrangian/uncoupledKinematicParcelFoam/Make/files
 rename applications/solvers/Lagrangian/{kinematicParcelFoam => uncoupledKinematicParcelFoam}/Make/options (100%)
 rename applications/solvers/Lagrangian/{kinematicParcelFoam => uncoupledKinematicParcelFoam}/createFields.H (100%)
 rename applications/solvers/Lagrangian/{kinematicParcelFoam/kinematicParcelFoam.C => uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C} (100%)

diff --git a/applications/solvers/Lagrangian/kinematicParcelFoam/Make/files b/applications/solvers/Lagrangian/kinematicParcelFoam/Make/files
deleted file mode 100644
index a63fc64fa7..0000000000
--- a/applications/solvers/Lagrangian/kinematicParcelFoam/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-kinematicParcelFoam.C
-
-EXE = $(FOAM_APPBIN)/kinematicParcelFoam
diff --git a/applications/solvers/Lagrangian/uncoupledKinematicParcelFoam/Make/files b/applications/solvers/Lagrangian/uncoupledKinematicParcelFoam/Make/files
new file mode 100644
index 0000000000..387367f169
--- /dev/null
+++ b/applications/solvers/Lagrangian/uncoupledKinematicParcelFoam/Make/files
@@ -0,0 +1,3 @@
+uncoupledKinematicParcelFoam.C
+
+EXE = $(FOAM_APPBIN)/uncoupledKinematicParcelFoam
diff --git a/applications/solvers/Lagrangian/kinematicParcelFoam/Make/options b/applications/solvers/Lagrangian/uncoupledKinematicParcelFoam/Make/options
similarity index 100%
rename from applications/solvers/Lagrangian/kinematicParcelFoam/Make/options
rename to applications/solvers/Lagrangian/uncoupledKinematicParcelFoam/Make/options
diff --git a/applications/solvers/Lagrangian/kinematicParcelFoam/createFields.H b/applications/solvers/Lagrangian/uncoupledKinematicParcelFoam/createFields.H
similarity index 100%
rename from applications/solvers/Lagrangian/kinematicParcelFoam/createFields.H
rename to applications/solvers/Lagrangian/uncoupledKinematicParcelFoam/createFields.H
diff --git a/applications/solvers/Lagrangian/kinematicParcelFoam/kinematicParcelFoam.C b/applications/solvers/Lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
similarity index 100%
rename from applications/solvers/Lagrangian/kinematicParcelFoam/kinematicParcelFoam.C
rename to applications/solvers/Lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C

From 30c7e8aa6c28d34f7cbca72e7d6c35fa51905417 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Thu, 14 May 2009 13:26:41 +0100
Subject: [PATCH 116/175] updated coupling with carrier phase

---
 .../Templates/KinematicCloud/KinematicCloud.C |  17 +-
 .../Templates/KinematicCloud/KinematicCloud.H |  11 +-
 .../KinematicCloud/KinematicCloudI.H          |  39 +---
 .../Templates/ReactingCloud/ReactingCloud.H   |  10 +-
 .../Templates/ReactingCloud/ReactingCloudI.H  |   4 +-
 .../Templates/ThermoCloud/ThermoCloud.C       |  15 --
 .../Templates/ThermoCloud/ThermoCloud.H       |  11 +-
 .../Templates/ThermoCloud/ThermoCloudI.H      |  40 +---
 .../KinematicParcel/KinematicParcel.C         |  28 +--
 .../KinematicParcel/KinematicParcel.H         |   4 +-
 .../ReactingMultiphaseParcel.C                | 218 +++++++-----------
 .../ReactingMultiphaseParcel.H                |  27 ++-
 .../ReactingMultiphaseParcelIO.C              |  12 +-
 .../Templates/ReactingParcel/ReactingParcel.C |  76 ++----
 .../Templates/ThermoParcel/ThermoParcel.C     |  58 +----
 .../Templates/ThermoParcel/ThermoParcel.H     |   4 +-
 16 files changed, 170 insertions(+), 404 deletions(-)

diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index ecbb926651..efbdea6389 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -155,21 +155,7 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
             false
         ),
         mesh_,
-        dimensionedVector("zero", dimensionSet(1, 1, -1, 0, 0), vector::zero)
-    ),
-    UCoeff_
-    (
-        IOobject
-        (
-            this->name() + "UCoeff",
-            this->db().time().timeName(),
-            this->db(),
-            IOobject::NO_READ,
-            IOobject::NO_WRITE,
-            false
-        ),
-        mesh_,
-        dimensionedScalar("zero",  dimensionSet(1, 0, -1, 0, 0), 0.0)
+        dimensionedVector("zero", dimMass*dimVelocity, vector::zero)
     )
 {}
 
@@ -187,7 +173,6 @@ template<class ParcelType>
 void Foam::KinematicCloud<ParcelType>::resetSourceTerms()
 {
     UTrans_.field() = vector::zero;
-    UCoeff_.field() = 0.0;
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index 785b981919..50280469e2 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -165,9 +165,6 @@ class KinematicCloud
             //- Momentum
             DimensionedField<vector, volMesh> UTrans_;
 
-            //- Coefficient for carrier phase U equation
-            DimensionedField<scalar, volMesh> UCoeff_;
-
 
     // Private Member Functions
 
@@ -309,14 +306,8 @@ public:
                     //- Return reference to momentum source
                     inline DimensionedField<vector, volMesh>& UTrans();
 
-                    //- Coefficient for carrier phase U equation
-                    inline DimensionedField<scalar, volMesh>& UCoeff();
-
                     //- Return tmp momentum source term - fully explicit
-                    inline tmp<DimensionedField<vector, volMesh> > SU1() const;
-
-                    //- Return tmp momentum source term - semi-implicit
-                    inline tmp<fvVectorMatrix> SU2(volVectorField& U) const;
+                    inline tmp<DimensionedField<vector, volMesh> > SU() const;
 
 
         // Check
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index dde35a4298..8c44470c44 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -203,25 +203,17 @@ Foam::KinematicCloud<ParcelType>::UTrans()
 }
 
 
-template<class ParcelType>
-inline Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
-Foam::KinematicCloud<ParcelType>::UCoeff()
-{
-    return UCoeff_;
-}
-
-
 template<class ParcelType>
 inline Foam::tmp<Foam::DimensionedField<Foam::vector, Foam::volMesh> >
-Foam::KinematicCloud<ParcelType>::SU1() const
+Foam::KinematicCloud<ParcelType>::SU() const
 {
-    tmp<DimensionedField<vector, volMesh> > tSU1
+    tmp<DimensionedField<vector, volMesh> > tSU
     (
         new DimensionedField<vector, volMesh>
         (
             IOobject
             (
-                this->name() + "SU1",
+                this->name() + "SU",
                 this->db().time().timeName(),
                 this->mesh(),
                 IOobject::NO_READ,
@@ -237,29 +229,10 @@ Foam::KinematicCloud<ParcelType>::SU1() const
         )
     );
 
-    vectorField& SU1 = tSU1().field();
-    SU1 = UTrans_/(mesh_.V()*this->db().time().deltaT());
+    vectorField& SU = tSU().field();
+    SU = UTrans_/(mesh_.V()*this->db().time().deltaT());
 
-    return tSU1;
-}
-
-
-template<class ParcelType>
-inline Foam::tmp<Foam::fvVectorMatrix>
-Foam::KinematicCloud<ParcelType>::SU2(volVectorField& U) const
-{
-    if (debug)
-    {
-        Info<< "UTrans min/max = "
-            << min(UTrans_) << ", " << max(UTrans_) << endl;
-        Info<< "UCoeff min/max = "
-            << min(UCoeff_) << ", " << max(UCoeff_) << endl;
-    }
-
-    return
-        UTrans_/(mesh_.V()*this->db().time().deltaT())
-      - fvm::Sp(UCoeff_/mesh_.V(), U)
-      + UCoeff_/mesh_.V()*U;
+    return tSU;
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
index 6fe5bf68a6..0cc8bfc96b 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
@@ -180,15 +180,13 @@ public:
                     inline PtrList<DimensionedField<scalar, volMesh> >&
                         rhoTrans();
 
-                    //- Return tmp mass source for field i
-                    //  Fully explicit
+                    //- Return tmp mass source for field i - fully explicit
                     inline tmp<DimensionedField<scalar, volMesh> >
-                        Srho1(const label i) const;
+                        Srho(const label i) const;
 
                     //- Return tmp total mass source for carrier phase
-                    //  Fully explicit
-                    inline tmp<DimensionedField<scalar, volMesh> >
-                        Srho1() const;
+                    //  - fully explicit
+                    inline tmp<DimensionedField<scalar, volMesh> > Srho() const;
 
 
         // Check
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
index 1414b6b16d..98d9eee8fe 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
@@ -92,7 +92,7 @@ Foam::ReactingCloud<ParcelType>::rhoTrans()
 
 template<class ParcelType>
 inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >
-Foam::ReactingCloud<ParcelType>::Srho1(const label i) const
+Foam::ReactingCloud<ParcelType>::Srho(const label i) const
 {
     return rhoTrans_[i]/(this->db().time().deltaT()*this->mesh().V());
 }
@@ -100,7 +100,7 @@ Foam::ReactingCloud<ParcelType>::Srho1(const label i) const
 
 template<class ParcelType>
 inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >
-Foam::ReactingCloud<ParcelType>::Srho1() const
+Foam::ReactingCloud<ParcelType>::Srho() const
 {
     tmp<DimensionedField<scalar, volMesh> > trhoTrans
     (
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
index 6872f2428e..62c926f1ea 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
@@ -115,20 +115,6 @@ Foam::ThermoCloud<ParcelType>::ThermoCloud
         ),
         this->mesh(),
         dimensionedScalar("zero", dimensionSet(1, 2, -2, 0, 0), 0.0)
-    ),
-    hCoeff_
-    (
-        IOobject
-        (
-            this->name() + "hCoeff",
-            this->db().time().timeName(),
-            this->db(),
-            IOobject::NO_READ,
-            IOobject::NO_WRITE,
-            false
-        ),
-        this->mesh(),
-        dimensionedScalar("zero", dimensionSet(1, 2, -3, -1, 0), 0.0)
     )
 {}
 
@@ -147,7 +133,6 @@ void Foam::ThermoCloud<ParcelType>::resetSourceTerms()
 {
     KinematicCloud<ParcelType>::resetSourceTerms();
     hTrans_.field() = 0.0;
-    hCoeff_.field() = 0.0;
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
index 9789bd0f5f..7cdc7b1263 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
@@ -102,9 +102,6 @@ class ThermoCloud
             //- Enthalpy transfer
             DimensionedField<scalar, volMesh> hTrans_;
 
-            //- Coefficient for carrier phase h equation
-            DimensionedField<scalar, volMesh> hCoeff_;
-
 
     // Private Member Functions
 
@@ -179,14 +176,8 @@ public:
                     //- Return reference to enthalpy source
                     inline DimensionedField<scalar, volMesh>& hTrans();
 
-                    //- Coefficient for carrier phase h equation
-                    inline DimensionedField<scalar, volMesh>& hCoeff();
-
                     //- return tmp enthalpy source term - fully explicit
-                    inline tmp<DimensionedField<scalar, volMesh> > Sh1() const;
-
-                    //- Return tmp enthalpy source term - semi-implicit
-                    inline tmp<fvScalarMatrix> Sh2(volScalarField& h) const;
+                    inline tmp<DimensionedField<scalar, volMesh> > Sh() const;
 
 
                 // Radiation - overrides thermoCloud virtual abstract members
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
index 2f3df96f41..d85d043ec5 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
@@ -83,25 +83,17 @@ Foam::ThermoCloud<ParcelType>::hTrans()
 }
 
 
-template<class ParcelType>
-inline Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
-Foam::ThermoCloud<ParcelType>::hCoeff()
-{
-    return hCoeff_;
-}
-
-
 template<class ParcelType>
 inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >
-Foam::ThermoCloud<ParcelType>::Sh1() const
+Foam::ThermoCloud<ParcelType>::Sh() const
 {
-    tmp<DimensionedField<scalar, volMesh> > tSh1
+    tmp<DimensionedField<scalar, volMesh> > tSh
     (
         new DimensionedField<scalar, volMesh>
         (
             IOobject
             (
-                this->name() + "Sh1",
+                this->name() + "Sh",
                 this->db().time().timeName(),
                 this->mesh(),
                 IOobject::NO_READ,
@@ -118,30 +110,10 @@ Foam::ThermoCloud<ParcelType>::Sh1() const
         )
     );
 
-    scalarField& Sh1 = tSh1().field();
-    Sh1 = hTrans_/(this->mesh().V()*this->db().time().deltaT());
+    scalarField& Sh = tSh().field();
+    Sh = hTrans_/(this->mesh().V()*this->db().time().deltaT());
 
-    return tSh1;
-}
-
-
-template<class ParcelType>
-inline Foam::tmp<Foam::fvScalarMatrix>
-Foam::ThermoCloud<ParcelType>::Sh2(volScalarField& h) const
-{
-    const volScalarField cp = carrierThermo_.Cp();
-
-    if (debug)
-    {
-        Info<< "hTrans min/max = "
-            << min(hTrans_) << ", " << max(hTrans_) << endl;
-        Info<< "hCoeff min/max = "
-            << min(hCoeff_) << ", " << max(hCoeff_) << endl;
-    }
-
-    return hTrans_/(this->mesh().V()*this->db().time().deltaT())
-         - fvm::Sp(hCoeff_/(cp*this->mesh().V()), h)
-         + hCoeff_/(cp*this->mesh().V())*h;
+    return tSh;
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index ad564e6d89..69cc25869e 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -92,15 +92,6 @@ void Foam::KinematicParcel<ParcelType>::calc
     const scalar rho0 = rho_;
     const scalar mass0 = mass();
 
-    const polyMesh& mesh = this->cloud().pMesh();
-
-
-    // Initialise transfer terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    // Momentum
-    vector dUTrans = vector::zero;
-
 
     // Motion
     // ~~~~~~
@@ -109,9 +100,7 @@ void Foam::KinematicParcel<ParcelType>::calc
     vector Fx = vector::zero;
 
     // Calculate new particle velocity
-    scalar Cud = 0.0;
-    vector U1 =
-        calcVelocity(td, dt, cellI, d0, U0, rho0, mass0, Fx, Cud, dUTrans);
+    vector U1 = calcVelocity(td, dt, cellI, d0, U0, rho0, mass0, Fx);
 
 
     // Accumulate carrier phase source terms
@@ -119,10 +108,7 @@ void Foam::KinematicParcel<ParcelType>::calc
     if (td.cloud().coupled())
     {
         // Update momentum transfer
-        td.cloud().UTrans()[cellI] += np0*dUTrans;
-
-        // Coefficient to be applied in carrier phase momentum coupling
-        td.cloud().UCoeff()[cellI] += np0*mass0*Cud;
+        td.cloud().UTrans()[cellI] += np0*mass0*(U0 - U1);
     }
 
 
@@ -143,15 +129,13 @@ const Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
     const vector& U,
     const scalar rho,
     const scalar mass,
-    const vector& Fx,
-    scalar& Cud,
-    vector& dUTrans
+    const vector& Fx
 ) const
 {
     const polyMesh& mesh = this->cloud().pMesh();
 
     // Return linearised term from drag model
-    Cud = td.cloud().drag().Cu(U - Uc_, d, rhoc_, rho, muc_);
+    scalar Cud = td.cloud().drag().Cu(U - Uc_, d, rhoc_, rho, muc_);
 
     // Calculate particle forces
     vector Ftot = td.cloud().forces().calc(cellI, dt, rhoc_, rho, Uc_, U);
@@ -169,10 +153,6 @@ const Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
     // Apply correction to velocity for reduced-D cases
     meshTools::constrainDirection(mesh, mesh.solutionD(), Unew);
 
-    // Calculate the momentum transfer to the continuous phase
-    // - do not include gravity impulse
-    dUTrans = -mass*(Unew - U - dt*td.g());
-
     return Unew;
 }
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index d5ccfd84b2..7a57dd5fb0 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -243,9 +243,7 @@ protected:
             const vector& U,           // velocity
             const scalar rho,          // density
             const scalar mass,         // mass
-            const vector& Fx,          // additional forces
-            scalar& Cud,               // linearised drag term coeff
-            vector& dUTrans            // momentum transfer to carrier phase
+            const vector& Fx           // additional forces
         ) const;
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 7692c2011f..3d67afa89b 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -32,10 +32,10 @@ template<class ParcelType>
 const Foam::label Foam::ReactingMultiphaseParcel<ParcelType>::GAS(0);
 
 template<class ParcelType>
-const Foam::label Foam::ReactingMultiphaseParcel<ParcelType>::LIQUID(1);
+const Foam::label Foam::ReactingMultiphaseParcel<ParcelType>::LIQ(1);
 
 template<class ParcelType>
-const Foam::label Foam::ReactingMultiphaseParcel<ParcelType>::SOLID(2);
+const Foam::label Foam::ReactingMultiphaseParcel<ParcelType>::SLD(2);
 
 
 // * * * * * * * * * * * *  Private Member Functions * * * * * * * * * * * * //
@@ -54,8 +54,8 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::cpEff
 {
     return
         this->Y_[GAS]*td.cloud().composition().cp(idG, YGas_, p, T)
-      + this->Y_[LIQUID]*td.cloud().composition().cp(idL, YLiquid_, p, T)
-      + this->Y_[SOLID]*td.cloud().composition().cp(idS, YSolid_, p, T);
+      + this->Y_[LIQ]*td.cloud().composition().cp(idL, YLiquid_, p, T)
+      + this->Y_[SLD]*td.cloud().composition().cp(idS, YSolid_, p, T);
 }
 
 
@@ -73,8 +73,27 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::HEff
 {
     return
         this->Y_[GAS]*td.cloud().composition().H(idG, YGas_, p, T)
-      + this->Y_[LIQUID]*td.cloud().composition().H(idL, YLiquid_, p, T)
-      + this->Y_[SOLID]*td.cloud().composition().H(idS, YSolid_, p, T);
+      + this->Y_[LIQ]*td.cloud().composition().H(idL, YLiquid_, p, T)
+      + this->Y_[SLD]*td.cloud().composition().H(idS, YSolid_, p, T);
+}
+
+
+template<class ParcelType>
+template<class TrackData>
+Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::LEff
+(
+    TrackData& td,
+    const scalar p,
+    const scalar T,
+    const label idG,
+    const label idL,
+    const label idS
+) const
+{
+    return
+        this->Y_[GAS]*td.cloud().composition().L(idG, YGas_, p, T)
+      + this->Y_[LIQ]*td.cloud().composition().L(idL, YLiquid_, p, T)
+      + this->Y_[SLD]*td.cloud().composition().L(idS, YSolid_, p, T);
 }
 
 
@@ -94,14 +113,14 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::updateMassFractions
     scalar dMassSolidTot = sum(dMassSolid);
 
     this->updateMassFraction(mass0*YMix[GAS], dMassGas, YGas_);
-    this->updateMassFraction(mass0*YMix[LIQUID], dMassLiquid, YLiquid_);
-    this->updateMassFraction(mass0*YMix[SOLID], dMassSolid, YSolid_);
+    this->updateMassFraction(mass0*YMix[LIQ], dMassLiquid, YLiquid_);
+    this->updateMassFraction(mass0*YMix[SLD], dMassSolid, YSolid_);
 
     scalar massNew = mass0 - (dMassGasTot + dMassLiquidTot + dMassSolidTot);
 
     YMix[GAS] = (mass0*YMix[GAS] - dMassGasTot)/massNew;
-    YMix[LIQUID] = (mass0*YMix[LIQUID] - dMassLiquidTot)/massNew;
-    YMix[SOLID] = 1.0 - YMix[GAS] - YMix[LIQUID];
+    YMix[LIQ] = (mass0*YMix[LIQ] - dMassLiquidTot)/massNew;
+    YMix[SLD] = 1.0 - YMix[GAS] - YMix[LIQ];
 
     return massNew;
 }
@@ -148,32 +167,18 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     const label idL = td.cloud().composition().idLiquid();
     const label idS = td.cloud().composition().idSolid();
 
-
-    // Initialise transfer terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    // Momentum
-    vector dUTrans = vector::zero;
-
-    // Enthalpy
-    scalar dhTrans = 0.0;
-
-    // Mass transfer due to phase change
-    scalarField dMassPC(YLiquid_.size(), 0.0);
-
-    // Mass transfer due to devolatilisation
-    scalarField dMassDV(YGas_.size(), 0.0);
-
-    // Change in carrier phase composition due to surface reactions
-    scalarField dMassSRGas(YGas_.size(), 0.0);
-    scalarField dMassSRLiquid(YLiquid_.size(), 0.0);
-    scalarField dMassSRSolid(YSolid_.size(), 0.0);
-    scalarField dMassSRCarrier(td.cloud().gases().size(), 0.0);
+    // Intial ethalpy state
+    scalar H0H = HEff(td, pc, T0, idG, idL, idS);
+    scalar H0L = LEff(td, pc, T0, idG, idL, idS);
+    scalar H0 = H0H - H0L;
 
 
     // Phase change in liquid phase
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+    // Mass transfer due to phase change
+    scalarField dMassPC(YLiquid_.size(), 0.0);
+
     // Return enthalpy source and calc mass transfer due to phase change
     scalar ShPC =
         calcPhaseChange
@@ -185,7 +190,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
             T0,
             U0,
             idL,
-            YMix[LIQUID],
+            YMix[LIQ],
             YLiquid_,
             dMassPC
         );
@@ -194,6 +199,9 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     // Devolatilisation
     // ~~~~~~~~~~~~~~~~
 
+    // Mass transfer due to devolatilisation
+    scalarField dMassDV(YGas_.size(), 0.0);
+
     // Return enthalpy source and calc mass transfer due to devolatilisation
     scalar ShDV =
         calcDevolatilisation
@@ -214,8 +222,14 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     // Surface reactions
     // ~~~~~~~~~~~~~~~~~
 
+    // Change in carrier phase composition due to surface reactions
+    scalarField dMassSRGas(YGas_.size(), 0.0);
+    scalarField dMassSRLiquid(YLiquid_.size(), 0.0);
+    scalarField dMassSRSolid(YSolid_.size(), 0.0);
+    scalarField dMassSRCarrier(td.cloud().gases().size(), 0.0);
+
     // Return enthalpy source and calc mass transfer(s) due to surface reaction
-    scalar ShSR =
+    scalar HReaction =
         calcSurfaceReactions
         (
             td,
@@ -233,34 +247,14 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
             dMassSRGas,
             dMassSRLiquid,
             dMassSRSolid,
-            dMassSRCarrier,
-            dhTrans
+            dMassSRCarrier
         );
 
+    // Heat of reaction split between component retained by particle
+    const scalar ShSR = td.constProps().hRetentionCoeff()*HReaction;
 
-    // Heat transfer
-    // ~~~~~~~~~~~~~
-
-    // Total enthalpy source
-    scalar Sh = ShPC + ShDV + ShSR;
-
-    // Calculate new particle temperature
-    scalar htc = 0.0;
-    scalar T1 =
-        calcHeatTransfer
-        (
-            td,
-            dt,
-            cellI,
-            d0,
-            U0,
-            rho0,
-            T0,
-            cp0,
-            Sh,
-            htc,
-            dhTrans
-        );
+    // ...and component added to the carrier phase
+    const scalar ShSRc = (1.0 - td.constProps().hRetentionCoeff())*HReaction;
 
 
     // Update component mass fractions
@@ -274,6 +268,22 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
         updateMassFractions(mass0, dMassGas, dMassLiquid, dMassSolid);
 
 
+    // Heat transfer
+    // ~~~~~~~~~~~~~
+
+    // Total enthalpy source
+    scalar Sh = ShPC + ShDV + ShSR;
+
+    // Calculate new particle temperature
+    scalar T1 = calcHeatTransfer(td, dt, cellI, d0, U0, rho0, T0, cp0, Sh);
+
+    // Calculate new enthalpy state based on updated composition at new
+    // temperature
+    scalar H1H = HEff(td, pc, T1, idG, idL, idS);
+    scalar H1L = LEff(td, pc, T1, idG, idL, idS);
+    scalar H1 = H1H - H1L;
+
+
     // Motion
     // ~~~~~~
 
@@ -281,21 +291,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     vector Fx = vector::zero;
 
     // Calculate new particle velocity
-    scalar Cud = 0.0;
-    vector U1 =
-        calcVelocity
-        (
-            td,
-            dt,
-            cellI,
-            d0,
-            U0,
-            rho0,
-            0.5*(mass0 + mass1),
-            Fx,
-            Cud,
-            dUTrans
-        );
+    vector U1 = calcVelocity(td, dt, cellI, d0, U0, rho0, mass0, Fx);
 
 
     // Accumulate carrier phase source terms
@@ -311,13 +307,13 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
         }
         forAll(YLiquid_, i)
         {
-            label id = td.cloud().composition().localToGlobalGasId(LIQUID, i);
+            label id = td.cloud().composition().localToGlobalGasId(LIQ, i);
             td.cloud().rhoTrans(id)[cellI] += np0*dMassLiquid[i];
         }
 //        // No mapping between solid components and carrier phase
 //        forAll(YSolid_, i)
 //        {
-//            label id = td.cloud().composition().localToGlobalGasId(SOLID, i);
+//            label id = td.cloud().composition().localToGlobalGasId(SLD, i);
 //            td.cloud().rhoTrans(id)[cellI] += np0*dMassSolid[i];
 //        }
         forAll(dMassSRCarrier, i)
@@ -326,16 +322,10 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
         }
 
         // Update momentum transfer
-        td.cloud().UTrans()[cellI] += np0*dUTrans;
-
-        // Coefficient to be applied in carrier phase momentum coupling
-        td.cloud().UCoeff()[cellI] += np0*mass0*Cud;
+        td.cloud().UTrans()[cellI] += np0*(mass0*U0 - mass1*U1);
 
         // Update enthalpy transfer
-        td.cloud().hTrans()[cellI] += np0*dhTrans;
-
-        // Coefficient to be applied in carrier phase enthalpy coupling
-        td.cloud().hCoeff()[cellI] += np0*htc*this->areaS();
+        td.cloud().hTrans()[cellI] += np0*(mass0*H0 - (mass1*H1 + ShSRc));
     }
 
 
@@ -357,29 +347,20 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
             forAll(YLiquid_, i)
             {
                 label id =
-                    td.cloud().composition().localToGlobalGasId(LIQUID, i);
+                    td.cloud().composition().localToGlobalGasId(LIQ, i);
                 td.cloud().rhoTrans(id)[cellI] +=
-                    np0
-                   *mass1
-                   *YMix[LIQUID]
-                   *YLiquid_[i];
+                    np0*mass1*YMix[LIQ]*YLiquid_[i];
             }
 //            // No mapping between solid components and carrier phase
 //            forAll(YSolid_, i)
 //            {
 //                label id =
-//                    td.cloud().composition().localToGlobalGasId(SOLID, i);
+//                    td.cloud().composition().localToGlobalGasId(SLD, i);
 //                td.cloud().rhoTrans(id)[cellI] +=
-//                    np0
-//                   *mass1
-//                   *YMix[SOLID]
-//                   *YSolid_[i];
+//                    np0*mass1*YMix[SLD]*YSolid_[i];
 //            }
 
-            td.cloud().hTrans()[cellI] +=
-                np0
-               *mass1
-               *HEff(td, pc, T1, idG, idL, idS);
+            td.cloud().hTrans()[cellI] += np0*mass1*H1;
             td.cloud().UTrans()[cellI] += np0*mass1*U1;
         }
     }
@@ -421,7 +402,7 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
     const scalarField& YVolatile,
     bool& canCombust,
     scalarField& dMassDV
-)
+) const
 {
     // Check that model is active, and that the parcel temperature is
     // within necessary limits for devolatilisation to occur
@@ -448,10 +429,7 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
     );
 
     // Volatile mass transfer - equal components of each volatile specie
-    forAll(YVolatile, i)
-    {
-        dMassDV[i] = YVolatile[i]*dMassTot;
-    }
+    dMassDV = YVolatile*dMassTot;
 
     td.cloud().addToMassDevolatilisation(this->nParticle_*dMassTot);
 
@@ -478,9 +456,8 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
     scalarField& dMassSRGas,
     scalarField& dMassSRLiquid,
     scalarField& dMassSRSolid,
-    scalarField& dMassSRCarrier,
-    scalar& dhTrans
-)
+    scalarField& dMassSRCarrier
+) const
 {
     // Check that model is active
     if (!td.cloud().surfaceReaction().active() || !canCombust)
@@ -489,18 +466,15 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
     }
 
     // Update surface reactions
-    const scalar pc = this->pc_;
-    const scalar Tc = this->Tc_;
-    const scalar rhoc = this->rhoc_;
     const scalar HReaction = td.cloud().surfaceReaction().calculate
     (
         dt,
         cellI,
         d,
         T,
-        Tc,
-        pc,
-        rhoc,
+        this->Tc_,
+        this->pc_,
+        this->rhoc_,
         mass,
         YGas,
         YLiquid,
@@ -519,27 +493,7 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
        *(sum(dMassSRGas) + sum(dMassSRLiquid) + sum(dMassSRSolid))
     );
 
-    // Add enthalpy of consumed components to the carrier phase enthalpy
-    // transfer
-    const label idG = td.cloud().composition().idGas();
-    const label idL = td.cloud().composition().idLiquid();
-    const label idS = td.cloud().composition().idSolid();
-    scalar dhGas =
-        sum(dMassSRGas)*td.cloud().composition().H(idG, YGas, pc, T);
-
-    scalar dhLiquid =
-        sum(dMassSRLiquid)*td.cloud().composition().H(idL, YLiquid, pc, T);
-
-    scalar dhSolid =
-        sum(dMassSRSolid)*td.cloud().composition().H(idS, YSolid, pc, T);
-
-    dhTrans += dhGas + dhLiquid + dhSolid;
-
-    // Heat of reaction divided between particle and carrier phase by the
-    // fraction fh and (1 - fh)
-    dhTrans += (1.0 - td.constProps().hRetentionCoeff())*HReaction;
-
-    return td.constProps().hRetentionCoeff()*HReaction;
+    return HReaction;
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
index f1bace3a8b..b5f45310cd 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -71,11 +71,11 @@ public:
     // IDs of phases in ReacingParcel phase list (Y)
 
         static const label GAS;
-        static const label LIQUID;
-        static const label SOLID;
+        static const label LIQ;
+        static const label SLD;
 
 
-    //- Class to hold reacting particle constant properties
+    //- Class to hold reacting multiphase particle constant properties
     class constantProperties
     :
         public ReactingParcel<ParcelType>::constantProperties
@@ -177,6 +177,18 @@ private:
             const label idS
         ) const;
 
+        //- Return the mixture effective latent heat
+        template<class TrackData>
+        scalar LEff
+        (
+            TrackData& td,
+            const scalar p,
+            const scalar T,
+            const label idG,
+            const label idL,
+            const label idS
+        ) const;
+
         //- Update the mass fractions (Y, YGas, YLiquid, YSolid)
         scalar updateMassFractions
         (
@@ -223,7 +235,7 @@ protected:
             const scalarField& YVolatile, // volatile component mass fractions
             bool& canCombust,          // 'can combust' flag
             scalarField& dMassDV       // mass transfer - local to particle
-        );
+        ) const;
 
         //- Calculate surface reactions
         template<class TrackData>
@@ -237,16 +249,15 @@ protected:
             const scalar mass,         // mass
             const bool canCombust,     // 'can combust' flag
             const scalarField& dMassVolatile, // mass transfer of volatiles
-            const scalarField& YMix,    // mixture mass fractions
+            const scalarField& YMix,   // mixture mass fractions
             const scalarField& YGas,   // gas-phase mass fractions
             const scalarField& YLiquid,// liquid-phase mass fractions
             const scalarField& YSolid, // solid-phase mass fractions
             scalarField& dMassSRGas,   // gas-phase mass transfer - local
             scalarField& dMassSRLiquid,// liquid-phase mass transfer - local
             scalarField& dMassSRSolid, // solid-phase mass transfer - local
-            scalarField& dMassSRCarrier,// carrier phase mass transfer
-            scalar& dhTrans            // enthalpy transfer to carrier phase
-        );
+            scalarField& dMassSRCarrier// carrier phase mass transfer
+        ) const;
 
 
 public:
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
index 64829732e8..b37f7c715e 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
@@ -70,8 +70,8 @@ Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
         // scale the mass fractions
         const scalarField& YMix = this->Y_;
         YGas_ /= YMix[GAS] + ROOTVSMALL;
-        YLiquid_ /= YMix[LIQUID] + ROOTVSMALL;
-        YSolid_ /= YMix[SOLID] + ROOTVSMALL;
+        YLiquid_ /= YMix[LIQ] + ROOTVSMALL;
+        YSolid_ /= YMix[SLD] + ROOTVSMALL;
     }
 
     // Check state of Istream
@@ -153,7 +153,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
         forAllIter(typename Cloud<ParcelType>, c, iter)
         {
             ReactingMultiphaseParcel<ParcelType>& p = iter();
-            p.YLiquid_[j] = YLiquid[i++]/(p.Y()[LIQUID] + ROOTVSMALL);
+            p.YLiquid_[j] = YLiquid[i++]/(p.Y()[LIQ] + ROOTVSMALL);
         }
     }
     // Populate YSolid for each parcel
@@ -172,7 +172,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
         forAllIter(typename Cloud<ParcelType>, c, iter)
         {
             ReactingMultiphaseParcel<ParcelType>& p = iter();
-            p.YSolid_[j] = YSolid[i++]/(p.Y()[SOLID] + ROOTVSMALL);
+            p.YSolid_[j] = YSolid[i++]/(p.Y()[SLD] + ROOTVSMALL);
         }
     }
 }
@@ -235,7 +235,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
             forAllConstIter(typename Cloud<ParcelType>, c, iter)
             {
                 const ReactingMultiphaseParcel<ParcelType>& p0 = iter();
-                YLiquid[i++] = p0.YLiquid()[j]*p0.Y()[LIQUID];
+                YLiquid[i++] = p0.YLiquid()[j]*p0.Y()[LIQ];
             }
 
             YLiquid.write();
@@ -259,7 +259,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
             forAllConstIter(typename Cloud<ParcelType>, c, iter)
             {
                 const ReactingMultiphaseParcel<ParcelType>& p0 = iter();
-                YSolid[i++] = p0.YSolid()[j]*p0.Y()[SOLID];
+                YSolid[i++] = p0.YSolid()[j]*p0.Y()[SLD];
             }
 
             YSolid.write();
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index 4529d4e077..1db979c6da 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -102,23 +102,18 @@ void Foam::ReactingParcel<ParcelType>::calc
     const scalar cp0 = this->cp_;
     const scalar mass0 = this->mass();
 
-
-    // Intialise transfer terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~~
-
-    // Momentum
-    vector dUTrans = vector::zero;
-
-    // Enthalpy
-    scalar dhTrans = 0.0;
-
-    // Mass transfer due to phase change
-    scalarField dMassPC(Y_.size(), 0.0);
+    // Intial ethalpy state
+    scalar H0H = td.cloud().composition().H(0, Y_, pc_, T0);
+    scalar H0L = td.cloud().composition().L(0, Y_, pc_, T0);
+    scalar H0 = H0H - H0L;
 
 
     // Phase change
     // ~~~~~~~~~~~~
 
+    // Mass transfer due to phase change
+    scalarField dMassPC(Y_.size(), 0.0);
+
     // Return enthalpy source and calc mass transfer due to phase change
     scalar ShPC =
         calcPhaseChange(td, dt, cellI, d0, T0, U0, 0, 1.0, Y_, dMassPC);
@@ -126,54 +121,30 @@ void Foam::ReactingParcel<ParcelType>::calc
     // Update particle component mass fractions
     updateMassFraction(mass0, dMassPC, Y_);
 
+    // Update mass
+    scalar mass1 = mass0 - sum(dMassPC);
+
 
     // Heat transfer
     // ~~~~~~~~~~~~~
 
     // Calculate new particle temperature
-    scalar htc = 0.0;
-    scalar T1 =
-        calcHeatTransfer
-        (
-            td,
-            dt,
-            cellI,
-            d0,
-            U0,
-            rho0,
-            T0,
-            cp0,
-            ShPC,
-            htc,
-            dhTrans
-        );
+    scalar T1 = calcHeatTransfer(td, dt, cellI, d0, U0, rho0, T0, cp0, ShPC);
+
+    // Calculate new enthalpy state
+    scalar H1H = td.cloud().composition().H(0, Y_, pc_, T1);
+    scalar H1L = td.cloud().composition().L(0, Y_, pc_, T1);
+    scalar H1 = H1H - H1L;
 
 
     // Motion
     // ~~~~~~
 
-    // Update mass
-    scalar mass1 = mass0 - sum(dMassPC);
-
     // No additional forces
     vector Fx = vector::zero;
 
     // Calculate new particle velocity
-    scalar Cud = 0.0;
-    vector U1 =
-        calcVelocity
-        (
-            td,
-            dt,
-            cellI,
-            d0,
-            U0,
-            rho0,
-            0.5*(mass0 + mass1),
-            Fx,
-            Cud,
-            dUTrans
-        );
+    vector U1 = calcVelocity(td, dt, cellI, d0, U0, rho0, mass0, Fx);
 
 
     // Accumulate carrier phase source terms
@@ -188,16 +159,10 @@ void Foam::ReactingParcel<ParcelType>::calc
         }
 
         // Update momentum transfer
-        td.cloud().UTrans()[cellI] += np0*dUTrans;
-
-        // Coefficient to be applied in carrier phase momentum coupling
-        td.cloud().UCoeff()[cellI] += np0*mass0*Cud;
+        td.cloud().UTrans()[cellI] += np0*(mass0*U0 - mass1*U1);
 
         // Update enthalpy transfer
-        td.cloud().hTrans()[cellI] += np0*dhTrans;
-
-        // Coefficient to be applied in carrier phase enthalpy coupling
-        td.cloud().hCoeff()[cellI] += np0*htc*this->areaS();
+        td.cloud().hTrans()[cellI] += np0*(mass0*H0 - mass1*H1);
     }
 
 
@@ -216,8 +181,7 @@ void Foam::ReactingParcel<ParcelType>::calc
                 td.cloud().rhoTrans(id)[cellI] += np0*mass1*Y_[i];
             }
             td.cloud().UTrans()[cellI] += np0*mass1*U1;
-            scalar HEff = td.cloud().composition().H(0, Y_, pc_, T1);
-            td.cloud().hTrans()[cellI] += np0*mass1*HEff;
+            td.cloud().hTrans()[cellI] += np0*mass1*H1;
         }
     }
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
index 8b5a722d30..4d4d469d12 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -84,12 +84,8 @@ void Foam::ThermoParcel<ParcelType>::calc
     const scalar cp0 = this->cp_;
     const scalar mass0 = this->mass();
 
-
-    // Initialise transfer terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    vector dUTrans = vector::zero;
-    scalar dhTrans = 0.0;
+    // Initial enthalpy state
+    scalar H0 = cp0*T0;
 
 
     // Heat transfer
@@ -99,22 +95,10 @@ void Foam::ThermoParcel<ParcelType>::calc
     scalar Sh = 0.0;
 
     // Calculate new particle velocity
-    scalar htc = 0.0;
-    scalar T1 =
-        calcHeatTransfer
-        (
-            td,
-            dt,
-            cellI,
-            d0,
-            U0,
-            rho0,
-            T0,
-            cp0,
-            Sh,
-            htc,
-            dhTrans
-        );
+    scalar T1 = calcHeatTransfer(td, dt, cellI, d0, U0, rho0, T0, cp0, Sh);
+
+    // Calculate new enthalpy state
+    scalar H1 = cp0 - T1;
 
 
     // Motion
@@ -124,9 +108,7 @@ void Foam::ThermoParcel<ParcelType>::calc
     vector Fx = vector::zero;
 
     // Calculate new particle velocity
-    scalar Cud = 0.0;
-    vector U1 =
-        calcVelocity(td, dt, cellI, d0, U0, rho0, mass0, Fx, Cud, dUTrans);
+    vector U1 = calcVelocity(td, dt, cellI, d0, U0, rho0, mass0, Fx);
 
 
     //  Accumulate carrier phase source terms
@@ -134,16 +116,10 @@ void Foam::ThermoParcel<ParcelType>::calc
     if (td.cloud().coupled())
     {
         // Update momentum transfer
-        td.cloud().UTrans()[cellI] += np0*dUTrans;
-
-        // Coefficient to be applied in carrier phase momentum coupling
-        td.cloud().UCoeff()[cellI] += np0*mass0*Cud;
+        td.cloud().UTrans()[cellI] += np0*mass0*(U0 - U1);
 
         // Update enthalpy transfer
-        td.cloud().hTrans()[cellI] += np0*dhTrans;
-
-        // Coefficient to be applied in carrier phase enthalpy coupling
-        td.cloud().hCoeff()[cellI] += np0*htc*this->areaS();
+        td.cloud().hTrans()[cellI] += np0*mass0*(H0 - H1);
     }
 
     // Set new particle properties
@@ -165,19 +141,16 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
     const scalar rho,
     const scalar T,
     const scalar cp,
-    const scalar Sh,
-    scalar& htc,
-    scalar& dhTrans
+    const scalar Sh
 )
 {
     if (!td.cloud().heatTransfer().active())
     {
-        htc = 0.0;
         return T;
     }
 
     // Calc heat transfer coefficient
-    htc = td.cloud().heatTransfer().h
+    scalar htc = td.cloud().heatTransfer().h
     (
         d,
         U - this->Uc_,
@@ -192,11 +165,8 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
     // Determine new particle temperature
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    // Particle area
-    scalar Ap = this->areaS(d);
-
     // Determine ap and bp coefficients
-    scalar ap = Tc_ + Sh/(htc*Ap + ROOTVSMALL);
+    scalar ap = Tc_ + Sh/(htc*this->areaS(d) + ROOTVSMALL);
     scalar bp = 6.0*htc/(rho*d*cp);
     if (td.cloud().radiation())
     {
@@ -219,10 +189,6 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
     IntegrationScheme<scalar>::integrationResult Tres =
         td.cloud().TIntegrator().integrate(T, dt, ap, bp);
 
-    // Enthalpy transfer
-    // - Using average particle temperature
-    dhTrans = dt*Ap*htc*(Tres.average() - Tc_);
-
     return Tres.value();
 }
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
index 18a36dc024..aa2020aa10 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
@@ -222,9 +222,7 @@ protected:
             const scalar rho,          // density
             const scalar T,            // temperature
             const scalar cp,           // specific heat capacity
-            const scalar Sh,           // additional enthalpy sources
-            scalar& htc,               // heat transfer coeff
-            scalar& dhTrans            // enthalpy transfer to carrier phase
+            const scalar Sh            // additional enthalpy sources
         );
 
 

From c9e57ad9d58ab9fbe755bb9e46362658af968292 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Thu, 14 May 2009 13:29:20 +0100
Subject: [PATCH 117/175] updated to reflect change in lagrangian phase source
 term names

---
 .../reactingParcelFoam/Make/options           |  2 -
 .../Lagrangian/reactingParcelFoam/UEqn.H      |  2 +-
 .../Lagrangian/reactingParcelFoam/YEqn.H      |  4 +-
 .../reactingParcelFoam/createClouds.H         |  4 +-
 .../reactingParcelFoam/createFields.H         | 51 ----------------
 .../Lagrangian/reactingParcelFoam/hEqn.H      |  2 +-
 .../Lagrangian/reactingParcelFoam/pEqn.H      |  4 +-
 .../reactingParcelFoam/reactingParcelFoam.C   | 58 ++++++++++---------
 .../Lagrangian/reactingParcelFoam/rhoEqn.H    |  2 +-
 9 files changed, 37 insertions(+), 92 deletions(-)

diff --git a/applications/solvers/Lagrangian/reactingParcelFoam/Make/options b/applications/solvers/Lagrangian/reactingParcelFoam/Make/options
index b0e474c308..7d9fba6143 100644
--- a/applications/solvers/Lagrangian/reactingParcelFoam/Make/options
+++ b/applications/solvers/Lagrangian/reactingParcelFoam/Make/options
@@ -4,7 +4,6 @@ EXE_INC = \
     -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
-    -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
@@ -19,7 +18,6 @@ EXE_INC = \
     -I$(LIB_SRC)/ODE/lnInclude
 
 EXE_LIBS = \
-    -L$(FOAM_USER_LIBBIN) \
     -lfiniteVolume \
     -lmeshTools \
     -lcompressibleRASModels \
diff --git a/applications/solvers/Lagrangian/reactingParcelFoam/UEqn.H b/applications/solvers/Lagrangian/reactingParcelFoam/UEqn.H
index ce4292dec9..3c4a927091 100644
--- a/applications/solvers/Lagrangian/reactingParcelFoam/UEqn.H
+++ b/applications/solvers/Lagrangian/reactingParcelFoam/UEqn.H
@@ -5,7 +5,7 @@
       + turbulence->divDevRhoReff(U)
      ==
         rho.dimensionedInternalField()*g
-      + reactingParcels.SU1()
+      + parcels.SU()
     );
 
     UEqn.relax();
diff --git a/applications/solvers/Lagrangian/reactingParcelFoam/YEqn.H b/applications/solvers/Lagrangian/reactingParcelFoam/YEqn.H
index d7dd43e6d7..c7ade57fbe 100644
--- a/applications/solvers/Lagrangian/reactingParcelFoam/YEqn.H
+++ b/applications/solvers/Lagrangian/reactingParcelFoam/YEqn.H
@@ -1,4 +1,3 @@
-
 tmp<fv::convectionScheme<scalar> > mvConvection
 (
     fv::convectionScheme<scalar>::New
@@ -26,7 +25,7 @@ tmp<fv::convectionScheme<scalar> > mvConvection
               + mvConvection->fvmDiv(phi, Yi)
               - fvm::laplacian(turbulence->muEff(), Yi)
               ==
-                reactingParcels.Srho1(i)
+                parcels.Srho(i)
               + kappa*chemistry.RR(i)().dimensionedInternalField()
             );
 
@@ -41,5 +40,4 @@ tmp<fv::convectionScheme<scalar> > mvConvection
 
     Y[inertIndex] = scalar(1) - Yt;
     Y[inertIndex].max(0.0);
-
 }
diff --git a/applications/solvers/Lagrangian/reactingParcelFoam/createClouds.H b/applications/solvers/Lagrangian/reactingParcelFoam/createClouds.H
index 238ee3b18b..b4ec5e4056 100644
--- a/applications/solvers/Lagrangian/reactingParcelFoam/createClouds.H
+++ b/applications/solvers/Lagrangian/reactingParcelFoam/createClouds.H
@@ -1,5 +1,3 @@
-Info<< "\nConstructing interpolation" << endl;
-
 Info << "\nConstructing gas properties" << endl;
 /*
 PtrList<specieConstProperties> gasProperties(Y.size());
@@ -31,7 +29,7 @@ forAll(gasProperties, i)
 }
 
 Info<< "\nConstructing reacting cloud" << endl;
-basicReactingCloud reactingParcels
+basicReactingCloud parcels
 (
     "reactingCloud1",
     rho,
diff --git a/applications/solvers/Lagrangian/reactingParcelFoam/createFields.H b/applications/solvers/Lagrangian/reactingParcelFoam/createFields.H
index 079a4f2e1d..8f0d59e77d 100644
--- a/applications/solvers/Lagrangian/reactingParcelFoam/createFields.H
+++ b/applications/solvers/Lagrangian/reactingParcelFoam/createFields.H
@@ -28,51 +28,6 @@
         thermo->rho()
     );
 
-// lagrangian coal density field
-/*    volScalarField rholc
-    (
-        IOobject
-        (
-            "rholc",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh,
-        dimensionedScalar("zero", dimensionSet(1, -3, 0, 0, 0, 0, 0), 0.0)
-    );
-
-// lagrangian limestone density field
-    volScalarField rhols
-    (
-        IOobject
-        (
-            "rhols",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh,
-        dimensionedScalar("zero", dimensionSet(1, -3, 0, 0, 0, 0, 0), 0.0)
-    );
-
-// lagrangian total density field
-    volScalarField rhol
-    (
-        IOobject
-        (
-            "rhol",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh,
-        dimensionedScalar("zero", dimensionSet(1, -3, 0, 0, 0, 0, 0), 0.0)
-    );*/
-
     Info<< "\nReading field U\n" << endl;
     volVectorField U
     (
@@ -133,9 +88,3 @@
         fields.add(Y[i]);
     }
     fields.add(h);
-
-    Info<< "Creating radiation model\n" << endl;
-    autoPtr<radiation::radiationModel> radiation
-    (
-        radiation::radiationModel::New(T)
-    );
diff --git a/applications/solvers/Lagrangian/reactingParcelFoam/hEqn.H b/applications/solvers/Lagrangian/reactingParcelFoam/hEqn.H
index e4fc046097..7909d8c67d 100644
--- a/applications/solvers/Lagrangian/reactingParcelFoam/hEqn.H
+++ b/applications/solvers/Lagrangian/reactingParcelFoam/hEqn.H
@@ -6,7 +6,7 @@
       - fvm::laplacian(turbulence->alphaEff(), h)
      ==
         DpDt
-     +  reactingParcels.Sh1()
+     +  parcels.Sh()
      +  radiation->Sh(thermo())
     );
 
diff --git a/applications/solvers/Lagrangian/reactingParcelFoam/pEqn.H b/applications/solvers/Lagrangian/reactingParcelFoam/pEqn.H
index 5516afe515..63370f0cd4 100644
--- a/applications/solvers/Lagrangian/reactingParcelFoam/pEqn.H
+++ b/applications/solvers/Lagrangian/reactingParcelFoam/pEqn.H
@@ -23,7 +23,7 @@ if (transonic)
           + fvm::div(phid, p)
           - fvm::laplacian(rho*rUA, p)
          ==
-            reactingParcels.Srho1()
+            parcels.Srho()
         );
 
         pEqn.solve();
@@ -51,7 +51,7 @@ else
           + fvc::div(phi)
           - fvm::laplacian(rho*rUA, p)
          ==
-            reactingParcels.Srho1()
+            parcels.Srho()
         );
 
         pEqn.solve();
diff --git a/applications/solvers/Lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/Lagrangian/reactingParcelFoam/reactingParcelFoam.C
index 122f7dffb7..eb170cb7c4 100644
--- a/applications/solvers/Lagrangian/reactingParcelFoam/reactingParcelFoam.C
+++ b/applications/solvers/Lagrangian/reactingParcelFoam/reactingParcelFoam.C
@@ -23,8 +23,11 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Application
+    reactingParcelFoam
 
 Description
+    Transient PISO solver for compressible, laminar or turbulent flow with
+    reacting Lagrangian parcels.
 
 \*---------------------------------------------------------------------------*/
 
@@ -42,55 +45,54 @@ Description
 
 int main(int argc, char *argv[])
 {
-#   include "setRootCase.H"
+    #include "setRootCase.H"
 
-#   include "createTime.H"
-#   include "createMesh.H"
-#   include "readChemistryProperties.H"
-#   include "readEnvironmentalProperties.H"
-#   include "createFields.H"
-#   include "createClouds.H"
-#   include "readPISOControls.H"
-#   include "initContinuityErrs.H"
-#   include "readTimeControls.H"
-#   include "compressibleCourantNo.H"
-#   include "setInitialDeltaT.H"
+    #include "createTime.H"
+    #include "createMesh.H"
+    #include "readChemistryProperties.H"
+    #include "readEnvironmentalProperties.H"
+    #include "createFields.H"
+    #include "createClouds.H"
+    #include "createRadiationModel.H"
+    #include "readPISOControls.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"
+        #include "readTimeControls.H"
+        #include "readPISOControls.H"
+        #include "compressibleCourantNo.H"
+        #include "setDeltaT.H"
 
         runTime++;
 
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        Info << "Evolving reacting cloud" << endl;
+        parcels.evolve();
 
-        reactingParcels.evolve();
+        parcels.info();
 
-        reactingParcels.info();
-
-#       include "chemistry.H"
-#       include "rhoEqn.H"
+        #include "chemistry.H"
+        #include "rhoEqn.H"
 
         // --- PIMPLE loop
         for (int ocorr=1; ocorr<=nOuterCorr; ocorr++)
         {
-#           include "UEqn.H"
-#           include "YEqn.H"
+            #include "UEqn.H"
+            #include "YEqn.H"
 
             // --- PISO loop
             for (int corr=1; corr<=nCorr; corr++)
             {
-#               include "hEqn.H"
-#               include "pEqn.H"
+                #include "hEqn.H"
+                #include "pEqn.H"
             }
 
             Info<< "T gas min/max   = " << min(T).value() << ", "
@@ -103,7 +105,7 @@ int main(int argc, char *argv[])
 
         if (runTime.write())
         {
-#           include "additionalOutput.H"
+            #include "additionalOutput.H"
         }
 
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
diff --git a/applications/solvers/Lagrangian/reactingParcelFoam/rhoEqn.H b/applications/solvers/Lagrangian/reactingParcelFoam/rhoEqn.H
index d6b129452e..e30e721004 100644
--- a/applications/solvers/Lagrangian/reactingParcelFoam/rhoEqn.H
+++ b/applications/solvers/Lagrangian/reactingParcelFoam/rhoEqn.H
@@ -36,7 +36,7 @@ Description
         fvm::ddt(rho)
       + fvc::div(phi)
       ==
-        reactingParcels.Srho1()
+        parcels.Srho()
     );
 }
 

From 9becccaeeb55d2277d80f729b9ea9db751fde7bd Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Thu, 14 May 2009 13:42:11 +0100
Subject: [PATCH 118/175] removing unnecessary header file

---
 .../solvers/Lagrangian/reactingParcelFoam/reactingParcelFoam.C   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/applications/solvers/Lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/Lagrangian/reactingParcelFoam/reactingParcelFoam.C
index eb170cb7c4..ea57f0da0e 100644
--- a/applications/solvers/Lagrangian/reactingParcelFoam/reactingParcelFoam.C
+++ b/applications/solvers/Lagrangian/reactingParcelFoam/reactingParcelFoam.C
@@ -34,7 +34,6 @@ Description
 #include "fvCFD.H"
 #include "hCombustionThermo.H"
 #include "turbulenceModel.H"
-#include "basicThermoCloud.H"
 #include "basicReactingCloud.H"
 #include "chemistryModel.H"
 #include "chemistrySolver.H"

From 64c0a9813fed00cbf17469aef73df58876757d17 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Thu, 14 May 2009 15:17:47 +0100
Subject: [PATCH 119/175] intial commit of coal combustion functionality

---
 .../combustion/coalChemistryFoam/Make/files   |   3 +
 .../combustion/coalChemistryFoam/Make/options |  40 ++++
 .../combustion/coalChemistryFoam/UEqn.H       |  17 ++
 .../combustion/coalChemistryFoam/YEqn.H       |  43 ++++
 .../coalChemistryFoam/additionalOutput.H      |  48 ++++
 .../combustion/coalChemistryFoam/chemistry.H  |  25 ++
 .../coalChemistryFoam/coalChemistryFoam.C     | 133 +++++++++++
 .../coalChemistryFoam/createClouds.H          |  52 ++++
 .../coalChemistryFoam/createFields.H          | 143 +++++++++++
 .../combustion/coalChemistryFoam/hEqn.H       |  22 ++
 .../combustion/coalChemistryFoam/pEqn.H       |  72 ++++++
 .../readChemistryProperties.H                 |  22 ++
 .../combustion/coalChemistryFoam/rhoEqn.H     |  43 ++++
 src/lagrangian/coalCombustion/Make/files      |  19 ++
 src/lagrangian/coalCombustion/Make/options    |  35 +++
 .../coalCombustion/coalCloud/coalCloud.C      |  77 ++++++
 .../coalCombustion/coalCloud/coalCloud.H      | 102 ++++++++
 .../coalCombustion/coalParcel/coalParcel.C    |  92 +++++++
 .../coalCombustion/coalParcel/coalParcel.H    | 114 +++++++++
 .../coalParcel/defineCoalParcel.C             |  50 ++++
 .../makeCoalParcelCompositionModels.C         |  48 ++++
 .../makeCoalParcelDevolatilisationModels.C    |  65 +++++
 .../makeCoalParcelDispersionModels.C          |  68 ++++++
 .../submodels/makeCoalParcelDragModels.C      |  45 ++++
 .../makeCoalParcelHeatTransferModels.C        |  45 ++++
 .../submodels/makeCoalParcelInjectionModels.C |  49 ++++
 .../makeCoalParcelPhaseChangeModels.C         |  58 +++++
 .../makeCoalParcelSurfaceReactionModels.C     |  55 +++++
 .../makeCoalParcelWallInteractionModels.C     |  55 +++++
 .../COxidationMurphyShaddix.C                 | 225 ++++++++++++++++++
 .../COxidationMurphyShaddix.H                 | 169 +++++++++++++
 31 files changed, 2034 insertions(+)
 create mode 100644 applications/solvers/combustion/coalChemistryFoam/Make/files
 create mode 100644 applications/solvers/combustion/coalChemistryFoam/Make/options
 create mode 100644 applications/solvers/combustion/coalChemistryFoam/UEqn.H
 create mode 100644 applications/solvers/combustion/coalChemistryFoam/YEqn.H
 create mode 100644 applications/solvers/combustion/coalChemistryFoam/additionalOutput.H
 create mode 100644 applications/solvers/combustion/coalChemistryFoam/chemistry.H
 create mode 100644 applications/solvers/combustion/coalChemistryFoam/coalChemistryFoam.C
 create mode 100644 applications/solvers/combustion/coalChemistryFoam/createClouds.H
 create mode 100644 applications/solvers/combustion/coalChemistryFoam/createFields.H
 create mode 100644 applications/solvers/combustion/coalChemistryFoam/hEqn.H
 create mode 100644 applications/solvers/combustion/coalChemistryFoam/pEqn.H
 create mode 100644 applications/solvers/combustion/coalChemistryFoam/readChemistryProperties.H
 create mode 100644 applications/solvers/combustion/coalChemistryFoam/rhoEqn.H
 create mode 100755 src/lagrangian/coalCombustion/Make/files
 create mode 100755 src/lagrangian/coalCombustion/Make/options
 create mode 100644 src/lagrangian/coalCombustion/coalCloud/coalCloud.C
 create mode 100644 src/lagrangian/coalCombustion/coalCloud/coalCloud.H
 create mode 100644 src/lagrangian/coalCombustion/coalParcel/coalParcel.C
 create mode 100644 src/lagrangian/coalCombustion/coalParcel/coalParcel.H
 create mode 100644 src/lagrangian/coalCombustion/coalParcel/defineCoalParcel.C
 create mode 100644 src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelCompositionModels.C
 create mode 100644 src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelDevolatilisationModels.C
 create mode 100644 src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelDispersionModels.C
 create mode 100644 src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelDragModels.C
 create mode 100644 src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelHeatTransferModels.C
 create mode 100644 src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelInjectionModels.C
 create mode 100644 src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelPhaseChangeModels.C
 create mode 100644 src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelSurfaceReactionModels.C
 create mode 100644 src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelWallInteractionModels.C
 create mode 100644 src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
 create mode 100644 src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H

diff --git a/applications/solvers/combustion/coalChemistryFoam/Make/files b/applications/solvers/combustion/coalChemistryFoam/Make/files
new file mode 100644
index 0000000000..6a1392f01c
--- /dev/null
+++ b/applications/solvers/combustion/coalChemistryFoam/Make/files
@@ -0,0 +1,3 @@
+coalChemistryFoam.C
+
+EXE = $(FOAM_USER_APPBIN)/coalChemistryFoam
diff --git a/applications/solvers/combustion/coalChemistryFoam/Make/options b/applications/solvers/combustion/coalChemistryFoam/Make/options
new file mode 100644
index 0000000000..21575a94ae
--- /dev/null
+++ b/applications/solvers/combustion/coalChemistryFoam/Make/options
@@ -0,0 +1,40 @@
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
+    -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
+    -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/solids/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/solidMixture/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
+    -I$(LIB_SRC)/ODE/lnInclude
+
+EXE_LIBS = \
+    -L$(FOAM_USER_LIBBIN) \
+    -lfiniteVolume \
+    -lmeshTools \
+    -lcompressibleRASModels \
+    -lcompressibleLESModels \
+    -llagrangian \
+    -llagrangianIntermediate \
+    -lcoalCombustion\
+    -lspecie \
+    -lbasicThermophysicalModels \
+    -lliquids \
+    -lliquidMixture \
+    -lsolids \
+    -lsolidMixture \
+    -lthermophysicalFunctions \
+    -lcombustionThermophysicalModels \
+    -lchemistryModel \
+    -lradiation \
+    -lODE
diff --git a/applications/solvers/combustion/coalChemistryFoam/UEqn.H b/applications/solvers/combustion/coalChemistryFoam/UEqn.H
new file mode 100644
index 0000000000..b02a7c61e8
--- /dev/null
+++ b/applications/solvers/combustion/coalChemistryFoam/UEqn.H
@@ -0,0 +1,17 @@
+    fvVectorMatrix UEqn
+    (
+        fvm::ddt(rho, U)
+      + fvm::div(phi, U)
+      + turbulence->divDevRhoReff(U)
+     ==
+        rho.dimensionedInternalField()*g
+      + coalParcels.SU()
+      + limestoneParcels.SU()
+    );
+
+    UEqn.relax();
+
+    if (momentumPredictor)
+    {
+        solve(UEqn == -fvc::grad(p));
+    }
diff --git a/applications/solvers/combustion/coalChemistryFoam/YEqn.H b/applications/solvers/combustion/coalChemistryFoam/YEqn.H
new file mode 100644
index 0000000000..5c84cfdb3f
--- /dev/null
+++ b/applications/solvers/combustion/coalChemistryFoam/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)
+              ==
+                coalParcels.Srho(i)
+              + kappa*chemistry.RR(i)().dimensionedInternalField()
+            );
+
+            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/coalChemistryFoam/additionalOutput.H b/applications/solvers/combustion/coalChemistryFoam/additionalOutput.H
new file mode 100644
index 0000000000..9edd35eb7c
--- /dev/null
+++ b/applications/solvers/combustion/coalChemistryFoam/additionalOutput.H
@@ -0,0 +1,48 @@
+{
+    tmp<volScalarField> tdQ
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "dQ",
+                runTime.timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::AUTO_WRITE
+            ),
+            mesh,
+            dimensionedScalar
+            (
+                "zero",
+                dimensionSet(1, -3, -1, 0, 0, 0, 0),
+                0.0
+            )
+        )
+    );
+
+    scalarField& dQ = tdQ();
+
+    scalarField cp(dQ.size(), 0.0);
+
+    forAll(Y, i)
+    {
+        volScalarField RRi = chemistry.RR(i);
+
+        forAll(h, celli)
+        {
+            scalar Ti = T[celli];
+            cp[celli] += Y[i][celli]*chemistry.specieThermo()[i].Cp(Ti);
+            scalar hi = chemistry.specieThermo()[i].h(Ti);
+            scalar RR = RRi[celli];
+            dQ[celli] -= hi*RR;
+        }
+    }
+
+    forAll(dQ, celli)
+    {
+        dQ[celli] /= cp[celli];
+    }
+
+    tdQ().write();
+}
diff --git a/applications/solvers/combustion/coalChemistryFoam/chemistry.H b/applications/solvers/combustion/coalChemistryFoam/chemistry.H
new file mode 100644
index 0000000000..07b1e9953b
--- /dev/null
+++ b/applications/solvers/combustion/coalChemistryFoam/chemistry.H
@@ -0,0 +1,25 @@
+{
+    Info << "Solving chemistry" << endl;
+
+    chemistry.solve
+    (
+        runTime.value() - runTime.deltaT().value(),
+        runTime.deltaT().value()
+    );
+
+    // turbulent time scale
+    if (turbulentReaction)
+    {
+        DimensionedField<scalar, volMesh> tk =
+            Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon());
+        DimensionedField<scalar, volMesh> tc =
+            chemistry.tc()().dimensionedInternalField();
+
+        // Chalmers PaSR model
+        kappa = (runTime.deltaT() + tc)/(runTime.deltaT() + tc + tk);
+    }
+    else
+    {
+        kappa = 1.0;
+    }
+}
diff --git a/applications/solvers/combustion/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/combustion/coalChemistryFoam/coalChemistryFoam.C
new file mode 100644
index 0000000000..4b28e3b37f
--- /dev/null
+++ b/applications/solvers/combustion/coalChemistryFoam/coalChemistryFoam.C
@@ -0,0 +1,133 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2007 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
+    coalChemistryFoam
+
+Description
+    Transient solver for compressible, turbulent flow with coal and
+    limestone parcel injections, and combustion.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fvCFD.H"
+#include "hCombustionThermo.H"
+#include "turbulenceModel.H"
+#include "basicThermoCloud.H"
+#include "coalCloud.H"
+#include "chemistryModel.H"
+#include "chemistrySolver.H"
+#include "ReactingCloudThermoTypes.H"
+#include "timeActivatedExplicitSource.H"
+#include "radiationModel.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 "createClouds.H"
+    #include "createRadiationModel.H"
+    #include "readPISOControls.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;
+
+        Info << "Evolving coal cloud" << endl;
+
+        coalParcels.evolve();
+
+        coalParcels.info();
+
+        Info << "Evolving limestone cloud" << endl;
+
+        limestoneParcels.evolve();
+
+        limestoneParcels.info();
+
+        #include "chemistry.H"
+        #include "rhoEqn.H"
+
+        // --- PIMPLE loop
+        for (int ocorr=1; ocorr<=nOuterCorr; ocorr++)
+        {
+            #include "UEqn.H"
+            #include "YEqn.H"
+
+            // --- PISO loop
+            for (int corr=1; corr<=nCorr; corr++)
+            {
+                #include "hEqn.H"
+                #include "pEqn.H"
+            }
+
+            Info<< "T gas min/max   = " << min(T).value() << ", "
+                << max(T).value() << endl;
+        }
+
+        turbulence->correct();
+
+        enthalpySource.update();
+
+        rho = thermo->rho();
+
+        if (runTime.write())
+        {
+            #include "additionalOutput.H"
+        }
+
+        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
+            << nl << endl;
+    }
+
+    Info<< "End\n" << endl;
+
+    return(0);
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/combustion/coalChemistryFoam/createClouds.H b/applications/solvers/combustion/coalChemistryFoam/createClouds.H
new file mode 100644
index 0000000000..34398f6b82
--- /dev/null
+++ b/applications/solvers/combustion/coalChemistryFoam/createClouds.H
@@ -0,0 +1,52 @@
+Info<< "\nConstructing interpolation" << endl;
+
+Info << "\nConstructing gas properties" << endl;
+/*
+PtrList<specieConstProperties> gasProperties(Y.size());
+forAll(gasProperties, i)
+{
+    gasProperties.set
+    (
+        i,
+        new specieConstProperties
+        (
+            dynamic_cast<const multiComponentMixture<constTransport<
+                specieThermo<hConstThermo<perfectGas> > > >&>
+                (thermo()).speciesData()[i]
+        )
+    );
+}
+*/
+PtrList<specieReactingProperties> gasProperties(Y.size());
+forAll(gasProperties, i)
+{
+    gasProperties.set
+    (
+        i,
+        new specieReactingProperties
+        (
+            dynamic_cast<const reactingMixture&>(thermo()).speciesData()[i]
+        )
+    );
+}
+
+Info<< "\nConstructing coal cloud" << endl;
+coalCloud coalParcels
+(
+    "coalCloud1",
+    rho,
+    U,
+    g,
+    thermo(),
+    gasProperties
+);
+
+Info<< "\nConstructing limestone cloud" << endl;
+basicThermoCloud limestoneParcels
+(
+    "limestoneCloud1",
+    rho,
+    U,
+    g,
+    thermo()
+);
diff --git a/applications/solvers/combustion/coalChemistryFoam/createFields.H b/applications/solvers/combustion/coalChemistryFoam/createFields.H
new file mode 100644
index 0000000000..0cc8632562
--- /dev/null
+++ b/applications/solvers/combustion/coalChemistryFoam/createFields.H
@@ -0,0 +1,143 @@
+    Info<< "Reading thermophysical properties\n" << endl;
+
+    autoPtr<hCombustionThermo> thermo
+    (
+        hCombustionThermo::New(mesh)
+    );
+
+    combustionMixture& composition = thermo->composition();
+    PtrList<volScalarField>& Y = composition.Y();
+
+    word inertSpecie(thermo->lookup("inertSpecie"));
+
+    volScalarField& p = thermo->p();
+    volScalarField& h = thermo->h();
+    const volScalarField& T = thermo->T();
+    const volScalarField& psi = thermo->psi();
+
+    volScalarField rho
+    (
+        IOobject
+        (
+            "rho",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        thermo->rho()
+    );
+
+// lagrangian coal density field
+/*    volScalarField rholc
+    (
+        IOobject
+        (
+            "rholc",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh,
+        dimensionedScalar("zero", dimensionSet(1, -3, 0, 0, 0, 0, 0), 0.0)
+    );
+
+// lagrangian limestone density field
+    volScalarField rhols
+    (
+        IOobject
+        (
+            "rhols",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh,
+        dimensionedScalar("zero", dimensionSet(1, -3, 0, 0, 0, 0, 0), 0.0)
+    );
+
+// lagrangian total density field
+    volScalarField rhol
+    (
+        IOobject
+        (
+            "rhol",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh,
+        dimensionedScalar("zero", dimensionSet(1, -3, 0, 0, 0, 0, 0), 0.0)
+    );*/
+
+    Info<< "\nReading field U\n" << endl;
+    volVectorField U
+    (
+        IOobject
+        (
+            "U",
+            runTime.timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh
+    );
+
+#   include "compressibleCreatePhi.H"
+
+    DimensionedField<scalar, volMesh> kappa
+    (
+        IOobject
+        (
+            "kappa",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh,
+        dimensionedScalar("zero", dimless, 0.0)
+    );
+
+    Info<< "Creating turbulence model\n" << endl;
+    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);
+
+    Info<< "\nConstructing explicit enthalpy source" << endl;
+    timeActivatedExplicitSource enthalpySource
+    (
+        "enthalpySource",
+        mesh,
+        h.dimensions()*phi.dimensions()/mesh.V().dimensions()
+    );
+
+    Info << "Constructing chemical mechanism" << endl;
+    chemistryModel chemistry
+    (
+        thermo(),
+        rho
+    );
+
+    multivariateSurfaceInterpolationScheme<scalar>::fieldTable fields;
+
+    forAll (Y, i)
+    {
+        fields.add(Y[i]);
+    }
+    fields.add(h);
diff --git a/applications/solvers/combustion/coalChemistryFoam/hEqn.H b/applications/solvers/combustion/coalChemistryFoam/hEqn.H
new file mode 100644
index 0000000000..6f0d532437
--- /dev/null
+++ b/applications/solvers/combustion/coalChemistryFoam/hEqn.H
@@ -0,0 +1,22 @@
+{
+    fvScalarMatrix hEqn
+    (
+        fvm::ddt(rho, h)
+      + fvm::div(phi, h)
+      - fvm::laplacian(turbulence->alphaEff(), h)
+     ==
+        DpDt
+     +  coalParcels.Sh()
+     +  limestoneParcels.Sh()
+     +  enthalpySource.Su()
+     +  radiation->Sh(thermo())
+    );
+
+    hEqn.relax();
+
+    hEqn.solve();
+
+    thermo->correct();
+
+    radiation->correct();
+}
diff --git a/applications/solvers/combustion/coalChemistryFoam/pEqn.H b/applications/solvers/combustion/coalChemistryFoam/pEqn.H
new file mode 100644
index 0000000000..4a94c725bc
--- /dev/null
+++ b/applications/solvers/combustion/coalChemistryFoam/pEqn.H
@@ -0,0 +1,72 @@
+rho = thermo->rho();
+
+volScalarField rUA = 1.0/UEqn.A();
+U = rUA*UEqn.H();
+
+if (transonic)
+{
+    surfaceScalarField phid
+    (
+        "phid",
+        fvc::interpolate(thermo->psi())
+       *(
+            (fvc::interpolate(U) & mesh.Sf())
+          + fvc::ddtPhiCorr(rUA, rho, U, phi)
+        )
+    );
+
+    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    {
+        fvScalarMatrix pEqn
+        (
+            fvm::ddt(psi, p)
+          + fvm::div(phid, p)
+          - fvm::laplacian(rho*rUA, p)
+         ==
+            coalParcels.Srho()
+        );
+
+        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
+        (
+            fvm::ddt(psi, p)
+          + fvc::div(phi)
+          - fvm::laplacian(rho*rUA, p)
+         ==
+            coalParcels.Srho()
+        );
+
+        pEqn.solve();
+
+        if (nonOrth == nNonOrthCorr)
+        {
+            phi += pEqn.flux();
+        }
+    }
+}
+
+#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/coalChemistryFoam/readChemistryProperties.H b/applications/solvers/combustion/coalChemistryFoam/readChemistryProperties.H
new file mode 100644
index 0000000000..1a60e6fb34
--- /dev/null
+++ b/applications/solvers/combustion/coalChemistryFoam/readChemistryProperties.H
@@ -0,0 +1,22 @@
+Info<< "Reading chemistry properties\n" << endl;
+
+IOdictionary chemistryProperties
+(
+    IOobject
+    (
+        "chemistryProperties",
+        runTime.constant(),
+        mesh,
+        IOobject::MUST_READ,
+        IOobject::NO_WRITE
+    )
+);
+
+Switch turbulentReaction(chemistryProperties.lookup("turbulentReaction"));
+
+dimensionedScalar Cmix("Cmix", dimless, 1.0);
+
+if (turbulentReaction)
+{
+    chemistryProperties.lookup("Cmix") >> Cmix;
+}
diff --git a/applications/solvers/combustion/coalChemistryFoam/rhoEqn.H b/applications/solvers/combustion/coalChemistryFoam/rhoEqn.H
new file mode 100644
index 0000000000..fdc338a959
--- /dev/null
+++ b/applications/solvers/combustion/coalChemistryFoam/rhoEqn.H
@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2007 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
+
+Global
+    rhoEqn
+
+Description
+    Solve the continuity for density.
+
+\*---------------------------------------------------------------------------*/
+
+{
+    solve
+    (
+        fvm::ddt(rho)
+      + fvc::div(phi)
+      ==
+        coalParcels.Srho()
+    );
+}
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/Make/files b/src/lagrangian/coalCombustion/Make/files
new file mode 100755
index 0000000000..b4af07a35d
--- /dev/null
+++ b/src/lagrangian/coalCombustion/Make/files
@@ -0,0 +1,19 @@
+/* coal cloud */
+coalCloud/coalCloud.C
+
+/* coal parcel and sub-models */
+coalParcel/coalParcel.C
+coalParcel/defineCoalParcel.C
+coalParcel/submodels/makeCoalParcelCompositionModels.C
+coalParcel/submodels/makeCoalParcelDevolatilisationModels.C
+coalParcel/submodels/makeCoalParcelDragModels.C
+coalParcel/submodels/makeCoalParcelDispersionModels.C
+coalParcel/submodels/makeCoalParcelInjectionModels.C
+coalParcel/submodels/makeCoalParcelHeatTransferModels.C
+coalParcel/submodels/makeCoalParcelPhaseChangeModels.C
+coalParcel/submodels/makeCoalParcelSurfaceReactionModels.C
+coalParcel/submodels/makeCoalParcelWallInteractionModels.C
+submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
+
+
+LIB = $(FOAM_USER_LIBBIN)/libcoalCombustion
diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options
new file mode 100755
index 0000000000..21dc5327f1
--- /dev/null
+++ b/src/lagrangian/coalCombustion/Make/options
@@ -0,0 +1,35 @@
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
+    -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/solids/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/solidMixture/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels \
+    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/compressible/LES/lnInclude
+
+LIB_LIBS = \
+    -lfiniteVolume \
+    -lmeshTools \
+    -llagrangian \
+    -llagrangianIntermediate \
+    -lpdf \
+    -lspecie \
+    -lbasicThermophysicalModels \
+    -lliquids \
+    -lliquidMixture \
+    -lsolids \
+    -lsolidMixture \
+    -lcombustionThermophysicalModels \
+    -lcompressibleRASModels \
+    -lcompressibleLESModels
diff --git a/src/lagrangian/coalCombustion/coalCloud/coalCloud.C b/src/lagrangian/coalCombustion/coalCloud/coalCloud.C
new file mode 100644
index 0000000000..a8d1dd867b
--- /dev/null
+++ b/src/lagrangian/coalCombustion/coalCloud/coalCloud.C
@@ -0,0 +1,77 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2007 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 "coalCloud.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(coalCloud, 0);
+};
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::coalCloud::coalCloud
+(
+    const word& cloudType,
+    const volScalarField& rho,
+    const volVectorField& U,
+    const dimensionedVector& g,
+    hCombustionThermo& thermo,
+    PtrList<specieReactingProperties>& gases
+)
+:
+    ReactingMultiphaseCloud<coalParcel>
+    (
+        cloudType,
+        rho,
+        U,
+        g,
+        thermo,
+        gases
+    )
+{
+    coalParcel::readFields(*this);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::coalCloud::~coalCloud()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::coalCloud::writeFields() const
+{
+    coalParcel::writeFields(*this);
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/coalCloud/coalCloud.H b/src/lagrangian/coalCombustion/coalCloud/coalCloud.H
new file mode 100644
index 0000000000..72949ce144
--- /dev/null
+++ b/src/lagrangian/coalCombustion/coalCloud/coalCloud.H
@@ -0,0 +1,102 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2007 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
+    coalCloud
+
+Description
+
+SourceFiles
+    coalCloud.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef coalCloud_H
+#define coalCloud_H
+
+#include "ReactingMultiphaseCloud.H"
+#include "coalParcel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class coalCloud Declaration
+\*---------------------------------------------------------------------------*/
+
+class coalCloud
+:
+    public ReactingMultiphaseCloud<coalParcel>
+{
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        coalCloud(const coalCloud&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const coalCloud&);
+
+
+public:
+
+    //-Runtime type information
+    TypeName("coalCloud");
+
+
+    // Constructors
+
+        //- Construct given carrier gas fields
+        coalCloud
+        (
+            const word& cloudType,
+            const volScalarField& rho,
+            const volVectorField& U,
+            const dimensionedVector& g,
+            hCombustionThermo& thermo,
+            PtrList<specieReactingProperties>& gases
+        );
+
+
+    //- Destructor
+    ~coalCloud();
+
+
+    // Member Functions
+
+        //- Write fields
+        void writeFields() const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/coalParcel/coalParcel.C b/src/lagrangian/coalCombustion/coalParcel/coalParcel.C
new file mode 100644
index 0000000000..b1b6120906
--- /dev/null
+++ b/src/lagrangian/coalCombustion/coalParcel/coalParcel.C
@@ -0,0 +1,92 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2007 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 "coalParcel.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(coalParcel, 0);
+    defineParticleTypeNameAndDebug(coalParcel, 0);
+    defineParcelTypeNameAndDebug(coalParcel, 0);
+};
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::coalParcel::coalParcel
+(
+    ReactingMultiphaseCloud<coalParcel>& owner,
+    const vector& position,
+    const label celli,
+    const label typeId,
+    const scalar nParticle0,
+    const scalar d0,
+    const vector& U0,
+    const scalarField& YMixture0,
+    const scalarField& YGas0,
+    const scalarField& YLiquid0,
+    const scalarField& YSolid0,
+    const constantProperties& constProps
+)
+:
+    ReactingMultiphaseParcel<coalParcel>
+    (
+        owner,
+        position,
+        celli,
+        typeId,
+        nParticle0,
+        d0,
+        U0,
+        YMixture0,
+        YGas0,
+        YLiquid0,
+        YSolid0,
+        constProps
+    )
+{}
+
+
+Foam::coalParcel::coalParcel
+(
+    const Cloud<coalParcel>& cloud,
+    Istream& is,
+    bool readFields
+)
+:
+    ReactingMultiphaseParcel<coalParcel>(cloud, is, readFields)
+{}
+
+
+// * * * * * * * * * * * * * * * *  Destructors  * * * * * * * * * * * * * * //
+
+Foam::coalParcel::~coalParcel()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/coalParcel/coalParcel.H b/src/lagrangian/coalCombustion/coalParcel/coalParcel.H
new file mode 100644
index 0000000000..af3be65f84
--- /dev/null
+++ b/src/lagrangian/coalCombustion/coalParcel/coalParcel.H
@@ -0,0 +1,114 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2007 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
+    coalParcel
+
+Description
+
+
+SourceFiles
+    coalParcel.C
+    coalParcelIO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef coalParcel_H
+#define coalParcel_H
+
+#include "ReactingMultiphaseParcel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class coalParcel Declaration
+\*---------------------------------------------------------------------------*/
+
+class coalParcel
+:
+    public ReactingMultiphaseParcel<coalParcel>
+{
+public:
+
+    // Run-time type information
+    TypeName("coalParcel");
+
+    // Constructors
+
+        //- Construct from components
+        coalParcel
+        (
+             ReactingMultiphaseCloud<coalParcel>& owner,
+             const vector& position,
+             const label celli,
+             const label typeId,
+             const scalar nParticle0,
+             const scalar d0,
+             const vector& U0,
+             const scalarField& YMixture0,
+             const scalarField& YGas0,
+             const scalarField& YLiquid0,
+             const scalarField& YSolid0,
+             const constantProperties& constProps
+        );
+
+        //- Construct from Istream
+        coalParcel
+        (
+            const Cloud<coalParcel>& c,
+            Istream& is,
+            bool readFields = true
+        );
+
+        //- Construct and return a clone
+        autoPtr<coalParcel> clone() const
+        {
+            return autoPtr<coalParcel>(new coalParcel(*this));
+        }
+
+
+    //- Destructor
+    virtual ~coalParcel();
+};
+
+
+template<>
+inline bool contiguous<coalParcel>()
+{
+    return false; // Now have scalar lists/fields (mass fractions)
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/coalParcel/defineCoalParcel.C b/src/lagrangian/coalCombustion/coalParcel/defineCoalParcel.C
new file mode 100644
index 0000000000..2c41d82898
--- /dev/null
+++ b/src/lagrangian/coalCombustion/coalParcel/defineCoalParcel.C
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2007 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 "coalParcel.H"
+#include "ReactingMultiphaseCloud.H"
+
+namespace Foam
+{
+    defineTemplateTypeNameAndDebug(Cloud<coalParcel>, 0);
+
+    defineParcelTypeNameAndDebug(KinematicParcel<coalParcel>, 0);
+//    defineTemplateTypeNameAndDebug(KinematicParcel<coalParcel>, 0);
+    defineParcelTypeNameAndDebug(ThermoParcel<coalParcel>, 0);
+    defineTemplateTypeNameAndDebug(ThermoParcel<coalParcel>, 0);
+    defineParcelTypeNameAndDebug(ReactingParcel<coalParcel>, 0);
+    defineTemplateTypeNameAndDebug(ReactingParcel<coalParcel>, 0);
+    defineParcelTypeNameAndDebug(ReactingMultiphaseParcel<coalParcel>, 0);
+    defineTemplateTypeNameAndDebug(ReactingMultiphaseParcel<coalParcel>, 0);
+
+    defineParcelTypeNameAndDebug(KinematicCloud<coalParcel>, 0);
+    defineParcelTypeNameAndDebug(ThermoCloud<coalParcel>, 0);
+    defineParcelTypeNameAndDebug(ReactingCloud<coalParcel>, 0);
+    defineParcelTypeNameAndDebug(ReactingMultiphaseCloud<coalParcel>, 0);
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelCompositionModels.C b/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelCompositionModels.C
new file mode 100644
index 0000000000..f6dea63009
--- /dev/null
+++ b/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelCompositionModels.C
@@ -0,0 +1,48 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2007 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 "coalParcel.H"
+#include "ReactingCloud.H"
+
+#include "SingleMixtureFraction.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makeCompositionModel(ReactingCloud<coalParcel>);
+
+    // Add instances of composition model to the table
+    makeCompositionModelType
+    (
+        SingleMixtureFraction,
+        ReactingCloud,
+        coalParcel
+    );
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelDevolatilisationModels.C b/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelDevolatilisationModels.C
new file mode 100644
index 0000000000..041a132d66
--- /dev/null
+++ b/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelDevolatilisationModels.C
@@ -0,0 +1,65 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "coalParcel.H"
+#include "ReactingMultiphaseCloud.H"
+
+#include "NoDevolatilisation.H"
+#include "ConstantRateDevolatilisation.H"
+#include "SingleKineticRateDevolatilisation.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makeDevolatilisationModel
+    (
+        ReactingMultiphaseCloud<coalParcel>
+    );
+
+    // Add instances of devolatilisation model to the table
+    makeDevolatilisationModelType
+    (
+        NoDevolatilisation,
+        ReactingMultiphaseCloud,
+        coalParcel
+    );
+    makeDevolatilisationModelType
+    (
+        ConstantRateDevolatilisation,
+        ReactingMultiphaseCloud,
+        coalParcel
+    );
+    makeDevolatilisationModelType
+    (
+        SingleKineticRateDevolatilisation,
+        ReactingMultiphaseCloud,
+        coalParcel
+    );
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelDispersionModels.C b/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelDispersionModels.C
new file mode 100644
index 0000000000..d6f1cc8232
--- /dev/null
+++ b/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelDispersionModels.C
@@ -0,0 +1,68 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2007 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 "coalParcel.H"
+#include "KinematicCloud.H"
+
+#include "NoDispersion.H"
+#include "GradientDispersionRAS.H"
+#include "StochasticDispersionRAS.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makeDispersionModel(KinematicCloud<coalParcel>);
+
+    defineNamedTemplateTypeNameAndDebug
+    (
+        DispersionRASModel<KinematicCloud<coalParcel> >,
+        0
+    );
+
+    // Add instances of dispersion model to the table
+    makeDispersionModelType
+    (
+        NoDispersion,
+        KinematicCloud,
+        coalParcel
+    );
+    makeDispersionModelType
+    (
+        GradientDispersionRAS,
+        KinematicCloud,
+        coalParcel
+    );
+    makeDispersionModelType
+    (
+        StochasticDispersionRAS,
+        KinematicCloud,
+        coalParcel
+    );
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelDragModels.C b/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelDragModels.C
new file mode 100644
index 0000000000..162e1d56c2
--- /dev/null
+++ b/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelDragModels.C
@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2007 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 "coalParcel.H"
+#include "KinematicCloud.H"
+
+#include "NoDrag.H"
+#include "SphereDrag.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makeDragModel(KinematicCloud<coalParcel>);
+
+    // Add instances of drag model to the table
+    makeDragModelType(NoDrag, KinematicCloud, coalParcel);
+    makeDragModelType(SphereDrag, KinematicCloud, coalParcel);
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelHeatTransferModels.C b/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelHeatTransferModels.C
new file mode 100644
index 0000000000..92e1a67270
--- /dev/null
+++ b/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelHeatTransferModels.C
@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2007 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 "coalParcel.H"
+#include "ThermoCloud.H"
+
+#include "NoHeatTransfer.H"
+#include "RanzMarshall.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makeHeatTransferModel(ThermoCloud<coalParcel>);
+
+    // Add instances of heat transfer model to the table
+    makeHeatTransferModelType(NoHeatTransfer, ThermoCloud, coalParcel);
+    makeHeatTransferModelType(RanzMarshall, ThermoCloud, coalParcel);
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelInjectionModels.C b/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelInjectionModels.C
new file mode 100644
index 0000000000..bf68b99477
--- /dev/null
+++ b/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelInjectionModels.C
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2007 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 "coalParcel.H"
+#include "ReactingCloud.H"
+
+#include "ConeInjection.H"
+#include "FieldActivatedInjection.H"
+#include "ManualInjection.H"
+#include "NoInjection.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makeInjectionModel(KinematicCloud<coalParcel>);
+
+    // Add instances of injection model to the table
+    makeInjectionModelType(ConeInjection, KinematicCloud, coalParcel);
+    makeInjectionModelType(FieldActivatedInjection, KinematicCloud, coalParcel);
+    makeInjectionModelType(ManualInjection, KinematicCloud, coalParcel);
+    makeInjectionModelType(NoInjection, KinematicCloud, coalParcel);
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelPhaseChangeModels.C b/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelPhaseChangeModels.C
new file mode 100644
index 0000000000..ebacd714bd
--- /dev/null
+++ b/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelPhaseChangeModels.C
@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "coalParcel.H"
+#include "ReactingCloud.H"
+
+#include "NoPhaseChange.H"
+#include "LiquidEvaporation.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makePhaseChangeModel
+    (
+        ReactingCloud<coalParcel>
+    );
+
+    // Add instances of phase change model to the table
+    makePhaseChangeModelType
+    (
+        NoPhaseChange,
+        ReactingCloud,
+        coalParcel
+    );
+    makePhaseChangeModelType
+    (
+        LiquidEvaporation,
+        ReactingCloud,
+        coalParcel
+    );
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelSurfaceReactionModels.C b/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelSurfaceReactionModels.C
new file mode 100644
index 0000000000..603cd1d25d
--- /dev/null
+++ b/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelSurfaceReactionModels.C
@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2007 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 "coalParcel.H"
+#include "ReactingMultiphaseCloud.H"
+
+#include "NoSurfaceReaction.H"
+#include "COxidationMurphyShaddix.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makeSurfaceReactionModel(ReactingMultiphaseCloud<coalParcel>);
+
+    // Add instances of surface reaction model to the table
+    makeSurfaceReactionModelType
+    (
+        NoSurfaceReaction,
+        ReactingMultiphaseCloud,
+        coalParcel
+    );
+    makeSurfaceReactionModelTypeInstance
+    (
+        COxidationMurphyShaddix,
+        ReactingMultiphaseCloud,
+        coalParcel
+    );
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelWallInteractionModels.C b/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelWallInteractionModels.C
new file mode 100644
index 0000000000..fedf097d4f
--- /dev/null
+++ b/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelWallInteractionModels.C
@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2007 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 "coalParcel.H"
+#include "ReactingCloud.H"
+
+#include "Rebound.H"
+#include "StandardWallInteraction.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makeWallInteractionModel(KinematicCloud<coalParcel>);
+
+    // Add instances of wall interaction model to the table
+    makeWallInteractionModelType
+    (
+        Rebound,
+        KinematicCloud,
+        coalParcel
+    );
+    makeWallInteractionModelType
+    (
+        StandardWallInteraction,
+        KinematicCloud,
+        coalParcel
+    );
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
new file mode 100644
index 0000000000..10deb09404
--- /dev/null
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
@@ -0,0 +1,225 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2007 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 "COxidationMurphyShaddix.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+Foam::label Foam::COxidationMurphyShaddix::maxIters_ = 1000;
+
+Foam::scalar Foam::COxidationMurphyShaddix::tolerance_ = 1e-06;
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::COxidationMurphyShaddix::COxidationMurphyShaddix
+(
+    const dictionary& dict,
+    ReactingMultiphaseCloud<coalParcel>& owner
+)
+:
+    SurfaceReactionModel<ReactingMultiphaseCloud<coalParcel> >
+    (
+        dict,
+        owner,
+        typeName
+    ),
+    coeffDict_(dict.subDict(typeName + "Coeffs")),
+    D0_(dimensionedScalar(coeffDict_.lookup("D0")).value()),
+    rho0_(dimensionedScalar(coeffDict_.lookup("rho0")).value()),
+    T0_(dimensionedScalar(coeffDict_.lookup("T0")).value()),
+    Dn_(dimensionedScalar(coeffDict_.lookup("Dn")).value()),
+    A_(dimensionedScalar(coeffDict_.lookup("A")).value()),
+    E_(dimensionedScalar(coeffDict_.lookup("E")).value()),
+    n_(dimensionedScalar(coeffDict_.lookup("n")).value()),
+    WVol_(dimensionedScalar(coeffDict_.lookup("WVol")).value()),
+    dH0_(dimensionedScalar(coeffDict_.lookup("dH0")).value()),
+    TMaxdH_(dimensionedScalar(coeffDict_.lookup("TmaxdH")).value()),
+    CsLocalId_(-1),
+    O2GlobalId_(-1),
+    CO2GlobalId_(-1)
+{
+    // Determine carrier phase Ids of reactants/products
+    label idGas = owner.composition().idGas();
+    O2GlobalId_ = owner.composition().globalId(idGas, "O2");
+    CO2GlobalId_ = owner.composition().globalId(idGas, "CO2");
+
+    // Determine Cs ids
+    label idSolid = owner.composition().idSolid();
+    CsLocalId_ = owner.composition().localId(idSolid, "Cs");
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::COxidationMurphyShaddix::~COxidationMurphyShaddix()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::COxidationMurphyShaddix::active() const
+{
+    return true;
+}
+
+
+Foam::scalar Foam::COxidationMurphyShaddix::calculate
+(
+    const scalar dt,
+    const label cellI,
+    const scalar d,
+    const scalar T,
+    const scalar Tc,
+    const scalar pc,
+    const scalar rhoc,
+    const scalar mass,
+    const scalarField& YGas,
+    const scalarField& YLiquid,
+    const scalarField& YSolid,
+    const scalarField& YMixture,
+    const scalarField& dMassVolatile,
+    scalarField& dMassGas,
+    scalarField& dMassLiquid,
+    scalarField& dMassSolid,
+    scalarField& dMassSRCarrier
+) const
+{
+    // Fraction of remaining combustible material
+    const scalar fComb = YMixture[coalParcel::SLD]*YSolid[CsLocalId_];
+
+    // Surface combustion until combustible fraction is consumed
+    if (fComb < SMALL)
+    {
+        return 0.0;
+    }
+
+    // Cell carrier phase O2 species density [kg/m^3]
+    const scalar rhoO2 =
+        owner().carrierThermo().composition().Y(O2GlobalId_)[cellI]
+       *rhoc;
+
+    if (rhoO2 < SMALL)
+    {
+        return 0.0;
+    }
+
+    // Particle surface area [m^2]
+    const scalar Ap = mathematicalConstant::pi*sqr(d);
+
+//    // Film temperature [K]
+//    const scalar Tf = (T + Tc)/2;
+
+    // Calculate diffision constant at continuous phase temperature
+    // and density [m^2/s]
+    const scalar D = D0_*(rho0_/rhoc)*pow(Tc/T0_, Dn_);
+
+    // Molecular weight of O2 [kg/kmol]
+    const scalar WO2 = owner().composition().gases()[O2GlobalId_].W();
+
+    // Molecular weight of CO2 [kg/kmol]
+    const scalar WCO2 = owner().composition().gases()[CO2GlobalId_].W();
+
+    // Molecular weight of C [kg/kmol]
+    const scalar WC = WCO2 - WO2;
+
+    // Far field partial pressure O2 [Pa]
+    const scalar PO2 = rhoO2/WO2*specie::RR*Tc;
+
+    // Molar emission rate of volatiles per unit surface area
+    const scalar qVol = sum(dMassVolatile)/(WVol_*Ap);
+
+    // Total molar concentration of the carrier phase [kmol/m^3]
+    const scalar C = pc/(specie::RR*Tc);
+
+    if (debug)
+    {
+        Pout << "   C = " << C << endl;
+    }
+
+    // Molar reaction rate per unit surface area [kmol/(m^2.s)]
+    scalar qCsOld = 0;
+    scalar qCs = 1;
+
+    if (debug)
+    {
+        Pout<< "mass  = " << mass << nl
+            << "fComb = " << fComb << nl
+            << "WC    = " << WC << nl
+            << "Ap    = " << Ap << nl
+            << "dt    = " << dt
+            << nl << endl;
+    }
+
+    const scalar qCsLim = mass*fComb/(WC*Ap*dt);
+
+    if (debug)
+    {
+        Pout << "qCsLim = " << qCsLim << endl;
+    }
+
+    label iter = 0;
+    while ((fabs(qCs - qCsOld)/qCs>tolerance_) && (iter<=maxIters_))
+    {
+        qCsOld = qCs;
+        const scalar PO2Surface = PO2*exp(-(qCs + qVol)*d/(2*C*D));
+        qCs = A_*exp(-E_/(specie::RR*T))*pow(PO2Surface, n_);
+        qCs = (100.0*qCs + iter*qCsOld)/(100.0 + iter);
+        qCs = min(qCs, qCsLim);
+
+        if (debug)
+        {
+            Pout<< "iter = " << iter
+                << ", qCsOld = " << qCsOld
+                << ", qCs = " << qCs
+                << nl << endl;
+        }
+
+        iter++;
+    }
+
+    if (iter > maxIters_)
+    {
+        WarningIn("scalar Foam::COxidationMurphyShaddix::calculate(...)")
+            << "iter limit reached (" << maxIters_ << ")" << nl << endl;
+    }
+
+    // Calculate the number of molar units reacted
+    scalar dOmega = qCs*Ap*dt;
+
+    // Add to carrier phase mass transfer
+    dMassSRCarrier[O2GlobalId_] += -dOmega*WO2;
+    dMassSRCarrier[CO2GlobalId_] += dOmega*WCO2;
+
+    // Add to particle mass transfer
+    dMassSolid[CsLocalId_] = dOmega*WC;
+
+    // Heat of reaction
+    return dOmega*dH0_*cos(mathematicalConstant::pi/2*T/TMaxdH_);
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H
new file mode 100644
index 0000000000..06bf1f404b
--- /dev/null
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H
@@ -0,0 +1,169 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2007 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
+    COxidationMurphyShaddix
+
+Description
+    Kinetics/diffusion limited rate surface reaction model for coal parcel
+    Limited to C(s) + O2 -> CO2
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef COxidationMurphyShaddix_H
+#define COxidationMurphyShaddix_H
+
+#include "SurfaceReactionModel.H"
+#include "coalParcel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+                  Class COxidationMurphyShaddix Declaration
+\*---------------------------------------------------------------------------*/
+
+class COxidationMurphyShaddix
+:
+    public SurfaceReactionModel<ReactingMultiphaseCloud<coalParcel> >
+{
+    // Private data
+
+        //- Coefficients dictionary
+        const dictionary& coeffDict_;
+
+
+        // Model constants
+
+            //- Reference diffusion constant
+            const scalar D0_;
+
+            //- Reference density for reference diffusion constant
+            const scalar rho0_;
+
+            //- Reference temperature for reference diffusion constant
+            const scalar T0_;
+
+            //- Exponent for diffusion equation
+            const scalar Dn_;
+
+            //- Kinetic rate coefficient
+            const scalar A_;
+
+            //- Kinetic rate activation energy
+            const scalar E_;
+
+            //- Reaction order
+            const scalar n_;
+
+            //- Effective molecular weight of gaseous volatiles
+            const scalar WVol_;
+
+            //- Enthalpy retained by particle during surface combustion
+            const scalar dH0_;
+
+            //- TdHMax: dH = dH0_*cos(pi/2*Tp/TMaxdH_)
+            const scalar TMaxdH_;
+
+
+        // Static constants
+
+            //- Maximum number of iterations
+            static label maxIters_;
+
+            //- Tolerance used in inner iterations
+            static scalar tolerance_;
+
+
+        // Addressing
+
+            //- Cs positions in global/local lists
+            label CsLocalId_;
+
+            //- O2 position in global list
+            label O2GlobalId_;
+
+            //- CO2 positions in global list
+            label CO2GlobalId_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("COxidationMurphyShaddix");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        COxidationMurphyShaddix
+        (
+            const dictionary& dict,
+            ReactingMultiphaseCloud<coalParcel>& owner
+        );
+
+
+    //- Destructor
+    virtual ~COxidationMurphyShaddix();
+
+
+    // Member Functions
+
+        //- Flag to indicate whether model activates surface reaction model
+        virtual bool active() const;
+
+        //- Update surface reactions
+        virtual scalar calculate
+        (
+            const scalar dt,
+            const label cellI,
+            const scalar d,
+            const scalar T,
+            const scalar Tc,
+            const scalar pc,
+            const scalar rhoc,
+            const scalar mass,
+            const scalarField& YGas,
+            const scalarField& YLiquid,
+            const scalarField& YSolid,
+            const scalarField& YMixture,
+            const scalarField& dMassVolatile,
+            scalarField& dMassGas,
+            scalarField& dMassLiquid,
+            scalarField& dMassSolid,
+            scalarField& dMassSRCarrier
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From ad67ebcf57515be2d16f84b09b5c791545eb59da Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Thu, 14 May 2009 15:30:15 +0100
Subject: [PATCH 120/175] adding general include file

---
 .../radiation/include/createRadiationModel.H                 | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 src/thermophysicalModels/radiation/include/createRadiationModel.H

diff --git a/src/thermophysicalModels/radiation/include/createRadiationModel.H b/src/thermophysicalModels/radiation/include/createRadiationModel.H
new file mode 100644
index 0000000000..babe3c4dbe
--- /dev/null
+++ b/src/thermophysicalModels/radiation/include/createRadiationModel.H
@@ -0,0 +1,5 @@
+    Info<< "Creating radiation model\n" << endl;
+    autoPtr<radiation::radiationModel> radiation
+    (
+        radiation::radiationModel::New(thermo->T())
+    );

From fb9b2219f7a7d098b816ce3852e601ee2b5f8c5d Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Thu, 14 May 2009 18:15:23 +0100
Subject: [PATCH 121/175] added wmake libso coalCombustion

---
 src/lagrangian/Allwmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lagrangian/Allwmake b/src/lagrangian/Allwmake
index fea6fce12e..92993c516f 100755
--- a/src/lagrangian/Allwmake
+++ b/src/lagrangian/Allwmake
@@ -7,6 +7,7 @@ wmake libso solidParticle
 wmake libso intermediate
 wmake libso dieselSpray
 wmake libso dsmc
+wmake libso coalCombustion
 
 molecularDynamics/Allwmake
 

From a41e845f975fbb8cc58af3f48746bc4d5c05df9a Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 15 May 2009 13:12:18 +0100
Subject: [PATCH 122/175] changed info message

---
 .../clouds/Templates/KinematicCloud/KinematicCloud.C            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index efbdea6389..f60a01f326 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -229,7 +229,7 @@ void Foam::KinematicCloud<ParcelType>::evolve()
 template<class ParcelType>
 void Foam::KinematicCloud<ParcelType>::info() const
 {
-    Info<< "Cloud name: " << this->name() << nl
+    Info<< "Cloud: " << this->name() << nl
         << "    Parcels added during this run   = "
         << returnReduce(this->injection().parcelsAddedTotal(), sumOp<label>())
             << nl

From b02f6145fdb463dc9c4f53edab4cb3bf0f4de596 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 15 May 2009 13:13:24 +0100
Subject: [PATCH 123/175] changed setting of carrier global ids for particle
 solid components

---
 .../phaseProperties/phaseProperties/phaseProperties.C      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
index c753d31d56..9ad0a61a2e 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
@@ -267,7 +267,12 @@ void Foam::phaseProperties::initialiseGlobalIds
         case SOLID:
         {
             setGlobalIds(solidNames);
-            setGlobalGasIds(YGas);
+            WarningIn
+            (
+                "phaseProperties::initialiseGlobalIds(...)"
+            )   << "Assuming no mapping between solid and carrier species"
+                << endl;
+//            setGlobalGasIds(YGas);
             break;
         }
         default:

From f27c3cff74ebbf86e3aca824c27e31fe887fd06e Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 15 May 2009 13:14:15 +0100
Subject: [PATCH 124/175] changed notImplemented(...) to warnings under debug
 mode

---
 .../CompositionModel/CompositionModel.C       | 48 ++++++++++---------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
index fb385fd0d9..79f538d1e8 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
@@ -465,17 +465,19 @@ Foam::scalar Foam::CompositionModel<CloudType>::L
     {
         case phaseProperties::GAS:
         {
-            notImplemented
-            (
-                "Foam::scalar Foam::CompositionModel<CloudType>::L"
-                "("
-                    "const label, "
-                    "const scalarField&, "
-                    "const scalar, "
-                    "const scalar"
-                ") const\n"
-                "*** No support for gaseous components"
-            );
+            if (debug)
+            {
+                WarningIn
+                (
+                    "Foam::scalar Foam::CompositionModel<CloudType>::L"
+                    "("
+                        "const label, "
+                        "const scalarField&, "
+                        "const scalar, "
+                        "const scalar"
+                    ") const\n"
+                )   << "No support for gaseous components" << endl;
+            }
             break;
         }
         case phaseProperties::LIQUID:
@@ -489,17 +491,19 @@ Foam::scalar Foam::CompositionModel<CloudType>::L
         }
         case phaseProperties::SOLID:
         {
-            notImplemented
-            (
-                "Foam::scalar Foam::CompositionModel<CloudType>::L"
-                "("
-                    "const label, "
-                    "const scalarField&, "
-                    "const scalar, "
-                    "const scalar"
-                ") const\n"
-                "*** No support for solid components"
-            );
+            if (debug)
+            {
+                WarningIn
+                (
+                    "Foam::scalar Foam::CompositionModel<CloudType>::L"
+                    "("
+                        "const label, "
+                        "const scalarField&, "
+                        "const scalar, "
+                        "const scalar"
+                    ") const\n"
+                )   << "No support for solid components" << endl;
+            }
             break;
         }
         default:

From 3f11699fcef3529b383af3fda316ac40f6c0ca81 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 15 May 2009 13:14:59 +0100
Subject: [PATCH 125/175] updates for phase change modelling

---
 .../ReactingMultiphaseParcel.C                | 20 ++++++-------
 .../Templates/ReactingParcel/ReactingParcel.C | 29 ++++++++++++-------
 .../Templates/ReactingParcel/ReactingParcel.H |  5 ++--
 3 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 3d67afa89b..385fe5ffbc 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -108,18 +108,17 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::updateMassFractions
 {
     scalarField& YMix = this->Y_;
 
-    scalar dMassGasTot = sum(dMassGas);
-    scalar dMassLiquidTot = sum(dMassLiquid);
-    scalar dMassSolidTot = sum(dMassSolid);
+    scalar massGas =
+        this->updateMassFraction(mass0*YMix[GAS], dMassGas, YGas_);
+    scalar massLiquid =
+        this->updateMassFraction(mass0*YMix[LIQ], dMassLiquid, YLiquid_);
+    scalar massSolid =
+        this->updateMassFraction(mass0*YMix[SLD], dMassSolid, YSolid_);
 
-    this->updateMassFraction(mass0*YMix[GAS], dMassGas, YGas_);
-    this->updateMassFraction(mass0*YMix[LIQ], dMassLiquid, YLiquid_);
-    this->updateMassFraction(mass0*YMix[SLD], dMassSolid, YSolid_);
+    scalar massNew = max(massGas + massLiquid + massSolid, ROOTVSMALL);
 
-    scalar massNew = mass0 - (dMassGasTot + dMassLiquidTot + dMassSolidTot);
-
-    YMix[GAS] = (mass0*YMix[GAS] - dMassGasTot)/massNew;
-    YMix[LIQ] = (mass0*YMix[LIQ] - dMassLiquidTot)/massNew;
+    YMix[GAS] = massGas/massNew;
+    YMix[LIQ] = massLiquid/massNew;
     YMix[SLD] = 1.0 - YMix[GAS] - YMix[LIQ];
 
     return massNew;
@@ -189,6 +188,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
             d0,
             T0,
             U0,
+            mass0,
             idL,
             YMix[LIQ],
             YLiquid_,
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index 1db979c6da..cb7e83c267 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -67,19 +67,25 @@ void Foam::ReactingParcel<ParcelType>::updateCellQuantities
 
 
 template<class ParcelType>
-void Foam::ReactingParcel<ParcelType>::updateMassFraction
+Foam::scalar Foam::ReactingParcel<ParcelType>::updateMassFraction
 (
     const scalar mass0,
     const scalarField& dMass,
     scalarField& Y
-)
+) const
 {
-    scalar mass1 = mass0 + sum(dMass);
+    scalar mass1 = mass0 - sum(dMass);
 
-    forAll(Y, i)
+    // only update the mass fractions if the new particle mass is finite
+    if (mass1 > ROOTVSMALL)
     {
-        Y[i] = (Y[i]*mass0 - dMass[i])/mass1;
+        forAll(Y, i)
+        {
+            Y[i] = (Y[i]*mass0 - dMass[i])/mass1;
+        }
     }
+
+    return mass1;
 }
 
 
@@ -116,13 +122,10 @@ void Foam::ReactingParcel<ParcelType>::calc
 
     // Return enthalpy source and calc mass transfer due to phase change
     scalar ShPC =
-        calcPhaseChange(td, dt, cellI, d0, T0, U0, 0, 1.0, Y_, dMassPC);
+        calcPhaseChange(td, dt, cellI, d0, T0, U0, mass0, 0, 1.0, Y_, dMassPC);
 
-    // Update particle component mass fractions
-    updateMassFraction(mass0, dMassPC, Y_);
-
-    // Update mass
-    scalar mass1 = mass0 - sum(dMassPC);
+    // Update particle component mass and mass fractions
+    scalar mass1 = updateMassFraction(mass0, dMassPC, Y_);
 
 
     // Heat transfer
@@ -218,6 +221,7 @@ Foam::scalar Foam::ReactingParcel<ParcelType>::calcPhaseChange
     const scalar d,
     const scalar T,
     const vector& U,
+    const scalar mass,
     const label idPhase,
     const scalar YPhase,
     const scalarField& YComponents,
@@ -248,6 +252,9 @@ Foam::scalar Foam::ReactingParcel<ParcelType>::calcPhaseChange
         dMassPC
     );
 
+    // Limit phase change mass by availability of each specie
+    dMassPC = min(mass*YPhase*YComponents, dMassPC);
+
     scalar dMassTot = sum(dMassPC);
 
     // Add to cumulative phase change mass
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index 429ceffea3..f7b85d22c2 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -196,6 +196,7 @@ protected:
             const scalar d,            // diameter
             const scalar T,            // temperature
             const vector& U,           // velocity
+            const scalar mass,         // mass
             const label idPhase,       // id of phase involved in phase change
             const scalar YPhase,       // total mass fraction
             const scalarField& YComponents, // component mass fractions
@@ -203,12 +204,12 @@ protected:
         );
 
         //- Update mass fraction
-        void updateMassFraction
+        scalar updateMassFraction
         (
             const scalar mass0,
             const scalarField& dMass,
             scalarField& Y
-        );
+        ) const;
 
 
 public:

From a624d515616603f0345d3e9de4f33b2f87416fa1 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Fri, 15 May 2009 14:24:42 +0100
Subject: [PATCH 126/175] Added further stabilisation for the case where ksStar
 is very large.

---
 .../nutRoughWallFunctionFvPatchScalarField.C                   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C
index 42e537295e..7b6e14493e 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C
@@ -219,7 +219,8 @@ void nutRoughWallFunctionFvPatchScalarField::updateCoeffs()
                 (
                     min
                     (
-                        nuw[faceI]*(yPlus*kappa/log(Edash*yPlus) - 1),
+                        nuw[faceI]
+                       *(yPlus*kappa/log(max(Edash*yPlus, 1+1e-4)) - 1),
                         2*limitingNutw
                     ), 0.5*limitingNutw
                 );

From 0fb2546a4386702a2b382cf37483a27f781928df Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 15 May 2009 14:39:01 +0100
Subject: [PATCH 127/175] updated for empty specie list

---
 .../phaseProperties/phasePropertiesIO.C       | 99 +++++++------------
 1 file changed, 36 insertions(+), 63 deletions(-)

diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
index 3858f69b12..18da442052 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
@@ -42,36 +42,27 @@ Foam::phaseProperties::phaseProperties(Istream& is)
 
     dictionaryEntry phaseInfo(dictionary::null, is);
 
-    if (phaseInfo.size() == 0)
-    {
-        FatalErrorIn
-        (
-            "Foam::Istream& Foam::operator>>(Istream& is, phaseProperties& pp)"
-        )   << "No phases identified. Please define each phase property as "
-            << "a dictionary entry" << nl << exit(FatalError);
-    }
-
-    label nComponents = phaseInfo.size();
-    names_.setSize(nComponents);
-    Y_.setSize(nComponents);
-
     phase_ = phaseTypeNames_[phaseInfo.keyword()];
-
     stateLabel_ = phaseToStateLabel(phase_);
 
-    label cmptI = 0;
-    forAllConstIter(IDLList<entry>, phaseInfo, iter)
+    if (phaseInfo.size() > 0)
     {
-        names_[cmptI] = iter().keyword();
-        Y_[cmptI] = readScalar(phaseInfo.lookup(names_[cmptI]));
-        cmptI++;
+        label nComponents = phaseInfo.size();
+        names_.setSize(nComponents, "unknownSpecie");
+        Y_.setSize(nComponents, 0.0);
+        globalIds_.setSize(nComponents, -1);
+        globalGasIds_.setSize(nComponents, -1);
+
+        label cmptI = 0;
+        forAllConstIter(IDLList<entry>, phaseInfo, iter)
+        {
+            names_[cmptI] = iter().keyword();
+            Y_[cmptI] = readScalar(phaseInfo.lookup(names_[cmptI]));
+            cmptI++;
+        }
+
+        checkTotalMassFraction();
     }
-
-    // initialise global ids to -1
-    globalIds_.setSize(nComponents, -1);
-    globalGasIds_.setSize(nComponents, -1);
-
-    checkTotalMassFraction();
 }
 
 
@@ -81,44 +72,34 @@ Foam::Istream& Foam::operator>>(Istream& is, phaseProperties& pp)
 {
     is.check
     (
-        "Foam::Istream& Foam::operator>>"
-        "(Foam::Istream&, Foam::phaseProperties&)"
+        "Foam::Istream& Foam::operator>>(Istream&, phaseProperties&)"
     );
 
     dictionaryEntry phaseInfo(dictionary::null, is);
 
-    if (phaseInfo.size() == 0)
-    {
-        FatalErrorIn
-        (
-            "Foam::Istream& Foam::operator>>(Istream& is, phaseProperties& pp)"
-        )   << "No phases identified. Please define each phase property as "
-            << "a dictionary entry" << nl << exit(FatalError);
-    }
-
-    label nComponents = phaseInfo.size();
-
-    pp.names_.setSize(nComponents);
-    pp.Y_.setSize(nComponents);
-
     pp.phase_ = pp.phaseTypeNames_[phaseInfo.keyword()];
-
     pp.stateLabel_ = pp.phaseToStateLabel(pp.phase_);
 
-    label cmptI = 0;
-    forAllConstIter(IDLList<entry>, phaseInfo, iter)
+    if (phaseInfo.size() > 0)
     {
-        pp.names_[cmptI] = iter().keyword();
-        pp.Y_[cmptI] = readScalar(phaseInfo.lookup(pp.names_[cmptI]));
-        cmptI++;
+        label nComponents = phaseInfo.size();
+
+        pp.names_.setSize(nComponents, "unknownSpecie");
+        pp.Y_.setSize(nComponents, 0.0);
+        pp.globalIds_.setSize(nComponents, -1);
+        pp.globalGasIds_.setSize(nComponents, -1);
+
+        label cmptI = 0;
+        forAllConstIter(IDLList<entry>, phaseInfo, iter)
+        {
+            pp.names_[cmptI] = iter().keyword();
+            pp.Y_[cmptI] = readScalar(phaseInfo.lookup(pp.names_[cmptI]));
+            cmptI++;
+        }
+
+        pp.checkTotalMassFraction();
     }
 
-    // initialise global ids to -1
-    pp.globalIds_.setSize(nComponents, -1);
-    pp.globalGasIds_.setSize(nComponents, -1);
-
-    pp.checkTotalMassFraction();
-
     return is;
 }
 
@@ -127,11 +108,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const phaseProperties& pp)
 {
     os.check
     (
-        "Foam::Ostream& Foam::operator<<"
-        "("
-            "Foam::Ostream&, "
-            "const Foam::phaseProperties&"
-        ")"
+        "Foam::Ostream& Foam::operator<<(Ostream&, const phaseProperties&)"
     );
 
     os  << pp.phaseTypeNames_[pp.phase_] << nl << token::BEGIN_BLOCK << nl
@@ -147,11 +124,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const phaseProperties& pp)
 
     os.check
     (
-        "Foam::Ostream& Foam::operator<<"
-        "("
-            "Foam::Ostream&, "
-            "const Foam::phaseProperties&"
-        ")"
+        "Foam::Ostream& Foam::operator<<(Ostream&, const phaseProperties&)"
     );
 
     return os;

From 423cc00ae70c538e36dc31eb25ad307fc9d24302 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 15 May 2009 14:50:34 +0100
Subject: [PATCH 128/175] adding const-ness

---
 .../phaseProperties/phaseProperties/phaseProperties.C           | 2 +-
 .../phaseProperties/phaseProperties/phaseProperties.H           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
index 9ad0a61a2e..1da9161508 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
@@ -171,7 +171,7 @@ void Foam::phaseProperties::checkTotalMassFraction() const
 }
 
 
-Foam::word Foam::phaseProperties::phaseToStateLabel(phaseType pt) const
+Foam::word Foam::phaseProperties::phaseToStateLabel(const phaseType pt) const
 {
     word state = "(unknown)";
     switch (pt)
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
index 7e8b305143..730d99fbb5 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
@@ -107,7 +107,7 @@ private:
         void checkTotalMassFraction() const;
 
         //- Set the state label
-        word phaseToStateLabel(phaseType pt) const;
+        word phaseToStateLabel(const phaseType pt) const;
 
 
 public:

From 34254a29b05bf1c3e669c1ef7016332d06da1e02 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 15 May 2009 16:19:46 +0100
Subject: [PATCH 129/175] assuming volatile mass does not include mass due to
 phase change

---
 .../ReactingMultiphaseParcel/ReactingMultiphaseParcel.C         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 385fe5ffbc..3b576489c7 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -239,7 +239,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
             T0,
             mass0,
             canCombust_,
-            dMassPC + dMassDV, // total mass of volatiles evolved
+            dMassDV,    // assuming d(mass) due to phase change is non-volatile
             YMix,
             YGas_,
             YLiquid_,

From 20c1a673e74f32ad426ea1d462ac7f555b1e2b56 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Mon, 18 May 2009 10:26:11 +0200
Subject: [PATCH 130/175] 'rebrand' OSspecific Unix -> POSIX

- change name of environment variable from $WM_OS -> $WM_OSTYPE
  as a better description
---
 README                                        |  9 ++++----
 applications/test/POSIX/Make/files            |  2 ++
 .../test/{Unix => POSIX}/Make/options         |  0
 .../{Unix/UnixTest.C => POSIX/POSIXTest.C}    |  0
 applications/test/Unix/Make/files             |  2 --
 etc/bashrc                                    |  4 ++--
 etc/controlDict                               |  2 +-
 etc/cshrc                                     |  4 ++--
 src/Allwmake                                  |  4 ++--
 src/OSspecific/{Unix => POSIX}/Make/files     |  8 +++----
 src/OSspecific/{Unix => POSIX}/Make/options   |  0
 src/OSspecific/{Unix/Unix.C => POSIX/POSIX.C} | 22 +++++++++----------
 src/OSspecific/{Unix/Unix.H => POSIX/POSIX.H} | 14 ++++++------
 .../{Unix => POSIX}/clockTime/clockTime.C     |  0
 .../{Unix => POSIX}/clockTime/clockTime.H     |  0
 .../{Unix => POSIX}/cpuTime/cpuTime.C         |  0
 .../{Unix => POSIX}/cpuTime/cpuTime.H         |  0
 .../{Unix => POSIX}/dummyPrintStack.C         |  0
 src/OSspecific/{Unix => POSIX}/fileStat.C     |  0
 src/OSspecific/{Unix => POSIX}/fileStat.H     |  0
 src/OSspecific/{Unix => POSIX}/printStack.C   |  0
 src/OSspecific/{Unix => POSIX}/regExp.C       |  0
 src/OSspecific/{Unix => POSIX}/regExp.H       |  0
 .../{Unix => POSIX}/signals/sigFpe.C          |  0
 .../{Unix => POSIX}/signals/sigFpe.H          |  0
 .../{Unix => POSIX}/signals/sigInt.C          |  0
 .../{Unix => POSIX}/signals/sigInt.H          |  0
 .../{Unix => POSIX}/signals/sigQuit.C         |  0
 .../{Unix => POSIX}/signals/sigQuit.H         |  0
 .../{Unix => POSIX}/signals/sigSegv.C         |  0
 .../{Unix => POSIX}/signals/sigSegv.H         |  0
 src/OSspecific/{Unix => POSIX}/timer.C        |  0
 src/OSspecific/{Unix => POSIX}/timer.H        |  0
 src/OpenFOAM/include/OSspecific.H             |  6 ++---
 wmake/Makefile                                |  2 +-
 35 files changed, 39 insertions(+), 40 deletions(-)
 create mode 100644 applications/test/POSIX/Make/files
 rename applications/test/{Unix => POSIX}/Make/options (100%)
 rename applications/test/{Unix/UnixTest.C => POSIX/POSIXTest.C} (100%)
 delete mode 100644 applications/test/Unix/Make/files
 rename src/OSspecific/{Unix => POSIX}/Make/files (90%)
 rename src/OSspecific/{Unix => POSIX}/Make/options (100%)
 rename src/OSspecific/{Unix/Unix.C => POSIX/POSIX.C} (98%)
 rename src/OSspecific/{Unix/Unix.H => POSIX/POSIX.H} (92%)
 rename src/OSspecific/{Unix => POSIX}/clockTime/clockTime.C (100%)
 rename src/OSspecific/{Unix => POSIX}/clockTime/clockTime.H (100%)
 rename src/OSspecific/{Unix => POSIX}/cpuTime/cpuTime.C (100%)
 rename src/OSspecific/{Unix => POSIX}/cpuTime/cpuTime.H (100%)
 rename src/OSspecific/{Unix => POSIX}/dummyPrintStack.C (100%)
 rename src/OSspecific/{Unix => POSIX}/fileStat.C (100%)
 rename src/OSspecific/{Unix => POSIX}/fileStat.H (100%)
 rename src/OSspecific/{Unix => POSIX}/printStack.C (100%)
 rename src/OSspecific/{Unix => POSIX}/regExp.C (100%)
 rename src/OSspecific/{Unix => POSIX}/regExp.H (100%)
 rename src/OSspecific/{Unix => POSIX}/signals/sigFpe.C (100%)
 rename src/OSspecific/{Unix => POSIX}/signals/sigFpe.H (100%)
 rename src/OSspecific/{Unix => POSIX}/signals/sigInt.C (100%)
 rename src/OSspecific/{Unix => POSIX}/signals/sigInt.H (100%)
 rename src/OSspecific/{Unix => POSIX}/signals/sigQuit.C (100%)
 rename src/OSspecific/{Unix => POSIX}/signals/sigQuit.H (100%)
 rename src/OSspecific/{Unix => POSIX}/signals/sigSegv.C (100%)
 rename src/OSspecific/{Unix => POSIX}/signals/sigSegv.H (100%)
 rename src/OSspecific/{Unix => POSIX}/timer.C (100%)
 rename src/OSspecific/{Unix => POSIX}/timer.H (100%)

diff --git a/README b/README
index 093280c6fb..bcce7c5da9 100644
--- a/README
+++ b/README
@@ -14,11 +14,10 @@
   General Public License terms under which you can copy the files.
 
 * System requirements
-  OpenFOAM is developed and tested on Linux, but should work with other Unix
-  style systems.  To check your system setup, execute the foamSystemCheck script
-  in the bin/ directory of the OpenFOAM installation. If no problems are
-  reported, proceed to "3. Installation"; otherwise contact your system
-  administrator.
+  OpenFOAM is developed and tested on Linux, but should work with other POSIX
+  systems.  To check your system setup, execute the foamSystemCheck script in
+  the bin/ directory of the OpenFOAM installation. If no problems are reported,
+  proceed to "3. Installation"; otherwise contact your system administrator.
 
   If the user wishes to run OpenFOAM in 32/64-bit mode they should consult the
   section "Running OpenFOAM in 32-bit mode".
diff --git a/applications/test/POSIX/Make/files b/applications/test/POSIX/Make/files
new file mode 100644
index 0000000000..f2f2540e6a
--- /dev/null
+++ b/applications/test/POSIX/Make/files
@@ -0,0 +1,2 @@
+POSIXTest.C
+EXE = $(FOAM_USER_APPBIN)/POSIXTest
diff --git a/applications/test/Unix/Make/options b/applications/test/POSIX/Make/options
similarity index 100%
rename from applications/test/Unix/Make/options
rename to applications/test/POSIX/Make/options
diff --git a/applications/test/Unix/UnixTest.C b/applications/test/POSIX/POSIXTest.C
similarity index 100%
rename from applications/test/Unix/UnixTest.C
rename to applications/test/POSIX/POSIXTest.C
diff --git a/applications/test/Unix/Make/files b/applications/test/Unix/Make/files
deleted file mode 100644
index 6554bfcbb0..0000000000
--- a/applications/test/Unix/Make/files
+++ /dev/null
@@ -1,2 +0,0 @@
-UnixTest.C
-EXE = $(FOAM_USER_APPBIN)/UnixTest
diff --git a/etc/bashrc b/etc/bashrc
index 26dc8c2dfc..93f2658e45 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -79,8 +79,8 @@ export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty
 
 # Operating System/Platform
 # ~~~~~~~~~~~~~~~~~~~~~~~~~
-# WM_OS = Unix | ????
-: ${WM_OS:=Unix}; export WM_OS
+# WM_OSTYPE = POSIX | ????
+: ${WM_OSTYPE:=POSIX}; export WM_OSTYPE
 
 
 # Compiler: set to Gcc, Gcc43 or Icc (for Intel's icc)
diff --git a/etc/controlDict b/etc/controlDict
index 65058af1a6..c5f3831a30 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -195,6 +195,7 @@ DebugSwitches
     PatchToPatchInterpolation 0;
     Phi                 0;
     PointEdgeWave       0;
+    POSIX               0;
     Prandtl             0;
     PrimitivePatch      0;
     Pstream             0;
@@ -249,7 +250,6 @@ DebugSwitches
     ThermoParcel<basicThermoParcel>     0;
     UMIST               0;
     UMISTV              0;
-    Unix                0;
     UpwindFitData<cubicUpwindFitPolynomial> 0;
     UpwindFitData<quadraticLinearUpwindFitPolynomial> 0;
     UpwindFitData<quadraticUpwindFitPolynomial>     0;
diff --git a/etc/cshrc b/etc/cshrc
index f4147422f9..77c432d5dc 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -73,8 +73,8 @@ setenv WM_THIRD_PARTY_DIR $WM_PROJECT_INST_DIR/ThirdParty
 
 # Operating System/Platform
 # ~~~~~~~~~~~~~~~~~~~~~~~~~
-# WM_OS = Unix | ????
-if ( ! $?WM_OS ) setenv WM_OS Unix
+# WM_OSTYPE = POSIX | ????
+if ( ! $?WM_OSTYPE ) setenv WM_OSTYPE POSIX
 
 
 # Compiler: set to Gcc, Gcc43 or Icc (for Intel's icc)
diff --git a/src/Allwmake b/src/Allwmake
index 3168208c49..e374ba62e8 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -6,10 +6,10 @@ set -x
 wmakePrintBuild -check || /bin/rm -f OpenFOAM/Make/$WM_OPTIONS/global.? 2>/dev/null
 
 wmakeLnInclude -f OpenFOAM
-wmakeLnInclude -f OSspecific/$WM_OS
+wmakeLnInclude -f OSspecific/$WM_OSTYPE
 Pstream/Allwmake
 
-wmake libo  OSspecific/$WM_OS
+wmake libo  OSspecific/$WM_OSTYPE
 wmake libso OpenFOAM
 
 wmake libso lagrangian/basic
diff --git a/src/OSspecific/Unix/Make/files b/src/OSspecific/POSIX/Make/files
similarity index 90%
rename from src/OSspecific/Unix/Make/files
rename to src/OSspecific/POSIX/Make/files
index b6e32d80d6..f6e7c2d55e 100644
--- a/src/OSspecific/Unix/Make/files
+++ b/src/OSspecific/POSIX/Make/files
@@ -5,14 +5,14 @@ signals/sigQuit.C
 regExp.C
 timer.C
 fileStat.C
-Unix.C
+POSIX.C
 cpuTime/cpuTime.C
 clockTime/clockTime.C
 
-#ifndef SunOS64
-printStack.C
-#else
+#ifdef SunOS64
 dummyPrintStack.C
+#else
+printStack.C
 #endif
 
 LIB = $(FOAM_LIBBIN)/libOSspecific
diff --git a/src/OSspecific/Unix/Make/options b/src/OSspecific/POSIX/Make/options
similarity index 100%
rename from src/OSspecific/Unix/Make/options
rename to src/OSspecific/POSIX/Make/options
diff --git a/src/OSspecific/Unix/Unix.C b/src/OSspecific/POSIX/POSIX.C
similarity index 98%
rename from src/OSspecific/Unix/Unix.C
rename to src/OSspecific/POSIX/POSIX.C
index 9378a21c7c..537cc15caa 100644
--- a/src/OSspecific/Unix/Unix.C
+++ b/src/OSspecific/POSIX/POSIX.C
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Description
-    UNIX versions of the functions declared in OSspecific.H
+    POSIX versions of the functions declared in OSspecific.H
 
 \*---------------------------------------------------------------------------*/
 
@@ -32,7 +32,7 @@ Description
 #endif
 
 #include "OSspecific.H"
-#include "Unix.H"
+#include "POSIX.H"
 #include "foamVersion.H"
 #include "fileName.H"
 #include "fileStat.H"
@@ -56,7 +56,7 @@ Description
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(Foam::Unix, 0);
+defineTypeNameAndDebug(Foam::POSIX, 0);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -536,7 +536,7 @@ Foam::fileNameList Foam::readDir
     // also used as increment if initial size found to be insufficient
     static const int maxNnames = 100;
 
-    if (Unix::debug)
+    if (POSIX::debug)
     {
         Info<< "readDir(const fileName&, const fileType, const bool filtergz)"
             << " : reading directory " << directory << endl;
@@ -557,7 +557,7 @@ Foam::fileNameList Foam::readDir
     {
         dirEntries.setSize(0);
 
-        if (Unix::debug)
+        if (POSIX::debug)
         {
             Info<< "readDir(const fileName&, const fileType, "
                    "const bool filtergz) : cannot open directory "
@@ -690,7 +690,7 @@ bool Foam::cp(const fileName& src, const fileName& dest)
         fileNameList contents = readDir(src, fileName::FILE, false);
         forAll(contents, i)
         {
-            if (Unix::debug)
+            if (POSIX::debug)
             {
                 Info<< "Copying : " << src/contents[i]
                     << " to " << destFile/contents[i] << endl;
@@ -704,7 +704,7 @@ bool Foam::cp(const fileName& src, const fileName& dest)
         fileNameList subdirs = readDir(src, fileName::DIRECTORY);
         forAll(subdirs, i)
         {
-            if (Unix::debug)
+            if (POSIX::debug)
             {
                 Info<< "Copying : " << src/subdirs[i]
                     << " to " << destFile << endl;
@@ -722,7 +722,7 @@ bool Foam::cp(const fileName& src, const fileName& dest)
 // Create a softlink. dst should not exist. Returns true if successful.
 bool Foam::ln(const fileName& src, const fileName& dst)
 {
-    if (Unix::debug)
+    if (POSIX::debug)
     {
         Info<< "Create softlink from : " << src << " to " << dst
             << endl;
@@ -759,7 +759,7 @@ bool Foam::ln(const fileName& src, const fileName& dst)
 // Rename srcFile dstFile
 bool Foam::mv(const fileName& srcFile, const fileName& dstFile)
 {
-    if (Unix::debug)
+    if (POSIX::debug)
     {
         Info<< "Move : " << srcFile << " to " << dstFile << endl;
     }
@@ -784,7 +784,7 @@ bool Foam::mv(const fileName& srcFile, const fileName& dstFile)
 // Remove a file returning true if successful otherwise false
 bool Foam::rm(const fileName& file)
 {
-    if (Unix::debug)
+    if (POSIX::debug)
     {
         Info<< "Removing : " << file << endl;
     }
@@ -804,7 +804,7 @@ bool Foam::rm(const fileName& file)
 // Remove a dirctory and its contents
 bool Foam::rmDir(const fileName& directory)
 {
-    if (Unix::debug)
+    if (POSIX::debug)
     {
         Info<< "rmDir(const fileName&) : "
             << "removing directory " << directory << endl;
diff --git a/src/OSspecific/Unix/Unix.H b/src/OSspecific/POSIX/POSIX.H
similarity index 92%
rename from src/OSspecific/Unix/Unix.H
rename to src/OSspecific/POSIX/POSIX.H
index 97e5d21de2..fde323b5ff 100644
--- a/src/OSspecific/Unix/Unix.H
+++ b/src/OSspecific/POSIX/POSIX.H
@@ -23,18 +23,18 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Namespace
-    Foam::Unix
+    Foam::POSIX
 
 Description
-    UNIX versions of OS-specific functions.
+    OS-specific functions implemented in POSIX.
 
 SourceFiles
-    Unix.C
+    POSIX.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Unix_H
-#define Unix_H
+#ifndef POSIX_H
+#define POSIX_H
 
 #include "className.H"
 
@@ -45,10 +45,10 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Unix
+namespace POSIX
 {
     //- Declare name of the class and its debug switch
-    NamespaceName("Unix");
+    NamespaceName("POSIX");
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OSspecific/Unix/clockTime/clockTime.C b/src/OSspecific/POSIX/clockTime/clockTime.C
similarity index 100%
rename from src/OSspecific/Unix/clockTime/clockTime.C
rename to src/OSspecific/POSIX/clockTime/clockTime.C
diff --git a/src/OSspecific/Unix/clockTime/clockTime.H b/src/OSspecific/POSIX/clockTime/clockTime.H
similarity index 100%
rename from src/OSspecific/Unix/clockTime/clockTime.H
rename to src/OSspecific/POSIX/clockTime/clockTime.H
diff --git a/src/OSspecific/Unix/cpuTime/cpuTime.C b/src/OSspecific/POSIX/cpuTime/cpuTime.C
similarity index 100%
rename from src/OSspecific/Unix/cpuTime/cpuTime.C
rename to src/OSspecific/POSIX/cpuTime/cpuTime.C
diff --git a/src/OSspecific/Unix/cpuTime/cpuTime.H b/src/OSspecific/POSIX/cpuTime/cpuTime.H
similarity index 100%
rename from src/OSspecific/Unix/cpuTime/cpuTime.H
rename to src/OSspecific/POSIX/cpuTime/cpuTime.H
diff --git a/src/OSspecific/Unix/dummyPrintStack.C b/src/OSspecific/POSIX/dummyPrintStack.C
similarity index 100%
rename from src/OSspecific/Unix/dummyPrintStack.C
rename to src/OSspecific/POSIX/dummyPrintStack.C
diff --git a/src/OSspecific/Unix/fileStat.C b/src/OSspecific/POSIX/fileStat.C
similarity index 100%
rename from src/OSspecific/Unix/fileStat.C
rename to src/OSspecific/POSIX/fileStat.C
diff --git a/src/OSspecific/Unix/fileStat.H b/src/OSspecific/POSIX/fileStat.H
similarity index 100%
rename from src/OSspecific/Unix/fileStat.H
rename to src/OSspecific/POSIX/fileStat.H
diff --git a/src/OSspecific/Unix/printStack.C b/src/OSspecific/POSIX/printStack.C
similarity index 100%
rename from src/OSspecific/Unix/printStack.C
rename to src/OSspecific/POSIX/printStack.C
diff --git a/src/OSspecific/Unix/regExp.C b/src/OSspecific/POSIX/regExp.C
similarity index 100%
rename from src/OSspecific/Unix/regExp.C
rename to src/OSspecific/POSIX/regExp.C
diff --git a/src/OSspecific/Unix/regExp.H b/src/OSspecific/POSIX/regExp.H
similarity index 100%
rename from src/OSspecific/Unix/regExp.H
rename to src/OSspecific/POSIX/regExp.H
diff --git a/src/OSspecific/Unix/signals/sigFpe.C b/src/OSspecific/POSIX/signals/sigFpe.C
similarity index 100%
rename from src/OSspecific/Unix/signals/sigFpe.C
rename to src/OSspecific/POSIX/signals/sigFpe.C
diff --git a/src/OSspecific/Unix/signals/sigFpe.H b/src/OSspecific/POSIX/signals/sigFpe.H
similarity index 100%
rename from src/OSspecific/Unix/signals/sigFpe.H
rename to src/OSspecific/POSIX/signals/sigFpe.H
diff --git a/src/OSspecific/Unix/signals/sigInt.C b/src/OSspecific/POSIX/signals/sigInt.C
similarity index 100%
rename from src/OSspecific/Unix/signals/sigInt.C
rename to src/OSspecific/POSIX/signals/sigInt.C
diff --git a/src/OSspecific/Unix/signals/sigInt.H b/src/OSspecific/POSIX/signals/sigInt.H
similarity index 100%
rename from src/OSspecific/Unix/signals/sigInt.H
rename to src/OSspecific/POSIX/signals/sigInt.H
diff --git a/src/OSspecific/Unix/signals/sigQuit.C b/src/OSspecific/POSIX/signals/sigQuit.C
similarity index 100%
rename from src/OSspecific/Unix/signals/sigQuit.C
rename to src/OSspecific/POSIX/signals/sigQuit.C
diff --git a/src/OSspecific/Unix/signals/sigQuit.H b/src/OSspecific/POSIX/signals/sigQuit.H
similarity index 100%
rename from src/OSspecific/Unix/signals/sigQuit.H
rename to src/OSspecific/POSIX/signals/sigQuit.H
diff --git a/src/OSspecific/Unix/signals/sigSegv.C b/src/OSspecific/POSIX/signals/sigSegv.C
similarity index 100%
rename from src/OSspecific/Unix/signals/sigSegv.C
rename to src/OSspecific/POSIX/signals/sigSegv.C
diff --git a/src/OSspecific/Unix/signals/sigSegv.H b/src/OSspecific/POSIX/signals/sigSegv.H
similarity index 100%
rename from src/OSspecific/Unix/signals/sigSegv.H
rename to src/OSspecific/POSIX/signals/sigSegv.H
diff --git a/src/OSspecific/Unix/timer.C b/src/OSspecific/POSIX/timer.C
similarity index 100%
rename from src/OSspecific/Unix/timer.C
rename to src/OSspecific/POSIX/timer.C
diff --git a/src/OSspecific/Unix/timer.H b/src/OSspecific/POSIX/timer.H
similarity index 100%
rename from src/OSspecific/Unix/timer.H
rename to src/OSspecific/POSIX/timer.H
diff --git a/src/OpenFOAM/include/OSspecific.H b/src/OpenFOAM/include/OSspecific.H
index e4227879a6..d04243c23d 100644
--- a/src/OpenFOAM/include/OSspecific.H
+++ b/src/OpenFOAM/include/OSspecific.H
@@ -26,11 +26,11 @@ InNamespace
     Foam
 
 Description
-    Functions used by OpenFOAM that are specific to the UNIX operating system
-    and need to be replaced or emulated on other systems.
+    Functions used by OpenFOAM that are specific to POSIX compliant
+    operating systems and need to be replaced or emulated on other systems.
 
 SourceFiles
-    Unix.C
+    POSIX.C
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/wmake/Makefile b/wmake/Makefile
index 02c573a265..78b442e43d 100644
--- a/wmake/Makefile
+++ b/wmake/Makefile
@@ -63,7 +63,7 @@ CLASSES_DIR        = $(MAKE_DIR)/classes
 SYS_INC            =
 SYS_LIBS           =
 
-PROJECT_INC        = -I$(LIB_SRC)/$(WM_PROJECT)/lnInclude -I$(LIB_SRC)/OSspecific/$(WM_OS)/lnInclude
+PROJECT_INC        = -I$(LIB_SRC)/$(WM_PROJECT)/lnInclude -I$(LIB_SRC)/OSspecific/$(WM_OSTYPE)/lnInclude
 PROJECT_LIBS       = -l$(WM_PROJECT)
 ##
 ## unused:

From 06517656e8787c9a7a855bf3a36d696ab51d0320 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Mon, 18 May 2009 10:27:32 +0200
Subject: [PATCH 131/175] Foam::findEtcFile - avoid false positives on
 directories

- use isFile() instead of exists() for file-checking
---
 src/OSspecific/POSIX/POSIX.C | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/OSspecific/POSIX/POSIX.C b/src/OSspecific/POSIX/POSIX.C
index 537cc15caa..09b3182b52 100644
--- a/src/OSspecific/POSIX/POSIX.C
+++ b/src/OSspecific/POSIX/POSIX.C
@@ -222,14 +222,14 @@ Foam::fileName Foam::findEtcFile(const fileName& name, bool mandatory)
     {
         // Check for user file in ~/.OpenFOAM/VERSION
         fileName fullName = searchDir/FOAMversion/name;
-        if (exists(fullName))
+        if (isFile(fullName))
         {
             return fullName;
         }
 
         // Check for version-independent user file in ~/.OpenFOAM
         fullName = searchDir/name;
-        if (exists(fullName))
+        if (isFile(fullName))
         {
             return fullName;
         }
@@ -243,14 +243,14 @@ Foam::fileName Foam::findEtcFile(const fileName& name, bool mandatory)
     {
         // Check for site file in $WM_PROJECT_INST_DIR/site/VERSION
         fileName fullName = searchDir/"site"/FOAMversion/name;
-        if (exists(fullName))
+        if (isFile(fullName))
         {
             return fullName;
         }
 
         // Check for version-independent site file in $WM_PROJECT_INST_DIR/site
         fullName = searchDir/"site"/name;
-        if (exists(fullName))
+        if (isFile(fullName))
         {
             return fullName;
         }
@@ -263,7 +263,7 @@ Foam::fileName Foam::findEtcFile(const fileName& name, bool mandatory)
     {
         // Check for shipped OpenFOAM file in $WM_PROJECT_DIR/etc
         fileName fullName = searchDir/"etc"/name;
-        if (exists(fullName))
+        if (isFile(fullName))
         {
             return fullName;
         }

From c2d39f14357d7b8ef5324b2abe4cb412c8baf6d9 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 18 May 2009 09:38:31 +0100
Subject: [PATCH 132/175] adding new coal-based surface reaction moodels

---
 .../COxidationDiffusionLimitedRate.C          | 155 ++++++++++++++++
 .../COxidationDiffusionLimitedRate.H          | 147 +++++++++++++++
 .../COxidationKineticDiffusionLimitedRate.C   | 167 ++++++++++++++++++
 .../COxidationKineticDiffusionLimitedRate.H   | 154 ++++++++++++++++
 4 files changed, 623 insertions(+)
 create mode 100644 src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
 create mode 100644 src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H
 create mode 100644 src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
 create mode 100644 src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H

diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
new file mode 100644
index 0000000000..e36fd1cbfd
--- /dev/null
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
@@ -0,0 +1,155 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2007 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 "COxidationDiffusionLimitedRate.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::COxidationDiffusionLimitedRate::COxidationDiffusionLimitedRate
+(
+    const dictionary& dict,
+    ReactingMultiphaseCloud<coalParcel>& owner
+)
+:
+    SurfaceReactionModel<ReactingMultiphaseCloud<coalParcel> >
+    (
+        dict,
+        owner,
+        typeName
+    ),
+    Sb_(dimensionedScalar(this->coeffDict().lookup("Sb")).value()),
+    D_(dimensionedScalar(this->coeffDict().lookup("D")).value()),
+    CsLocalId_(-1),
+    O2GlobalId_(-1),
+    CO2GlobalId_(-1),
+    WC_(0.0),
+    WO2_(0.0),
+    HcCO2_(0.0)
+{
+    // Determine carrier phase Ids of reactants/products
+    label idGas = owner.composition().idGas();
+    O2GlobalId_ = owner.composition().globalId(idGas, "O2");
+    CO2GlobalId_ = owner.composition().globalId(idGas, "CO2");
+
+    // Determine Cs ids
+    label idSolid = owner.composition().idSolid();
+    CsLocalId_ = owner.composition().localId(idSolid, "C");
+
+    // Set local copies of thermo properties
+    WO2_ = owner().composition().gases()[O2GlobalId_].W();
+    scalar WCO2 = owner().composition().gases()[CO2GlobalId_].W();
+    WC_ = WCO2 - WO2_;
+    HcCO2_ = owner().composition().gases()[CO2GlobalId_].Hc();
+
+    if (Sb_ < 0)
+    {
+        FatalErrorIn
+        (
+            "COxidationDiffusionLimitedRate"
+            "("
+                "const dictionary&, "
+                "ReactingMultiphaseCloud<coalParcel>&"
+            ")"
+        )   << "Stoichiometry, Sb, must be greater than zero" << nl
+            << exit(FatalError);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::COxidationDiffusionLimitedRate::~COxidationDiffusionLimitedRate()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::COxidationDiffusionLimitedRate::active() const
+{
+    return true;
+}
+
+
+Foam::scalar Foam::COxidationDiffusionLimitedRate::calculate
+(
+    const scalar dt,
+    const label cellI,
+    const scalar d,
+    const scalar T,
+    const scalar Tc,
+    const scalar pc,
+    const scalar rhoc,
+    const scalar mass,
+    const scalarField& YGas,
+    const scalarField& YLiquid,
+    const scalarField& YSolid,
+    const scalarField& YMixture,
+    const scalarField& dMassVolatile,
+    scalarField& dMassGas,
+    scalarField& dMassLiquid,
+    scalarField& dMassSolid,
+    scalarField& dMassSRCarrier
+) const
+{
+    // Fraction of remaining combustible material
+    const scalar fComb = YMixture[coalParcel::SLD]*YSolid[CsLocalId_];
+
+    // Surface combustion active combustible fraction is consumed
+    if (fComb < SMALL)
+    {
+        return 0.0;
+    }
+
+    // Local mass fraction of O2 in the carrier phase
+    const scalar YO2 =
+        owner().carrierThermo().composition().Y(O2GlobalId_)[cellI];
+
+    // Change in C mass [kg]
+    scalar dmC =
+        4.0*mathematicalConstant::pi*d*D_*YO2*Tc*rhoc/(Sb_*(T + Tc))*dt;
+
+    // Limit mass transfer by availability of C
+    dmC = min(mass*fComb, dmC);
+
+    // Change in O2 mass [kg]
+    const scalar dmO2 = dmC/WC_*Sb_*WO2_;
+
+    // Mass of newly created CO2 [kg]
+    const scalar dmCO2 = dmC + dmO2; 
+
+    // Update local particle C mass
+    dMassSolid[CsLocalId_] += dmC;
+
+    // Update carrier O2 and CO2 mass
+    dMassSRCarrier[O2GlobalId_] -= dmO2;
+    dMassSRCarrier[CO2GlobalId_] += dmCO2;
+
+    // Heat of reaction [J]
+    return HcCO2_*dmCO2;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H
new file mode 100644
index 0000000000..3ce6b7cbad
--- /dev/null
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H
@@ -0,0 +1,147 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2007 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
+    COxidationDiffusionLimitedRate
+
+Description
+    Diffusion limited rate surface reaction model for coal parcels. Limited to:
+
+        C(s) + Sb*O2 -> CO2
+
+    where Sb is the stoichiometry of the reaction
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef COxidationDiffusionLimitedRate_H
+#define COxidationDiffusionLimitedRate_H
+
+#include "SurfaceReactionModel.H"
+#include "coalParcel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+                  Class COxidationDiffusionLimitedRate Declaration
+\*---------------------------------------------------------------------------*/
+
+class COxidationDiffusionLimitedRate
+:
+    public SurfaceReactionModel<ReactingMultiphaseCloud<coalParcel> >
+{
+    // Private data
+
+        // Model constants
+
+            //- Stoichiometry of reaction
+            const scalar Sb_;
+
+            //- Diffusion coefficient of oxidants [m2/s]
+            const scalar D_;
+
+
+        // Local copies of thermo properties
+
+            //- Molecular weight of C [kg/kmol]
+            scalar WC_;
+
+            //- Molecular weight of O2 [kg/kmol]
+            scalar WO2_;
+
+            //- Chemical enthalpy of CO2 [J/kg]
+            scalar HcCO2_;
+
+
+        // Addressing
+
+            //- Cs positions in global/local lists
+            label CsLocalId_;
+
+            //- O2 position in global list
+            label O2GlobalId_;
+
+            //- CO2 positions in global list
+            label CO2GlobalId_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("COxidationDiffusionLimitedRate");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        COxidationDiffusionLimitedRate
+        (
+            const dictionary& dict,
+            ReactingMultiphaseCloud<coalParcel>& owner
+        );
+
+
+    //- Destructor
+    virtual ~COxidationDiffusionLimitedRate();
+
+
+    // Member Functions
+
+        //- Flag to indicate whether model activates surface reaction model
+        virtual bool active() const;
+
+        //- Update surface reactions
+        virtual scalar calculate
+        (
+            const scalar dt,
+            const label cellI,
+            const scalar d,
+            const scalar T,
+            const scalar Tc,
+            const scalar pc,
+            const scalar rhoc,
+            const scalar mass,
+            const scalarField& YGas,
+            const scalarField& YLiquid,
+            const scalarField& YSolid,
+            const scalarField& YMixture,
+            const scalarField& dMassVolatile,
+            scalarField& dMassGas,
+            scalarField& dMassLiquid,
+            scalarField& dMassSolid,
+            scalarField& dMassSRCarrier
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
new file mode 100644
index 0000000000..a58094f29e
--- /dev/null
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
@@ -0,0 +1,167 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2007 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 "COxidationKineticDiffusionLimitedRate.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::COxidationKineticDiffusionLimitedRate::
+COxidationKineticDiffusionLimitedRate
+(
+    const dictionary& dict,
+    ReactingMultiphaseCloud<coalParcel>& owner
+)
+:
+    SurfaceReactionModel<ReactingMultiphaseCloud<coalParcel> >
+    (
+        dict,
+        owner,
+        typeName
+    ),
+    Sb_(dimensionedScalar(this->coeffDict().lookup("Sb")).value()),
+    C1_(dimensionedScalar(this->coeffDict().lookup("C1")).value()),
+    C2_(dimensionedScalar(this->coeffDict().lookup("C2")).value()),
+    E_(dimensionedScalar(this->coeffDict().lookup("E")).value()),
+    CsLocalId_(-1),
+    O2GlobalId_(-1),
+    CO2GlobalId_(-1),
+    WC_(0.0),
+    WO2_(0.0),
+    HcCO2_(0.0)
+{
+    // Determine carrier phase Ids of reactants/products
+    label idGas = owner.composition().idGas();
+    O2GlobalId_ = owner.composition().globalId(idGas, "O2");
+    CO2GlobalId_ = owner.composition().globalId(idGas, "CO2");
+
+    // Determine Cs ids
+    label idSolid = owner.composition().idSolid();
+    CsLocalId_ = owner.composition().localId(idSolid, "C");
+
+    // Set local copies of thermo properties
+    WO2_ = owner().composition().gases()[O2GlobalId_].W();
+    scalar WCO2 = owner().composition().gases()[CO2GlobalId_].W();
+    WC_ = WCO2 - WO2_;
+    HcCO2_ = owner().composition().gases()[CO2GlobalId_].Hc();
+
+    if (Sb_ < 0)
+    {
+        FatalErrorIn
+        (
+            "COxidationKineticDiffusionLimitedRate"
+            "("
+                "const dictionary&, "
+                "ReactingMultiphaseCloud<coalParcel>&"
+            ")"
+        )   << "Stoichiometry, Sb, must be greater than zero" << nl
+            << exit(FatalError);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::COxidationKineticDiffusionLimitedRate::
+~COxidationKineticDiffusionLimitedRate()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::COxidationKineticDiffusionLimitedRate::active() const
+{
+    return true;
+}
+
+
+Foam::scalar Foam::COxidationKineticDiffusionLimitedRate::calculate
+(
+    const scalar dt,
+    const label cellI,
+    const scalar d,
+    const scalar T,
+    const scalar Tc,
+    const scalar pc,
+    const scalar rhoc,
+    const scalar mass,
+    const scalarField& YGas,
+    const scalarField& YLiquid,
+    const scalarField& YSolid,
+    const scalarField& YMixture,
+    const scalarField& dMassVolatile,
+    scalarField& dMassGas,
+    scalarField& dMassLiquid,
+    scalarField& dMassSolid,
+    scalarField& dMassSRCarrier
+) const
+{
+    // Fraction of remaining combustible material
+    const scalar fComb = YMixture[coalParcel::SLD]*YSolid[CsLocalId_];
+
+    // Surface combustion active combustible fraction is consumed
+    if (fComb < SMALL)
+    {
+        return 0.0;
+    }
+
+    // Local mass fraction of O2 in the carrier phase
+    const scalar YO2 =
+        owner().carrierThermo().composition().Y(O2GlobalId_)[cellI];
+
+    // Diffusion rate coefficient
+    const scalar D0 = C1_/d*pow(0.5*(T + Tc), 0.75);
+
+    // Kinetic rate
+    const scalar Rk = C2_*exp(-E_/(specie::RR*Tc));
+
+    // Particle surface area
+    const scalar Ap = mathematicalConstant::pi*sqr(d);
+
+    // Change in C mass [kg]
+    scalar dmC = Ap*rhoc*specie::RR*Tc*YO2/WO2_*D0*Rk/(D0 + Rk);
+
+    // Limit mass transfer by availability of C
+    dmC = min(mass*fComb, dmC);
+
+    // Change in O2 mass [kg]
+    const scalar dmO2 = dmC/WC_*Sb_*WO2_;
+
+    // Mass of newly created CO2 [kg]
+    const scalar dmCO2 = dmC + dmO2; 
+
+    // Update local particle C mass
+    dMassSolid[CsLocalId_] += dmC;
+
+    // Update carrier O2 and CO2 mass
+    dMassSRCarrier[O2GlobalId_] -= dmO2;
+    dMassSRCarrier[CO2GlobalId_] += dmCO2;
+
+    // Heat of reaction [J]
+    return HcCO2_*dmCO2;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H
new file mode 100644
index 0000000000..9bbed296f1
--- /dev/null
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H
@@ -0,0 +1,154 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2007 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
+    COxidationKineticDiffusionLimitedRate
+
+Description
+    Kinetic/diffusion limited rate surface reaction model for coal parcels.
+    Limited to:
+
+        C(s) + Sb*O2 -> CO2
+
+    where Sb is the stoichiometry of the reaction
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef COxidationKineticDiffusionLimitedRate_H
+#define COxidationKineticDiffusionLimitedRate_H
+
+#include "SurfaceReactionModel.H"
+#include "coalParcel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+            Class COxidationKineticDiffusionLimitedRate Declaration
+\*---------------------------------------------------------------------------*/
+
+class COxidationKineticDiffusionLimitedRate
+:
+    public SurfaceReactionModel<ReactingMultiphaseCloud<coalParcel> >
+{
+    // Private data
+
+        // Model constants
+
+            //- Stoichiometry of reaction
+            const scalar Sb_;
+
+            //- Mass diffusion limited rate constant, C1
+            const scalar C1_;
+
+            //- Kinetics limited rate pre-exponential constant, C2
+            const scalar C2_;
+
+            //- Kinetics limited rate activation energy
+            const scalar E_;
+
+
+        // Local copies of thermo properties
+
+            //- Molecular weight of C [kg/kmol]
+            scalar WC_;
+
+            //- Molecular weight of O2 [kg/kmol]
+            scalar WO2_;
+
+            //- Chemical enthalpy of CO2 [J/kg]
+            scalar HcCO2_;
+
+
+        // Addressing
+
+            //- Cs positions in global/local lists
+            label CsLocalId_;
+
+            //- O2 position in global list
+            label O2GlobalId_;
+
+            //- CO2 positions in global list
+            label CO2GlobalId_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("COxidationKineticDiffusionLimitedRate");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        COxidationKineticDiffusionLimitedRate
+        (
+            const dictionary& dict,
+            ReactingMultiphaseCloud<coalParcel>& owner
+        );
+
+
+    //- Destructor
+    virtual ~COxidationKineticDiffusionLimitedRate();
+
+
+    // Member Functions
+
+        //- Flag to indicate whether model activates surface reaction model
+        virtual bool active() const;
+
+        //- Update surface reactions
+        virtual scalar calculate
+        (
+            const scalar dt,
+            const label cellI,
+            const scalar d,
+            const scalar T,
+            const scalar Tc,
+            const scalar pc,
+            const scalar rhoc,
+            const scalar mass,
+            const scalarField& YGas,
+            const scalarField& YLiquid,
+            const scalarField& YSolid,
+            const scalarField& YMixture,
+            const scalarField& dMassVolatile,
+            scalarField& dMassGas,
+            scalarField& dMassLiquid,
+            scalarField& dMassSolid,
+            scalarField& dMassSRCarrier
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From a0a9cd336633b3e9ecef2bd04439eeb80fd52f64 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Mon, 18 May 2009 12:05:52 +0200
Subject: [PATCH 133/175] introduce readList<T> function

- Read a bracket-delimited list, or handle a single value as list of size 1.
  Mostly useful for handling command-line arguments.
  eg,
      if (args.options().found("patches"))
      {
          patches = readList<word>(IStringStream(args.options()["patches"])());
      }
  can handle both of these:
      -patches  patch0
      -patches \( patch1 patch2 patch3 \)
---
 applications/test/List/ListTest.C           | 35 +++++++++++++++++++++
 src/OpenFOAM/containers/Lists/List/List.H   | 22 +++++++++----
 src/OpenFOAM/containers/Lists/List/ListIO.C | 35 ++++++++++++++++++++-
 3 files changed, 85 insertions(+), 7 deletions(-)

diff --git a/applications/test/List/ListTest.C b/applications/test/List/ListTest.C
index d4834cb1db..d06c65d98a 100644
--- a/applications/test/List/ListTest.C
+++ b/applications/test/List/ListTest.C
@@ -29,6 +29,8 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "OSspecific.H"
+#include "argList.H"
+#include "wordReList.H"
 
 #include "IOstreams.H"
 #include "IStringStream.H"
@@ -38,11 +40,19 @@ Description
 
 using namespace Foam;
 
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 //  Main program:
 
 int main(int argc, char *argv[])
 {
+    argList::noParallel();
+    argList::validOptions.insert("reList", "reList");
+    argList::validOptions.insert("wordList", "wordList");
+    argList::validOptions.insert("stringList", "stringList");
+
+#   include "setRootCase.H"
+
     List<vector> list1(IStringStream("1 ((0 1 2))")());
     Info<< "list1: " << list1 << endl;
 
@@ -69,6 +79,31 @@ int main(int argc, char *argv[])
     Info<< "Elements " << map << " out of " << list3
         << " => " << subList3 << endl;
 
+    wordReList reLst;
+    wordList wLst;
+    stringList sLst;
+
+
+    if (args.options().found("reList"))
+    {
+        reLst = readList<wordRe>(IStringStream(args.options()["reList"])());
+    }
+
+    if (args.options().found("wordList"))
+    {
+        wLst = readList<word>(IStringStream(args.options()["wordList"])());
+    }
+
+    if (args.options().found("stringList"))
+    {
+        sLst = readList<string>(IStringStream(args.options()["stringList"])());
+    }
+
+    Info<< nl
+        << "-reList: " << reLst << nl
+        << "-wordList: " << wLst << nl
+        << "-stringList: " << sLst << endl;
+
     return 0;
 }
 
diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H
index 639db9bbd2..434320cf5b 100644
--- a/src/OpenFOAM/containers/Lists/List/List.H
+++ b/src/OpenFOAM/containers/Lists/List/List.H
@@ -241,17 +241,27 @@ public:
 };
 
 
+//- Read a bracket-delimited list, or handle a single value as list of size 1.
+//  For example,
+//  @code
+//      wList = readList<word>(IStringStream("(patch1 patch2 patch3)")());
+//      wList = readList<word>(IStringStream("patch0")());
+//  @endcode
+//  Mostly useful for handling command-line arguments.
 template<class T>
-void sort(List<T>& a);
-
-template<class T, class Cmp>
-void sort(List<T>& a, const Cmp&);
+List<T> readList(Istream&);
 
 template<class T>
-void stableSort(List<T>& a);
+void sort(List<T>&);
 
 template<class T, class Cmp>
-void stableSort(List<T>& a, const Cmp&);
+void sort(List<T>&, const Cmp&);
+
+template<class T>
+void stableSort(List<T>&);
+
+template<class T, class Cmp>
+void stableSort(List<T>&, const Cmp&);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/List/ListIO.C b/src/OpenFOAM/containers/Lists/List/ListIO.C
index d6238ae091..2ba1d4f00e 100644
--- a/src/OpenFOAM/containers/Lists/List/ListIO.C
+++ b/src/OpenFOAM/containers/Lists/List/ListIO.C
@@ -131,7 +131,7 @@ Foam::Istream& Foam::operator>>(Istream& is, List<T>& L)
         if (firstToken.pToken() != token::BEGIN_LIST)
         {
             FatalIOErrorIn("operator>>(Istream&, List<T>&)", is)
-                << "incorrect first token, expected '(' or '{', found "
+                << "incorrect first token, expected '(', found "
                 << firstToken.info()
                 << exit(FatalIOError);
         }
@@ -156,4 +156,37 @@ Foam::Istream& Foam::operator>>(Istream& is, List<T>& L)
     return is;
 }
 
+
+template<class T>
+Foam::List<T> Foam::readList(Istream& is)
+{
+    List<T> L;
+    token firstToken(is);
+    is.putBack(firstToken);
+
+    if (firstToken.isPunctuation())
+    {
+        if (firstToken.pToken() != token::BEGIN_LIST)
+        {
+            FatalIOErrorIn("readList<T>(Istream&)", is)
+                << "incorrect first token, expected '(', found "
+                << firstToken.info()
+                << exit(FatalIOError);
+        }
+
+        // read via a singly-linked list
+        L = SLList<T>(is);
+    }
+    else
+    {
+        // create list with a single item
+        L.setSize(1);
+
+        is >> L[0];
+    }
+
+    return L;
+}
+
+
 // ************************************************************************* //

From f673d3e338f03859c68a853faac2b386407612f2 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 18 May 2009 11:08:07 +0100
Subject: [PATCH 134/175] updated coupling with carrier phase

---
 .../Templates/KinematicCloud/KinematicCloud.C |   4 +
 .../Templates/KinematicCloud/KinematicCloud.H |   9 +-
 .../KinematicCloud/KinematicCloudI.H          |   8 ++
 .../Templates/ThermoCloud/ThermoCloud.C       |  21 +++-
 .../Templates/ThermoCloud/ThermoCloud.H       |  25 ++++-
 .../Templates/ThermoCloud/ThermoCloudI.H      |  82 +++++++++++++-
 .../KinematicParcel/KinematicParcel.C         |  35 ++++--
 .../KinematicParcel/KinematicParcel.H         |  13 ++-
 .../ReactingMultiphaseParcel.C                | 102 ++++++++++++------
 .../ReactingMultiphaseParcel.H                |  14 ++-
 .../Templates/ReactingParcel/ReactingParcel.C |  42 ++++++--
 .../Templates/ReactingParcel/ReactingParcel.H |  14 ++-
 .../Templates/ThermoParcel/ThermoParcel.C     |  31 ++++--
 .../Templates/ThermoParcel/ThermoParcel.H     |  14 ++-
 14 files changed, 333 insertions(+), 81 deletions(-)

diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index f60a01f326..2058dde5ea 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -96,6 +96,10 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
     constProps_(particleProperties_),
     parcelTypeId_(readLabel(particleProperties_.lookup("parcelTypeId"))),
     coupled_(particleProperties_.lookup("coupled")),
+    cellValueSourceCorrection_
+    (
+        particleProperties_.lookup("cellValueSourceCorrection")
+    ),
     rndGen_(label(0)),
     rho_(rho),
     U_(U),
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index 50280469e2..0a27aede96 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -105,7 +105,11 @@ class KinematicCloud
 
         //- Flag to indicate whether parcels are coupled to the carrier phase
         //  i.e. whether or not to generate source terms for carrier phase
-        Switch coupled_;
+        const Switch coupled_;
+
+        //- Flag to correct cell values with latest transfer information
+        //  during the lagrangian timestep
+        const Switch cellValueSourceCorrection_;
 
         //- Random number generator - used by some injection routines
         Random rndGen_;
@@ -224,6 +228,9 @@ public:
             //- Return coupled flag
             inline const Switch coupled() const;
 
+            //- Return cell value correction flag
+            inline const Switch cellValueSourceCorrection() const;
+
             //- Return refernce to the random object
             inline Random& rndGen();
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index 8c44470c44..b02b0f0d8f 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -72,6 +72,14 @@ inline const Foam::Switch Foam::KinematicCloud<ParcelType>::coupled() const
 }
 
 
+template <class ParcelType>
+inline const Foam::Switch
+Foam::KinematicCloud<ParcelType>::cellValueSourceCorrection() const
+{
+    return cellValueSourceCorrection_;
+}
+
+
 template<class ParcelType>
 inline const Foam::volScalarField&
 Foam::KinematicCloud<ParcelType>::rho() const
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
index 62c926f1ea..91d7a2fb7f 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
@@ -102,11 +102,25 @@ Foam::ThermoCloud<ParcelType>::ThermoCloud
         )
     ),
     radiation_(this->particleProperties().lookup("radiation")),
-    hTrans_
+    hsTrans_
     (
         IOobject
         (
-            this->name() + "hTrans",
+            this->name() + "hsTrans",
+            this->db().time().timeName(),
+            this->db(),
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            false
+        ),
+        this->mesh(),
+        dimensionedScalar("zero", dimensionSet(1, 2, -2, 0, 0), 0.0)
+    ),
+    hcTrans_
+    (
+        IOobject
+        (
+            this->name() + "hcTrans",
             this->db().time().timeName(),
             this->db(),
             IOobject::NO_READ,
@@ -132,7 +146,8 @@ template<class ParcelType>
 void Foam::ThermoCloud<ParcelType>::resetSourceTerms()
 {
     KinematicCloud<ParcelType>::resetSourceTerms();
-    hTrans_.field() = 0.0;
+    hsTrans_.field() = 0.0;
+    hcTrans_.field() = 0.0;
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
index 7cdc7b1263..2e3aea4f23 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
@@ -99,8 +99,14 @@ class ThermoCloud
 
         // Sources
 
-            //- Enthalpy transfer
-            DimensionedField<scalar, volMesh> hTrans_;
+            //- Sensible enthalpy transfer
+            DimensionedField<scalar, volMesh> hsTrans_;
+
+            //- Chemical enthalpy transfer
+            // - If solving for total enthalpy, the carrier phase enthalpy will
+            //   receive the full enthalpy of reaction via creation of reaction
+            //   products
+            DimensionedField<scalar, volMesh> hcTrans_;
 
 
     // Private Member Functions
@@ -173,10 +179,19 @@ public:
 
                 // Enthalpy
 
-                    //- Return reference to enthalpy source
-                    inline DimensionedField<scalar, volMesh>& hTrans();
+                    //- Return reference to sensible enthalpy source
+                    inline DimensionedField<scalar, volMesh>& hsTrans();
 
-                    //- return tmp enthalpy source term - fully explicit
+                    //- Return tmp total sensible enthalpy source term
+                    inline tmp<DimensionedField<scalar, volMesh> > Shs() const;
+
+                    //- Return reference to chemical enthalpy source
+                    inline DimensionedField<scalar, volMesh>& hcTrans();
+
+                    //- Return tmp chemical enthalpy source term
+                    inline tmp<DimensionedField<scalar, volMesh> > Shc() const;
+
+                    //- Return tmp total enthalpy source term
                     inline tmp<DimensionedField<scalar, volMesh> > Sh() const;
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
index d85d043ec5..ee38bfd453 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
@@ -77,9 +77,85 @@ inline bool Foam::ThermoCloud<ParcelType>::radiation() const
 
 template<class ParcelType>
 inline Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
-Foam::ThermoCloud<ParcelType>::hTrans()
+Foam::ThermoCloud<ParcelType>::hsTrans()
 {
-    return hTrans_;
+    return hsTrans_;
+}
+
+
+template<class ParcelType>
+inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >
+Foam::ThermoCloud<ParcelType>::Shs() const
+{
+    tmp<DimensionedField<scalar, volMesh> > tShs
+    (
+        new DimensionedField<scalar, volMesh>
+        (
+            IOobject
+            (
+                this->name() + "Shs",
+                this->db().time().timeName(),
+                this->mesh(),
+                IOobject::NO_READ,
+                IOobject::AUTO_WRITE,
+                false
+            ),
+            this->mesh(),
+            dimensionedScalar
+            (
+                "zero",
+                dimMass/dimLength/pow3(dimTime),
+                0.0
+            )
+        )
+    );
+
+    scalarField& Shs = tShs().field();
+    Shs = hsTrans_/(this->mesh().V()*this->db().time().deltaT());
+
+    return tShs;
+}
+
+
+template<class ParcelType>
+inline Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
+Foam::ThermoCloud<ParcelType>::hcTrans()
+{
+    return hcTrans_;
+}
+
+
+template<class ParcelType>
+inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >
+Foam::ThermoCloud<ParcelType>::Shc() const
+{
+    tmp<DimensionedField<scalar, volMesh> > tShc
+    (
+        new DimensionedField<scalar, volMesh>
+        (
+            IOobject
+            (
+                this->name() + "Shc",
+                this->db().time().timeName(),
+                this->mesh(),
+                IOobject::NO_READ,
+                IOobject::AUTO_WRITE,
+                false
+            ),
+            this->mesh(),
+            dimensionedScalar
+            (
+                "zero",
+                dimMass/dimLength/pow3(dimTime),
+                0.0
+            )
+        )
+    );
+
+    scalarField& Shc = tShc().field();
+    Shc = hcTrans_/(this->mesh().V()*this->db().time().deltaT());
+
+    return tShc;
 }
 
 
@@ -111,7 +187,7 @@ Foam::ThermoCloud<ParcelType>::Sh() const
     );
 
     scalarField& Sh = tSh().field();
-    Sh = hTrans_/(this->mesh().V()*this->db().time().deltaT());
+    Sh = (hsTrans_ + hcTrans_)/(this->mesh().V()*this->db().time().deltaT());
 
     return tSh;
 }
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index 69cc25869e..cdc7e5e3b0 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -31,7 +31,7 @@ License
 
 template<class ParcelType>
 template<class TrackData>
-void Foam::KinematicParcel<ParcelType>::updateCellQuantities
+void Foam::KinematicParcel<ParcelType>::setCellValues
 (
     TrackData& td,
     const scalar dt,
@@ -43,7 +43,7 @@ void Foam::KinematicParcel<ParcelType>::updateCellQuantities
     {
         WarningIn
         (
-            "void Foam::KinematicParcel<ParcelType>::updateCellQuantities"
+            "void Foam::KinematicParcel<ParcelType>::setCellValues"
             "("
                 "TrackData&, "
                 "const scalar, "
@@ -57,9 +57,6 @@ void Foam::KinematicParcel<ParcelType>::updateCellQuantities
 
     Uc_ = td.UInterp().interpolate(this->position(), cellI);
 
-    // Apply correction to cell velocity to account for momentum transfer
-    Uc_ += td.cloud().UTrans()[cellI]/(massCell(cellI));
-
     muc_ = td.muInterp().interpolate(this->position(), cellI);
 
     // Apply dispersion components to carrier phase velocity
@@ -75,6 +72,19 @@ void Foam::KinematicParcel<ParcelType>::updateCellQuantities
 }
 
 
+template<class ParcelType>
+template<class TrackData>
+void Foam::KinematicParcel<ParcelType>::cellValueSourceCorrection
+(
+    TrackData& td,
+    const scalar dt,
+    const label cellI
+)
+{
+    Uc_ += td.cloud().UTrans()[cellI]/massCell(cellI);
+}
+
+
 template<class ParcelType>
 template<class TrackData>
 void Foam::KinematicParcel<ParcelType>::calc
@@ -183,8 +193,8 @@ bool Foam::KinematicParcel<ParcelType>::move(TrackData& td)
         // Set the Lagrangian time-step
         scalar dt = min(dtMax, tEnd);
 
-        // Remember which cell the Parcel is in
-        // since this will change if a face is hit
+        // Remember which cell the Parcel is in since this will change if a
+        // face is hit
         label cellI = p.cell();
 
         dt *= p.trackToFace(p.position() + dt*U_, td);
@@ -192,12 +202,17 @@ bool Foam::KinematicParcel<ParcelType>::move(TrackData& td)
         tEnd -= dt;
         p.stepFraction() = 1.0 - tEnd/deltaT;
 
-        // Update cell based properties
-        p.updateCellQuantities(td, dt, cellI);
-
         // Avoid problems with extremely small timesteps
         if (dt > ROOTVSMALL)
         {
+            // Update cell based properties
+            p.setCellValues(td, dt, cellI);
+
+            if (td.cloud().cellValueSourceCorrection())
+            {
+                p.cellValueSourceCorrection(td, dt, cellI);
+            }
+
             p.calc(td, dt, cellI);
         }
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index 7a57dd5fb0..82d7c2ccd9 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -372,9 +372,18 @@ public:
 
         // Main calculation loop
 
-            //- Update cell based quantities
+            //- Set cell values
             template<class TrackData>
-            void updateCellQuantities
+            void setCellValues
+            (
+                TrackData& td,
+                const scalar dt,
+                const label cellI
+            );
+
+            //- Correct cell values using latest transfer information
+            template<class TrackData>
+            void cellValueSourceCorrection
             (
                 TrackData& td,
                 const scalar dt,
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 3b576489c7..9948869799 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -129,14 +129,54 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::updateMassFractions
 
 template<class ParcelType>
 template<class TrackData>
-void Foam::ReactingMultiphaseParcel<ParcelType>::updateCellQuantities
+void Foam::ReactingMultiphaseParcel<ParcelType>::setCellValues
 (
     TrackData& td,
     const scalar dt,
     const label cellI
 )
 {
-    ReactingParcel<ParcelType>::updateCellQuantities(td, dt, cellI);
+    ReactingParcel<ParcelType>::setCellValues(td, dt, cellI);
+}
+
+
+template<class ParcelType>
+template<class TrackData>
+void Foam::ReactingMultiphaseParcel<ParcelType>::cellValueSourceCorrection
+(
+    TrackData& td,
+    const scalar dt,
+    const label cellI
+)
+{
+    scalar massCell = this->massCell(cellI);
+
+    scalar addedMass = 0.0;
+    forAll(td.cloud().rhoTrans(), i)
+    {
+        addedMass += td.cloud().rhoTrans(i)[cellI];
+    }
+
+    this->rhoc_ += addedMass/td.cloud().pMesh().cellVolumes()[cellI];
+
+    scalar massCellNew = massCell + addedMass;
+    this->Uc_ += td.cloud().UTrans()[cellI]/massCellNew;
+
+    scalar cpEff = 0;
+    forAll(td.cloud().rhoTrans(), i)
+    {
+        scalar Y = td.cloud().rhoTrans(i)[cellI]/addedMass;
+        cpEff += Y*td.cloud().gases()[i].Cp(this->Tc_);
+    }
+
+    const scalar cpc = td.cpInterp().psi()[cellI];
+    this->cpc_ = (massCell*cpc + addedMass*cpEff)/massCellNew;
+
+    const scalar fCarrier = -1.0/td.constProps().hRetentionCoeff();
+    const scalar dh =
+        td.cloud().hsTrans()[cellI] + fCarrier*td.cloud().hcTrans[cellI];
+
+    this->Tc_ += dh/(this->cpc_*massCellNew);
 }
 
 
@@ -229,7 +269,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     scalarField dMassSRCarrier(td.cloud().gases().size(), 0.0);
 
     // Return enthalpy source and calc mass transfer(s) due to surface reaction
-    scalar HReaction =
+    scalar hReaction =
         calcSurfaceReactions
         (
             td,
@@ -250,11 +290,8 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
             dMassSRCarrier
         );
 
-    // Heat of reaction split between component retained by particle
-    const scalar ShSR = td.constProps().hRetentionCoeff()*HReaction;
-
-    // ...and component added to the carrier phase
-    const scalar ShSRc = (1.0 - td.constProps().hRetentionCoeff())*HReaction;
+    // Heat of reaction retained by particle
+    const scalar ShSR = td.constProps().hRetentionCoeff()*hReaction;
 
 
     // Update component mass fractions
@@ -310,12 +347,14 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
             label id = td.cloud().composition().localToGlobalGasId(LIQ, i);
             td.cloud().rhoTrans(id)[cellI] += np0*dMassLiquid[i];
         }
-//        // No mapping between solid components and carrier phase
-//        forAll(YSolid_, i)
-//        {
-//            label id = td.cloud().composition().localToGlobalGasId(SLD, i);
-//            td.cloud().rhoTrans(id)[cellI] += np0*dMassSolid[i];
-//        }
+/*
+        // No mapping between solid components and carrier phase
+        forAll(YSolid_, i)
+        {
+            label id = td.cloud().composition().localToGlobalGasId(SLD, i);
+            td.cloud().rhoTrans(id)[cellI] += np0*dMassSolid[i];
+        }
+*/
         forAll(dMassSRCarrier, i)
         {
             td.cloud().rhoTrans(i)[cellI] += np0*dMassSRCarrier[i];
@@ -324,8 +363,11 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
         // Update momentum transfer
         td.cloud().UTrans()[cellI] += np0*(mass0*U0 - mass1*U1);
 
-        // Update enthalpy transfer
-        td.cloud().hTrans()[cellI] += np0*(mass0*H0 - (mass1*H1 + ShSRc));
+        // Update sensible enthalpy transfer
+        td.cloud().hsTrans()[cellI] += np0*(mass0*H0 - mass1*H1);
+
+        // Update chemical enthalpy transfer
+        td.cloud().hcTrans()[cellI] -= np0*ShSR;
     }
 
 
@@ -346,21 +388,20 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
             }
             forAll(YLiquid_, i)
             {
-                label id =
-                    td.cloud().composition().localToGlobalGasId(LIQ, i);
+                label id = td.cloud().composition().localToGlobalGasId(LIQ, i);
                 td.cloud().rhoTrans(id)[cellI] +=
                     np0*mass1*YMix[LIQ]*YLiquid_[i];
             }
-//            // No mapping between solid components and carrier phase
-//            forAll(YSolid_, i)
-//            {
-//                label id =
-//                    td.cloud().composition().localToGlobalGasId(SLD, i);
-//                td.cloud().rhoTrans(id)[cellI] +=
-//                    np0*mass1*YMix[SLD]*YSolid_[i];
-//            }
-
-            td.cloud().hTrans()[cellI] += np0*mass1*H1;
+/*
+            // No mapping between solid components and carrier phase
+            forAll(YSolid_, i)
+            {
+                label id = td.cloud().composition().localToGlobalGasId(SLD, i);
+                td.cloud().rhoTrans(id)[cellI] +=
+                    np0*mass1*YMix[SLD]*YSolid_[i];
+            }
+*/
+            td.cloud().hsTrans()[cellI] += np0*mass1*H1;
             td.cloud().UTrans()[cellI] += np0*mass1*U1;
         }
     }
@@ -466,7 +507,7 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
     }
 
     // Update surface reactions
-    const scalar HReaction = td.cloud().surfaceReaction().calculate
+    const scalar hReaction = td.cloud().surfaceReaction().calculate
     (
         dt,
         cellI,
@@ -493,7 +534,7 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
        *(sum(dMassSRGas) + sum(dMassSRLiquid) + sum(dMassSRSolid))
     );
 
-    return HReaction;
+    return hReaction;
 }
 
 
@@ -502,4 +543,3 @@ Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
 #include "ReactingMultiphaseParcelIO.C"
 
 // ************************************************************************* //
-
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
index b5f45310cd..9bf8a5294d 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -333,9 +333,18 @@ public:
 
         // Main calculation loop
 
-            //- Update cell based quantities
+            //- Set cell values
             template<class TrackData>
-            void updateCellQuantities
+            void setCellValues
+            (
+                TrackData& td,
+                const scalar dt,
+                const label cellI
+            );
+
+            //- Correct cell values using latest transfer information
+            template<class TrackData>
+            void cellValueSourceCorrection
             (
                 TrackData& td,
                 const scalar dt,
@@ -393,4 +402,3 @@ public:
 #endif
 
 // ************************************************************************* //
-
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index cb7e83c267..e1e232f249 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -30,21 +30,21 @@ License
 
 template<class ParcelType>
 template<class TrackData>
-void Foam::ReactingParcel<ParcelType>::updateCellQuantities
+void Foam::ReactingParcel<ParcelType>::setCellValues
 (
     TrackData& td,
     const scalar dt,
     const label cellI
 )
 {
-    ThermoParcel<ParcelType>::updateCellQuantities(td, dt, cellI);
+    ThermoParcel<ParcelType>::setCellValues(td, dt, cellI);
 
     pc_ = td.pInterp().interpolate(this->position(), cellI);
     if (pc_ < td.constProps().pMin())
     {
         WarningIn
         (
-            "void Foam::ReactingParcel<ParcelType>::updateCellQuantities"
+            "void Foam::ReactingParcel<ParcelType>::setCellValues"
             "("
                 "TrackData&, "
                 "const scalar, "
@@ -55,14 +55,42 @@ void Foam::ReactingParcel<ParcelType>::updateCellQuantities
 
         pc_ = td.constProps().pMin();
     }
+}
+
+
+template<class ParcelType>
+template<class TrackData>
+void Foam::ReactingParcel<ParcelType>::cellValueSourceCorrection
+(
+    TrackData& td,
+    const scalar dt,
+    const label cellI
+)
+{
+    scalar massCell = this->massCell(cellI);
 
-    // Apply correction to cell density to account for mass transfer
     scalar addedMass = 0.0;
     forAll(td.cloud().rhoTrans(), i)
     {
         addedMass += td.cloud().rhoTrans(i)[cellI];
     }
+
     this->rhoc_ += addedMass/td.cloud().pMesh().cellVolumes()[cellI];
+
+    scalar massCellNew = massCell + addedMass;
+    this->Uc_ += td.cloud().UTrans()[cellI]/massCellNew;
+
+    scalar cpEff = 0;
+    forAll(td.cloud().rhoTrans(), i)
+    {
+        scalar Y = td.cloud().rhoTrans(i)[cellI]/addedMass;
+        cpEff += Y*td.cloud().gases()[i].Cp(this->Tc_);
+    }
+
+    const scalar cpc = td.cpInterp().psi()[cellI];
+    this->cpc_ = (massCell*cpc + addedMass*cpEff)/massCellNew;
+
+    this->Tc_ += td.cloud().hsTrans()[cellI]/(this->cpc_*massCellNew);
 }
 
 
@@ -164,8 +192,8 @@ void Foam::ReactingParcel<ParcelType>::calc
         // Update momentum transfer
         td.cloud().UTrans()[cellI] += np0*(mass0*U0 - mass1*U1);
 
-        // Update enthalpy transfer
-        td.cloud().hTrans()[cellI] += np0*(mass0*H0 - mass1*H1);
+        // Update sensible enthalpy transfer
+        td.cloud().hsTrans()[cellI] += np0*(mass0*H0 - mass1*H1);
     }
 
 
@@ -184,7 +212,7 @@ void Foam::ReactingParcel<ParcelType>::calc
                 td.cloud().rhoTrans(id)[cellI] += np0*mass1*Y_[i];
             }
             td.cloud().UTrans()[cellI] += np0*mass1*U1;
-            td.cloud().hTrans()[cellI] += np0*mass1*H1;
+            td.cloud().hsTrans()[cellI] += np0*mass1*H1;
         }
     }
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index f7b85d22c2..59e22d7d06 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -276,9 +276,18 @@ public:
 
         // Main calculation loop
 
-            //- Update cell based quantities
+            //- Set cell values
             template<class TrackData>
-            void updateCellQuantities
+            void setCellValues
+            (
+                TrackData& td,
+                const scalar dt,
+                const label cellI
+            );
+
+            //- Correct cell values using latest transfer information
+            template<class TrackData>
+            void cellValueSourceCorrection
             (
                 TrackData& td,
                 const scalar dt,
@@ -333,4 +342,3 @@ public:
 #endif
 
 // ************************************************************************* //
-
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
index 4d4d469d12..6a476110dd 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -30,28 +30,24 @@ License
 
 template<class ParcelType>
 template<class TrackData>
-void Foam::ThermoParcel<ParcelType>::updateCellQuantities
+void Foam::ThermoParcel<ParcelType>::setCellValues
 (
     TrackData& td,
     const scalar dt,
     const label cellI
 )
 {
-    KinematicParcel<ParcelType>::updateCellQuantities(td, dt, cellI);
+    KinematicParcel<ParcelType>::setCellValues(td, dt, cellI);
 
     cpc_ = td.cpInterp().interpolate(this->position(), cellI);
 
     Tc_ = td.TInterp().interpolate(this->position(), cellI);
 
-    // Apply correction to cell temperature to account for enthalpy transfer
-    scalar cpMean = td.cpInterp().psi()[cellI];
-    Tc_ += td.cloud().hTrans()[cellI]/(cpMean*this->massCell(cellI));
-
     if (Tc_ < td.constProps().TMin())
     {
         WarningIn
         (
-            "void Foam::ThermoParcel<ParcelType>::updateCellQuantities"
+            "void Foam::ThermoParcel<ParcelType>::setCellValues"
             "("
                 "TrackData&, "
                 "const scalar, "
@@ -65,6 +61,22 @@ void Foam::ThermoParcel<ParcelType>::updateCellQuantities
 }
 
 
+template<class ParcelType>
+template<class TrackData>
+void Foam::ThermoParcel<ParcelType>::cellValueSourceCorrection
+(
+    TrackData& td,
+    const scalar dt,
+    const label cellI
+)
+{
+    this->Uc_ += td.cloud().UTrans()[cellI]/this->massCell(cellI);
+
+    scalar cpMean = td.cpInterp().psi()[cellI];
+    Tc_ += td.cloud().hsTrans()[cellI]/(cpMean*this->massCell(cellI));
+}
+
+
 template<class ParcelType>
 template<class TrackData>
 void Foam::ThermoParcel<ParcelType>::calc
@@ -118,8 +130,8 @@ void Foam::ThermoParcel<ParcelType>::calc
         // Update momentum transfer
         td.cloud().UTrans()[cellI] += np0*mass0*(U0 - U1);
 
-        // Update enthalpy transfer
-        td.cloud().hTrans()[cellI] += np0*mass0*(H0 - H1);
+        // Update sensible enthalpy transfer
+        td.cloud().hsTrans()[cellI] += np0*mass0*(H0 - H1);
     }
 
     // Set new particle properties
@@ -198,4 +210,3 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
 #include "ThermoParcelIO.C"
 
 // ************************************************************************* //
-
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
index aa2020aa10..1927ca3de6 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
@@ -286,9 +286,18 @@ public:
 
         // Main calculation loop
 
-            //- Update cell based quantities
+            //- Set cell values
             template<class TrackData>
-            void updateCellQuantities
+            void setCellValues
+            (
+                TrackData& td,
+                const scalar dt,
+                const label cellI
+            );
+
+            //- Correct cell values using latest transfer information
+            template<class TrackData>
+            void cellValueSourceCorrection
             (
                 TrackData& td,
                 const scalar dt,
@@ -343,4 +352,3 @@ public:
 #endif
 
 // ************************************************************************* //
-

From 5c0b2533001f37cc9b75be2d7b85a26e27c0f1da Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 18 May 2009 12:06:27 +0100
Subject: [PATCH 135/175] avoid possible div0

---
 .../ReactingMultiphaseParcel.C                         | 10 ++++++----
 .../parcels/Templates/ReactingParcel/ReactingParcel.C  | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 9948869799..977bb68234 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -163,12 +163,14 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::cellValueSourceCorrection
     this->Uc_ += td.cloud().UTrans()[cellI]/massCellNew;
 
     scalar cpEff = 0;
-    forAll(td.cloud().rhoTrans(), i)
+    if (addedMass > ROOTVSMALL)
     {
-        scalar Y = td.cloud().rhoTrans(i)[cellI]/addedMass;
-        cpEff += Y*td.cloud().gases()[i].Cp(this->Tc_);
+        forAll(td.cloud().rhoTrans(), i)
+        {
+            scalar Y = td.cloud().rhoTrans(i)[cellI]/addedMass;
+            cpEff += Y*td.cloud().gases()[i].Cp(this->Tc_);
+        }
     }
-
     const scalar cpc = td.cpInterp().psi()[cellI];
     this->cpc_ = (massCell*cpc + addedMass*cpEff)/massCellNew;
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index e1e232f249..f793f545f8 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -81,12 +81,14 @@ void Foam::ReactingParcel<ParcelType>::cellValueSourceCorrection
     this->Uc_ += td.cloud().UTrans()[cellI]/massCellNew;
 
     scalar cpEff = 0;
-    forAll(td.cloud().rhoTrans(), i)
+    if (addedMass > ROOTVSMALL)
     {
-        scalar Y = td.cloud().rhoTrans(i)[cellI]/addedMass;
-        cpEff += Y*td.cloud().gases()[i].Cp(this->Tc_);
+        forAll(td.cloud().rhoTrans(), i)
+        {
+            scalar Y = td.cloud().rhoTrans(i)[cellI]/addedMass;
+            cpEff += Y*td.cloud().gases()[i].Cp(this->Tc_);
+        }
     }
-
     const scalar cpc = td.cpInterp().psi()[cellI];
     this->cpc_ = (massCell*cpc + addedMass*cpEff)/massCellNew;
 

From d054f81b5766464b11759773568575501560180c Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 18 May 2009 12:06:52 +0100
Subject: [PATCH 136/175] using 1/3 rule for surface film temperature

comments
---
 .../LiquidEvaporation/LiquidEvaporation.C             | 11 ++++++++---
 .../LiquidEvaporation/LiquidEvaporation.H             |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
index d1c3e8b8a8..f87de2537e 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
@@ -153,6 +153,9 @@ void Foam::LiquidEvaporation<CloudType>::calculate
     // Reynolds number
     scalar Re = mag(Ur)*d/(nuc + ROOTVSMALL);
 
+    // film temperature evaluated using the 1/3 rule
+    scalar Tf = (2.0*T + Tc)/3.0;
+
     // calculate mass transfer of each specie in liquid
     forAll(activeLiquids_, i)
     {
@@ -160,10 +163,12 @@ void Foam::LiquidEvaporation<CloudType>::calculate
         label lid = liqToLiqMap_[i];
 
         // vapour diffusivity [m2/s]
-        scalar Dab = liquids_->properties()[lid].D(pc, T);
+        scalar Dab = liquids_->properties()[lid].D(pc, Tf);
 
         // saturation pressure for species i [pa]
-        scalar pSat = liquids_->properties()[lid].pv(pc, T);
+        // - carrier phase pressure assumed equal to the liquid vapour pressure
+        //   close to the surface
+        scalar pSat = liquids_->properties()[lid].pv(pc, Tf);
 
         // Schmidt number
         scalar Sc = nuc/(Dab + ROOTVSMALL);
@@ -175,7 +180,7 @@ void Foam::LiquidEvaporation<CloudType>::calculate
         scalar kc = Sh*Dab/(d + ROOTVSMALL);
 
         // vapour concentration at droplet surface [kgmol/m3]
-        scalar Cs = pSat/(specie::RR*T);
+        scalar Cs = pSat/(specie::RR*Tf);
 
         // vapour concentration in bulk gas [kgmol/m3]
         scalar Cinf = Xc[gid]*pc/(specie::RR*Tc);
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
index 408fb3d06b..d2a1f903da 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
@@ -27,6 +27,7 @@ Class
 
 Description
     Liquid evaporation model
+    - uses ideal gas assumption
 
 \*---------------------------------------------------------------------------*/
 

From 3a4df7a451e6613393ea5be9145aef076012c77d Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 18 May 2009 16:35:42 +0100
Subject: [PATCH 137/175] refactored gases->carrierSpecies

---
 .../Templates/ReactingCloud/ReactingCloud.C     |  4 ++--
 .../Templates/ReactingCloud/ReactingCloud.H     |  6 +++---
 .../Templates/ReactingCloud/ReactingCloudI.H    |  4 ++--
 .../ReactingMultiphaseCloud.C                   |  4 ++--
 .../ReactingMultiphaseCloud.H                   |  2 +-
 .../basicReactingCloud/basicReactingCloud.C     |  4 ++--
 .../basicReactingCloud/basicReactingCloud.H     |  2 +-
 .../basicReactingMultiphaseCloud.C              |  4 ++--
 .../basicReactingMultiphaseCloud.H              |  2 +-
 .../ReactingMultiphaseParcel.C                  |  4 ++--
 .../Templates/ReactingParcel/ReactingParcel.C   |  2 +-
 .../phaseProperties/phaseProperties.H           |  3 ++-
 .../CompositionModel/CompositionModel.C         | 14 +++++++-------
 .../CompositionModel/CompositionModel.H         | 17 +++++++++--------
 .../LiquidEvaporation/LiquidEvaporation.C       |  4 ++--
 15 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
index 86ed6862e4..bce296229c 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -72,14 +72,14 @@ Foam::ReactingCloud<ParcelType>::ReactingCloud
     const volVectorField& U,
     const dimensionedVector& g,
     hCombustionThermo& thermo,
-    PtrList<specieReactingProperties>& gases
+    PtrList<specieReactingProperties>& carrierSpecies
 )
 :
     ThermoCloud<ParcelType>(cloudType, rho, U, g, thermo),
     reactingCloud(),
     constProps_(this->particleProperties()),
     carrierThermo_(thermo),
-    gases_(gases),
+    carrierSpecies_(carrierSpecies),
     compositionModel_
     (
         CompositionModel<ReactingCloud<ParcelType> >::New
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
index 0cc8bfc96b..848da63604 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
@@ -80,7 +80,7 @@ class ReactingCloud
         hCombustionThermo& carrierThermo_;
 
         //- Gas phase properties
-        PtrList<specieReactingProperties>& gases_;
+        PtrList<specieReactingProperties>& carrierSpecies_;
 
 
         // References to the cloud sub-models
@@ -127,7 +127,7 @@ public:
             const volVectorField& U,
             const dimensionedVector& g,
             hCombustionThermo& thermo,
-            PtrList<specieReactingProperties>& gases
+            PtrList<specieReactingProperties>& carrierSpecies
         );
 
 
@@ -154,7 +154,7 @@ public:
             inline hCombustionThermo& carrierThermo();
 
             //- Gas phase properties
-            inline const PtrList<specieReactingProperties>& gases() const;
+            inline const PtrList<specieReactingProperties>& carrierSpecies() const;
 
 
             // Sub-models
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
index 98d9eee8fe..d21df2f89d 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
@@ -52,9 +52,9 @@ Foam::ReactingCloud<ParcelType>::carrierThermo()
 
 template<class ParcelType>
 inline const Foam::PtrList<Foam::specieReactingProperties>&
-Foam::ReactingCloud<ParcelType>::gases() const
+Foam::ReactingCloud<ParcelType>::carrierSpecies() const
 {
-    return gases_;
+    return carrierSpecies_;
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
index 7936ddea40..4ffc530614 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
@@ -79,10 +79,10 @@ Foam::ReactingMultiphaseCloud<ParcelType>::ReactingMultiphaseCloud
     const volVectorField& U,
     const dimensionedVector& g,
     hCombustionThermo& thermo,
-    PtrList<specieReactingProperties>& gases
+    PtrList<specieReactingProperties>& carrierSpecies
 )
 :
-    ReactingCloud<ParcelType>(cloudType, rho, U, g, thermo, gases),
+    ReactingCloud<ParcelType>(cloudType, rho, U, g, thermo, carrierSpecies),
     reactingMultiphaseCloud(),
     constProps_(this->particleProperties()),
     devolatilisationModel_
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
index ea3f585313..d16577c03a 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
@@ -121,7 +121,7 @@ public:
             const volVectorField& U,
             const dimensionedVector& g,
             hCombustionThermo& thermo,
-            PtrList<specieReactingProperties>& gases
+            PtrList<specieReactingProperties>& carrierSpecies
         );
 
 
diff --git a/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.C b/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.C
index 6cd0e4d4fe..405dc4a658 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.C
@@ -43,7 +43,7 @@ Foam::basicReactingCloud::basicReactingCloud
     const volVectorField& U,
     const dimensionedVector& g,
     hCombustionThermo& thermo,
-    PtrList<specieReactingProperties>& gases
+    PtrList<specieReactingProperties>& carrierSpecies
 )
 :
     ReactingCloud<basicReactingParcel>
@@ -53,7 +53,7 @@ Foam::basicReactingCloud::basicReactingCloud
         U,
         g,
         thermo,
-        gases
+        carrierSpecies
     )
 {
     basicReactingParcel::readFields(*this);
diff --git a/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H b/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H
index 42f36fddcb..7a56097614 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H
@@ -77,7 +77,7 @@ public:
             const volVectorField& U,
             const dimensionedVector& g,
             hCombustionThermo& thermo,
-            PtrList<specieReactingProperties>& gases
+            PtrList<specieReactingProperties>& carrierSpecies
         );
 
 
diff --git a/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.C
index c83cf4a20d..d174e0ea0a 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.C
+++ b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.C
@@ -43,7 +43,7 @@ Foam::basicReactingMultiphaseCloud::basicReactingMultiphaseCloud
     const volVectorField& U,
     const dimensionedVector& g,
     hCombustionThermo& thermo,
-    PtrList<specieReactingProperties>& gases
+    PtrList<specieReactingProperties>& carrierSpecies
 )
 :
     ReactingMultiphaseCloud<basicReactingMultiphaseParcel>
@@ -53,7 +53,7 @@ Foam::basicReactingMultiphaseCloud::basicReactingMultiphaseCloud
         U,
         g,
         thermo,
-        gases
+        carrierSpecies
     )
 {
     basicReactingMultiphaseParcel::readFields(*this);
diff --git a/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H
index 7ccdc7a7ae..e8a9485cb8 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H
@@ -77,7 +77,7 @@ public:
             const volVectorField& U,
             const dimensionedVector& g,
             hCombustionThermo& thermo,
-            PtrList<specieReactingProperties>& gases
+            PtrList<specieReactingProperties>& carrierSpecies
         );
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 977bb68234..4d4eae98fb 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -168,7 +168,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::cellValueSourceCorrection
         forAll(td.cloud().rhoTrans(), i)
         {
             scalar Y = td.cloud().rhoTrans(i)[cellI]/addedMass;
-            cpEff += Y*td.cloud().gases()[i].Cp(this->Tc_);
+            cpEff += Y*td.cloud().carrierSpecies()[i].Cp(this->Tc_);
         }
     }
     const scalar cpc = td.cpInterp().psi()[cellI];
@@ -268,7 +268,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     scalarField dMassSRGas(YGas_.size(), 0.0);
     scalarField dMassSRLiquid(YLiquid_.size(), 0.0);
     scalarField dMassSRSolid(YSolid_.size(), 0.0);
-    scalarField dMassSRCarrier(td.cloud().gases().size(), 0.0);
+    scalarField dMassSRCarrier(td.cloud().carrierSpecies().size(), 0.0);
 
     // Return enthalpy source and calc mass transfer(s) due to surface reaction
     scalar hReaction =
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index f793f545f8..3ea161f28f 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -86,7 +86,7 @@ void Foam::ReactingParcel<ParcelType>::cellValueSourceCorrection
         forAll(td.cloud().rhoTrans(), i)
         {
             scalar Y = td.cloud().rhoTrans(i)[cellI]/addedMass;
-            cpEff += Y*td.cloud().gases()[i].Cp(this->Tc_);
+            cpEff += Y*td.cloud().carrierSpecies()[i].Cp(this->Tc_);
         }
     }
     const scalar cpc = td.cpInterp().psi()[cellI];
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
index 730d99fbb5..be45bc51ca 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
@@ -100,7 +100,8 @@ private:
         //- Set global ids - liquid and solid phases
         void setGlobalIds(const wordList& globalNames);
 
-        //- Set global gas ids - attempts to map component names to global gases
+        //- Set global gas ids - attempts to map component names to global
+        //  carrier species
         void setGlobalGasIds(const PtrList<volScalarField>& YGas);
 
         //- Check the total mass fraction
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
index 79f538d1e8..1bbdc5221f 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
@@ -40,7 +40,7 @@ Foam::CompositionModel<CloudType>::CompositionModel
     owner_(owner),
     coeffDict_(dict.subDict(type + "Coeffs")),
     carrierThermo_(owner.carrierThermo()),
-    gases_(owner.gases()),
+    carrierSpecies_(owner.carrierSpecies()),
     liquids_
     (
         liquidMixture::New
@@ -111,9 +111,9 @@ Foam::CompositionModel<CloudType>::carrierThermo() const
 
 template<class CloudType>
 const Foam::PtrList<Foam::specieReactingProperties>&
-Foam::CompositionModel<CloudType>::gases() const
+Foam::CompositionModel<CloudType>::carrierSpecies() const
 {
-    return gases_;
+    return carrierSpecies_;
 }
 
 
@@ -294,8 +294,8 @@ Foam::scalarField Foam::CompositionModel<CloudType>::X
             forAll(Y, i)
             {
                 label gid = props.globalIds()[i];
-                WInv += Y[i]/this->gases()[gid].W();
-                X[i] = Y[i]/this->gases()[gid].W();
+                WInv += Y[i]/this->carrierSpecies()[gid].W();
+                X[i] = Y[i]/this->carrierSpecies()[gid].W();
             }
             break;
         }
@@ -345,7 +345,7 @@ Foam::scalar Foam::CompositionModel<CloudType>::H
             forAll(Y, i)
             {
                 label gid = props.globalIds()[i];
-                HMixture += Y[i]*this->gases()[gid].H(T);
+                HMixture += Y[i]*this->carrierSpecies()[gid].H(T);
             }
             break;
         }
@@ -409,7 +409,7 @@ Foam::scalar Foam::CompositionModel<CloudType>::cp
             forAll(Y, i)
             {
                 label gid = props.globalIds()[i];
-                cpMixture += Y[i]*this->gases()[gid].Cp(T);
+                cpMixture += Y[i]*this->carrierSpecies()[gid].Cp(T);
             }
             break;
         }
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
index f6a41acf0b..e45f7d96d0 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
@@ -27,7 +27,8 @@ Class
 
 Description
     Templated reacting parcel composition model class
-    Consists of gases (via thermo package), liquids and solids
+    Consists of carrier species (via thermo package), and additional liquids
+    and solids
 
 SourceFiles
     CompositionModel.C
@@ -77,12 +78,12 @@ class CompositionModel
         hCombustionThermo& carrierThermo_;
 
         //- Reference to the carrier phase species
-        const PtrList<specieReactingProperties>& gases_;
+        const PtrList<specieReactingProperties>& carrierSpecies_;
 
-        //- Global liquid properties data
+        //- Global (additional) liquid properties data
         autoPtr<liquidMixture> liquids_;
 
-        //- Global solid properties data
+        //- Global (additional) solid properties data
         autoPtr<solidMixture> solids_;
 
         //- List of phase properties
@@ -150,13 +151,13 @@ public:
 
             // Composition lists
 
-                //- Return the gases
-                const PtrList<specieReactingProperties>& gases() const;
+                //- Return the carrier species
+                const PtrList<specieReactingProperties>& carrierSpecies() const;
 
-                //- Return the global liquids
+                //- Return the global (additional) liquids
                 const liquidMixture& liquids() const;
 
-                //- Return the global solids
+                //- Return the global (additional) solids
                 const solidMixture& solids() const;
 
                 //- Return the list of phase properties
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
index f87de2537e..a9f6e5738a 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
@@ -41,8 +41,8 @@ Foam::scalarField Foam::LiquidEvaporation<CloudType>::calcXc
     forAll(Xc, i)
     {
         scalar Y = this->owner().carrierThermo().composition().Y()[i][cellI];
-        Winv += Y/this->owner().gases()[i].W();
-        Xc[i] = Y/this->owner().gases()[i].W();
+        Winv += Y/this->owner().carrierSpecies()[i].W();
+        Xc[i] = Y/this->owner().carrierSpecies()[i].W();
     }
 
     return Xc/Winv;

From 04b673aada06c0417df2ff076ce7361a2f88639f Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 18 May 2009 17:01:20 +0100
Subject: [PATCH 138/175] added new models

---
 .../makeCoalParcelSurfaceReactionModels.C          | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelSurfaceReactionModels.C b/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelSurfaceReactionModels.C
index 603cd1d25d..ee25d721f3 100644
--- a/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelSurfaceReactionModels.C
+++ b/src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelSurfaceReactionModels.C
@@ -28,6 +28,8 @@ License
 #include "ReactingMultiphaseCloud.H"
 
 #include "NoSurfaceReaction.H"
+#include "COxidationDiffusionLimitedRate.H"
+#include "COxidationKineticDiffusionLimitedRate.H"
 #include "COxidationMurphyShaddix.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -44,6 +46,18 @@ namespace Foam
         coalParcel
     );
     makeSurfaceReactionModelTypeInstance
+    (
+        COxidationDiffusionLimitedRate,
+        ReactingMultiphaseCloud,
+        coalParcel
+    );
+    makeSurfaceReactionModelTypeInstance
+    (
+        COxidationKineticDiffusionLimitedRate,
+        ReactingMultiphaseCloud,
+        coalParcel
+    );
+    makeSurfaceReactionModelTypeInstance
     (
         COxidationMurphyShaddix,
         ReactingMultiphaseCloud,

From c7d2bbec327e73f86da93c3893d173a4b6ec0f26 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 18 May 2009 17:01:58 +0100
Subject: [PATCH 139/175] updates

---
 .../COxidationDiffusionLimitedRate.C          |  8 +--
 .../COxidationKineticDiffusionLimitedRate.C   |  8 +--
 .../COxidationMurphyShaddix.C                 | 50 +++++++++----------
 .../COxidationMurphyShaddix.H                 |  4 --
 4 files changed, 31 insertions(+), 39 deletions(-)

diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
index e36fd1cbfd..05daafb403 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
@@ -59,10 +59,10 @@ Foam::COxidationDiffusionLimitedRate::COxidationDiffusionLimitedRate
     CsLocalId_ = owner.composition().localId(idSolid, "C");
 
     // Set local copies of thermo properties
-    WO2_ = owner().composition().gases()[O2GlobalId_].W();
-    scalar WCO2 = owner().composition().gases()[CO2GlobalId_].W();
+    WO2_ = owner().composition().carrierSpecies()[O2GlobalId_].W();
+    scalar WCO2 = owner().composition().carrierSpecies()[CO2GlobalId_].W();
     WC_ = WCO2 - WO2_;
-    HcCO2_ = owner().composition().gases()[CO2GlobalId_].Hc();
+    HcCO2_ = owner().composition().carrierSpecies()[CO2GlobalId_].Hc();
 
     if (Sb_ < 0)
     {
@@ -138,7 +138,7 @@ Foam::scalar Foam::COxidationDiffusionLimitedRate::calculate
     const scalar dmO2 = dmC/WC_*Sb_*WO2_;
 
     // Mass of newly created CO2 [kg]
-    const scalar dmCO2 = dmC + dmO2; 
+    const scalar dmCO2 = dmC + dmO2;
 
     // Update local particle C mass
     dMassSolid[CsLocalId_] += dmC;
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
index a58094f29e..77e6ebee6a 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
@@ -62,10 +62,10 @@ COxidationKineticDiffusionLimitedRate
     CsLocalId_ = owner.composition().localId(idSolid, "C");
 
     // Set local copies of thermo properties
-    WO2_ = owner().composition().gases()[O2GlobalId_].W();
-    scalar WCO2 = owner().composition().gases()[CO2GlobalId_].W();
+    WO2_ = owner().composition().carrierSpecies()[O2GlobalId_].W();
+    scalar WCO2 = owner().composition().carrierSpecies()[CO2GlobalId_].W();
     WC_ = WCO2 - WO2_;
-    HcCO2_ = owner().composition().gases()[CO2GlobalId_].Hc();
+    HcCO2_ = owner().composition().carrierSpecies()[CO2GlobalId_].Hc();
 
     if (Sb_ < 0)
     {
@@ -150,7 +150,7 @@ Foam::scalar Foam::COxidationKineticDiffusionLimitedRate::calculate
     const scalar dmO2 = dmC/WC_*Sb_*WO2_;
 
     // Mass of newly created CO2 [kg]
-    const scalar dmCO2 = dmC + dmO2; 
+    const scalar dmCO2 = dmC + dmO2;
 
     // Update local particle C mass
     dMassSolid[CsLocalId_] += dmC;
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
index 10deb09404..3b038010f7 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
@@ -47,17 +47,16 @@ Foam::COxidationMurphyShaddix::COxidationMurphyShaddix
         owner,
         typeName
     ),
-    coeffDict_(dict.subDict(typeName + "Coeffs")),
-    D0_(dimensionedScalar(coeffDict_.lookup("D0")).value()),
-    rho0_(dimensionedScalar(coeffDict_.lookup("rho0")).value()),
-    T0_(dimensionedScalar(coeffDict_.lookup("T0")).value()),
-    Dn_(dimensionedScalar(coeffDict_.lookup("Dn")).value()),
-    A_(dimensionedScalar(coeffDict_.lookup("A")).value()),
-    E_(dimensionedScalar(coeffDict_.lookup("E")).value()),
-    n_(dimensionedScalar(coeffDict_.lookup("n")).value()),
-    WVol_(dimensionedScalar(coeffDict_.lookup("WVol")).value()),
-    dH0_(dimensionedScalar(coeffDict_.lookup("dH0")).value()),
-    TMaxdH_(dimensionedScalar(coeffDict_.lookup("TmaxdH")).value()),
+    D0_(dimensionedScalar(this->coeffDict().lookup("D0")).value()),
+    rho0_(dimensionedScalar(this->coeffDict().lookup("rho0")).value()),
+    T0_(dimensionedScalar(this->coeffDict().lookup("T0")).value()),
+    Dn_(dimensionedScalar(this->coeffDict().lookup("Dn")).value()),
+    A_(dimensionedScalar(this->coeffDict().lookup("A")).value()),
+    E_(dimensionedScalar(this->coeffDict().lookup("E")).value()),
+    n_(dimensionedScalar(this->coeffDict().lookup("n")).value()),
+    WVol_(dimensionedScalar(this->coeffDict().lookup("WVol")).value()),
+    dH0_(dimensionedScalar(this->coeffDict().lookup("dH0")).value()),
+    TMaxdH_(dimensionedScalar(this->coeffDict().lookup("TmaxdH")).value()),
     CsLocalId_(-1),
     O2GlobalId_(-1),
     CO2GlobalId_(-1)
@@ -138,16 +137,17 @@ Foam::scalar Foam::COxidationMurphyShaddix::calculate
     const scalar D = D0_*(rho0_/rhoc)*pow(Tc/T0_, Dn_);
 
     // Molecular weight of O2 [kg/kmol]
-    const scalar WO2 = owner().composition().gases()[O2GlobalId_].W();
+    const scalar WO2 = owner().composition().carrierSpecies()[O2GlobalId_].W();
 
     // Molecular weight of CO2 [kg/kmol]
-    const scalar WCO2 = owner().composition().gases()[CO2GlobalId_].W();
+    const scalar WCO2 =
+        owner().composition().carrierSpecies()[CO2GlobalId_].W();
 
     // Molecular weight of C [kg/kmol]
     const scalar WC = WCO2 - WO2;
 
     // Far field partial pressure O2 [Pa]
-    const scalar PO2 = rhoO2/WO2*specie::RR*Tc;
+    const scalar ppO2 = rhoO2/WO2*specie::RR*Tc;
 
     // Molar emission rate of volatiles per unit surface area
     const scalar qVol = sum(dMassVolatile)/(WVol_*Ap);
@@ -157,23 +157,19 @@ Foam::scalar Foam::COxidationMurphyShaddix::calculate
 
     if (debug)
     {
-        Pout << "   C = " << C << endl;
+        Pout<< "mass  = " << mass << nl
+            << "fComb = " << fComb << nl
+            << "WC    = " << WC << nl
+            << "Ap    = " << Ap << nl
+            << "dt    = " << dt << nl
+            << "C     = " << C << nl
+            << endl;
     }
 
     // Molar reaction rate per unit surface area [kmol/(m^2.s)]
     scalar qCsOld = 0;
     scalar qCs = 1;
 
-    if (debug)
-    {
-        Pout<< "mass  = " << mass << nl
-            << "fComb = " << fComb << nl
-            << "WC    = " << WC << nl
-            << "Ap    = " << Ap << nl
-            << "dt    = " << dt
-            << nl << endl;
-    }
-
     const scalar qCsLim = mass*fComb/(WC*Ap*dt);
 
     if (debug)
@@ -182,10 +178,10 @@ Foam::scalar Foam::COxidationMurphyShaddix::calculate
     }
 
     label iter = 0;
-    while ((fabs(qCs - qCsOld)/qCs>tolerance_) && (iter<=maxIters_))
+    while ((mag(qCs - qCsOld)/qCs > tolerance_) && (iter <= maxIters_))
     {
         qCsOld = qCs;
-        const scalar PO2Surface = PO2*exp(-(qCs + qVol)*d/(2*C*D));
+        const scalar PO2Surface = ppO2*exp(-(qCs + qVol)*d/(2*C*D));
         qCs = A_*exp(-E_/(specie::RR*T))*pow(PO2Surface, n_);
         qCs = (100.0*qCs + iter*qCsOld)/(100.0 + iter);
         qCs = min(qCs, qCsLim);
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H
index 06bf1f404b..7f972fc666 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H
@@ -51,10 +51,6 @@ class COxidationMurphyShaddix
 {
     // Private data
 
-        //- Coefficients dictionary
-        const dictionary& coeffDict_;
-
-
         // Model constants
 
             //- Reference diffusion constant

From f6108ac023a58636f4d2b95078baa67780c8c177 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 18 May 2009 17:04:50 +0100
Subject: [PATCH 140/175] updated copyright notices

---
 .../COxidationDiffusionLimitedRate.C                            | 2 +-
 .../COxidationDiffusionLimitedRate.H                            | 2 +-
 .../COxidationKineticDiffusionLimitedRate.C                     | 2 +-
 .../COxidationKineticDiffusionLimitedRate.H                     | 2 +-
 .../COxidationMurphyShaddix/COxidationMurphyShaddix.C           | 2 +-
 .../COxidationMurphyShaddix/COxidationMurphyShaddix.H           | 2 +-
 .../FieldActivatedInjection/FieldActivatedInjection.C           | 2 +-
 .../FieldActivatedInjection/FieldActivatedInjection.H           | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
index 05daafb403..2212358bef 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H
index 3ce6b7cbad..888dac441a 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
index 77e6ebee6a..e4001dc858 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H
index 9bbed296f1..6939bf1935 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
index 3b038010f7..c9e5ddfa49 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H
index 7f972fc666..5811fc085c 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
index b6662e0c92..0e8de06206 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
index e82074bc6b..33ee4c2d25 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 2f5178f60c99c02c9b5287f0627ab51fe7e006f9 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 18 May 2009 18:05:17 +0100
Subject: [PATCH 141/175] updates

---
 src/lagrangian/coalCombustion/Make/files      |  3 +++
 .../COxidationDiffusionLimitedRate.C          |  6 ++---
 .../COxidationDiffusionLimitedRate.H          | 24 +++++++++----------
 .../COxidationKineticDiffusionLimitedRate.C   |  6 ++---
 .../COxidationKineticDiffusionLimitedRate.H   | 24 +++++++++----------
 5 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/src/lagrangian/coalCombustion/Make/files b/src/lagrangian/coalCombustion/Make/files
index b4af07a35d..c8fb192aea 100755
--- a/src/lagrangian/coalCombustion/Make/files
+++ b/src/lagrangian/coalCombustion/Make/files
@@ -13,6 +13,9 @@ coalParcel/submodels/makeCoalParcelHeatTransferModels.C
 coalParcel/submodels/makeCoalParcelPhaseChangeModels.C
 coalParcel/submodels/makeCoalParcelSurfaceReactionModels.C
 coalParcel/submodels/makeCoalParcelWallInteractionModels.C
+
+submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
+submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
 submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
 
 
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
index 2212358bef..516554874c 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
@@ -59,10 +59,10 @@ Foam::COxidationDiffusionLimitedRate::COxidationDiffusionLimitedRate
     CsLocalId_ = owner.composition().localId(idSolid, "C");
 
     // Set local copies of thermo properties
-    WO2_ = owner().composition().carrierSpecies()[O2GlobalId_].W();
-    scalar WCO2 = owner().composition().carrierSpecies()[CO2GlobalId_].W();
+    WO2_ = owner.composition().carrierSpecies()[O2GlobalId_].W();
+    scalar WCO2 = owner.composition().carrierSpecies()[CO2GlobalId_].W();
     WC_ = WCO2 - WO2_;
-    HcCO2_ = owner().composition().carrierSpecies()[CO2GlobalId_].Hc();
+    HcCO2_ = owner.composition().carrierSpecies()[CO2GlobalId_].Hc();
 
     if (Sb_ < 0)
     {
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H
index 888dac441a..4458a6e31e 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H
@@ -63,18 +63,6 @@ class COxidationDiffusionLimitedRate
             const scalar D_;
 
 
-        // Local copies of thermo properties
-
-            //- Molecular weight of C [kg/kmol]
-            scalar WC_;
-
-            //- Molecular weight of O2 [kg/kmol]
-            scalar WO2_;
-
-            //- Chemical enthalpy of CO2 [J/kg]
-            scalar HcCO2_;
-
-
         // Addressing
 
             //- Cs positions in global/local lists
@@ -87,6 +75,18 @@ class COxidationDiffusionLimitedRate
             label CO2GlobalId_;
 
 
+        // Local copies of thermo properties
+
+            //- Molecular weight of C [kg/kmol]
+            scalar WC_;
+
+            //- Molecular weight of O2 [kg/kmol]
+            scalar WO2_;
+
+            //- Chemical enthalpy of CO2 [J/kg]
+            scalar HcCO2_;
+
+
 public:
 
     //- Runtime type information
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
index e4001dc858..eb44c6391a 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
@@ -62,10 +62,10 @@ COxidationKineticDiffusionLimitedRate
     CsLocalId_ = owner.composition().localId(idSolid, "C");
 
     // Set local copies of thermo properties
-    WO2_ = owner().composition().carrierSpecies()[O2GlobalId_].W();
-    scalar WCO2 = owner().composition().carrierSpecies()[CO2GlobalId_].W();
+    WO2_ = owner.composition().carrierSpecies()[O2GlobalId_].W();
+    scalar WCO2 = owner.composition().carrierSpecies()[CO2GlobalId_].W();
     WC_ = WCO2 - WO2_;
-    HcCO2_ = owner().composition().carrierSpecies()[CO2GlobalId_].Hc();
+    HcCO2_ = owner.composition().carrierSpecies()[CO2GlobalId_].Hc();
 
     if (Sb_ < 0)
     {
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H
index 6939bf1935..1073cb637f 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H
@@ -70,18 +70,6 @@ class COxidationKineticDiffusionLimitedRate
             const scalar E_;
 
 
-        // Local copies of thermo properties
-
-            //- Molecular weight of C [kg/kmol]
-            scalar WC_;
-
-            //- Molecular weight of O2 [kg/kmol]
-            scalar WO2_;
-
-            //- Chemical enthalpy of CO2 [J/kg]
-            scalar HcCO2_;
-
-
         // Addressing
 
             //- Cs positions in global/local lists
@@ -94,6 +82,18 @@ class COxidationKineticDiffusionLimitedRate
             label CO2GlobalId_;
 
 
+        // Local copies of thermo properties
+
+            //- Molecular weight of C [kg/kmol]
+            scalar WC_;
+
+            //- Molecular weight of O2 [kg/kmol]
+            scalar WO2_;
+
+            //- Chemical enthalpy of CO2 [J/kg]
+            scalar HcCO2_;
+
+
 public:
 
     //- Runtime type information

From 98fc11e827dae01d4fa1e9486c1f55acde58c5a3 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 18 May 2009 19:02:16 +0100
Subject: [PATCH 142/175] added pre-factor for reference field

---
 .../FieldActivatedInjection.C                 |  3 ++-
 .../FieldActivatedInjection.H                 | 20 ++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
index 0e8de06206..fb241b2f45 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
@@ -75,6 +75,7 @@ Foam::FieldActivatedInjection<CloudType>::FieldActivatedInjection
 )
 :
     InjectionModel<CloudType>(dict, owner, typeName),
+    factor_(readScalar(this->coeffDict().lookup("factor"))),
     referenceField_
     (
         owner.db().objectRegistry::lookupObject<volScalarField>
@@ -212,7 +213,7 @@ bool Foam::FieldActivatedInjection<CloudType>::validInjection
     if
     (
          nParcelsInjected_[parcelI] < nParcelsPerInjector_
-      && referenceField_[cellI] > thresholdField_[cellI]
+      && factor_*referenceField_[cellI] > thresholdField_[cellI]
     )
     {
         nParcelsInjected_[parcelI]++;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
index 33ee4c2d25..194add8ca9 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
@@ -26,15 +26,18 @@ Class
     Foam::FieldActivatedInjection
 
 Description
-    Injection at specified positions, with the condition that for injection
-    to be allowed
+    Injection at specified positions, with the conditions:
 
-        referenceField[cellI] >= thresholdField[cellI]
+    - for injection to be allowed
 
-    where:
-      - referenceField is the field used to supply the look-up values
-      - thresholdField supplies the values beyond which the injection is
-        permitted
+        factor*referenceField[cellI] >= thresholdField[cellI]
+
+        where:
+          - referenceField is the field used to supply the look-up values
+          - thresholdField supplies the values beyond which the injection is
+            permitted
+
+    - limited to a user-supllied number of injections per injector location
 
 SourceFiles
     FieldActivatedInjection.C
@@ -66,6 +69,9 @@ class FieldActivatedInjection
 
         // Model parameters
 
+            //- Factor to apply to reference field
+            const scalar factor_;
+
             //- Reference field
             const volScalarField& referenceField_;
 

From 8883e2b87e8873d05b5935af033454c531d8af16 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 19 May 2009 15:03:00 +0100
Subject: [PATCH 143/175] fixed: wrong calculation of H1

---
 .../intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
index 6a476110dd..5885512511 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -110,7 +110,7 @@ void Foam::ThermoParcel<ParcelType>::calc
     scalar T1 = calcHeatTransfer(td, dt, cellI, d0, U0, rho0, T0, cp0, Sh);
 
     // Calculate new enthalpy state
-    scalar H1 = cp0 - T1;
+    scalar H1 = cp0*T1;
 
 
     // Motion

From 2ca4831e61fadd7a02022b6f6dae0e95d6cd2b48 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 19 May 2009 15:06:43 +0100
Subject: [PATCH 144/175] multiple updates

---
 .../ReactingMultiphaseParcel.C                | 17 +++++----
 .../ReactingMultiphaseParcelI.H               |  3 +-
 .../ReactingMultiphaseParcelIO.C              | 12 ++----
 .../Templates/ReactingParcel/ReactingParcel.C |  5 ++-
 .../phaseProperties/phaseProperties.C         | 36 +++++++++---------
 .../phaseProperties/phaseProperties.H         | 14 +++----
 .../phaseProperties/phasePropertiesIO.C       |  6 +--
 .../CompositionModel/CompositionModel.C       | 37 +++++++++++++++++--
 .../CompositionModel/CompositionModel.H       |  7 +++-
 9 files changed, 85 insertions(+), 52 deletions(-)

diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 4d4eae98fb..3ad7743863 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -341,19 +341,19 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
         // Transfer mass lost from particle to carrier mass source
         forAll(YGas_, i)
         {
-            label id = td.cloud().composition().localToGlobalGasId(GAS, i);
+            label id = td.cloud().composition().localToGlobalCarrierId(GAS, i);
             td.cloud().rhoTrans(id)[cellI] += np0*dMassGas[i];
         }
         forAll(YLiquid_, i)
         {
-            label id = td.cloud().composition().localToGlobalGasId(LIQ, i);
+            label id = td.cloud().composition().localToGlobalCarrierId(LIQ, i);
             td.cloud().rhoTrans(id)[cellI] += np0*dMassLiquid[i];
         }
 /*
         // No mapping between solid components and carrier phase
         forAll(YSolid_, i)
         {
-            label id = td.cloud().composition().localToGlobalGasId(SLD, i);
+            label id = td.cloud().composition().localToGlobalCarrierId(SLD, i);
             td.cloud().rhoTrans(id)[cellI] += np0*dMassSolid[i];
         }
 */
@@ -385,12 +385,14 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
             // Absorb parcel into carrier phase
             forAll(YGas_, i)
             {
-                label id = td.cloud().composition().localToGlobalGasId(GAS, i);
+                label id =
+                    td.cloud().composition().localToGlobalCarrierId(GAS, i);
                 td.cloud().rhoTrans(id)[cellI] += np0*mass1*YMix[GAS]*YGas_[i];
             }
             forAll(YLiquid_, i)
             {
-                label id = td.cloud().composition().localToGlobalGasId(LIQ, i);
+                label id =
+                    td.cloud().composition().localToGlobalCarrierId(LIQ, i);
                 td.cloud().rhoTrans(id)[cellI] +=
                     np0*mass1*YMix[LIQ]*YLiquid_[i];
             }
@@ -398,13 +400,14 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
             // No mapping between solid components and carrier phase
             forAll(YSolid_, i)
             {
-                label id = td.cloud().composition().localToGlobalGasId(SLD, i);
+                label id =
+                    td.cloud().composition().localToGlobalCarrierId(SLD, i);
                 td.cloud().rhoTrans(id)[cellI] +=
                     np0*mass1*YMix[SLD]*YSolid_[i];
             }
 */
-            td.cloud().hsTrans()[cellI] += np0*mass1*H1;
             td.cloud().UTrans()[cellI] += np0*mass1*U1;
+            td.cloud().hsTrans()[cellI] += np0*mass1*H1;
         }
     }
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
index 9709da663d..ef40cdc994 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
@@ -104,7 +104,8 @@ inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
     ),
     YGas_(YGas0),
     YLiquid_(YLiquid0),
-    YSolid_(YSolid0)
+    YSolid_(YSolid0),
+    canCombust_(false)
 {}
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
index b37f7c715e..bbf58e49a0 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
@@ -40,7 +40,8 @@ Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
     ReactingParcel<ParcelType>(cloud, is, readFields),
     YGas_(0),
     YLiquid_(0),
-    YSolid_(0)
+    YSolid_(0),
+    canCombust_(false)
 {
     if (readFields)
     {
@@ -58,14 +59,7 @@ Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
         YLiquid_.setSize(nLiquid);
         YSolid_.setSize(nSolid);
 
-        if (is.format() == IOstream::ASCII)
-        {
-            is >> YGas_ >> YLiquid_ >> YSolid_;
-        }
-        else
-        {
-            is >> YGas_ >> YLiquid_ >> YSolid_;
-        }
+        is >> YGas_ >> YLiquid_ >> YSolid_;
 
         // scale the mass fractions
         const scalarField& YMix = this->Y_;
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index 3ea161f28f..39658fcf2f 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -187,7 +187,7 @@ void Foam::ReactingParcel<ParcelType>::calc
         // Transfer mass lost from particle to carrier mass source
         forAll(dMassPC, i)
         {
-            label id = td.cloud().composition().localToGlobalGasId(0, i);
+            label id = td.cloud().composition().localToGlobalCarrierId(0, i);
             td.cloud().rhoTrans(id)[cellI] += np0*dMassPC[i];
         }
 
@@ -210,7 +210,8 @@ void Foam::ReactingParcel<ParcelType>::calc
             // Absorb parcel into carrier phase
             forAll(Y_, i)
             {
-                label id = td.cloud().composition().localToGlobalGasId(0, i);
+                label id =
+                    td.cloud().composition().localToGlobalCarrierId(0, i);
                 td.cloud().rhoTrans(id)[cellI] += np0*mass1*Y_[i];
             }
             td.cloud().UTrans()[cellI] += np0*mass1*U1;
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
index 1da9161508..eb451ba36f 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
@@ -63,22 +63,22 @@ void Foam::phaseProperties::setGlobalIds
         }
         if (globalIds_[i] == -1)
         {
-            wordList globalGasNames(YGas.size());
+            wordList globalCarrierNames(YGas.size());
 
             forAll (YGas, k)
             {
-                globalGasNames[k] = YGas[k].name();
+                globalCarrierNames[k] = YGas[k].name();
             }
 
             FatalErrorIn
             (
-                "void phaseProperties::setGlobalGasIds"
+                "void phaseProperties::setGlobalIds"
                 "("
                     "const PtrList<volScalarField>&"
                 ")"
-            )   << "Could not find gas species " << names_[i]
+            )   << "Could not find carrier species " << names_[i]
                 << " in species list" <<  nl
-                << "Available species are: " << nl << globalGasNames << nl
+                << "Available species are: " << nl << globalCarrierNames << nl
                 << exit(FatalError);
         }
     }
@@ -111,11 +111,13 @@ void Foam::phaseProperties::setGlobalIds(const wordList& globalNames)
 }
 
 
-void Foam::phaseProperties::setGlobalGasIds
+void Foam::phaseProperties::setGlobalCarrierIds
 (
     const PtrList<volScalarField>& YGas
 )
 {
+    globalCarrierIds_ = -1;
+
     forAll(names_, i)
     {
         forAll (YGas, j)
@@ -124,11 +126,11 @@ void Foam::phaseProperties::setGlobalGasIds
 
             if (specieName == names_[i])
             {
-                globalGasIds_[i] = j;
+                globalCarrierIds_[i] = j;
                 break;
             }
         }
-        if (globalGasIds_[i] == -1)
+        if (globalCarrierIds_[i] == -1)
         {
             wordList gasNames(YGas.size());
             forAll(YGas, gasI)
@@ -138,7 +140,7 @@ void Foam::phaseProperties::setGlobalGasIds
 
             FatalErrorIn
             (
-                "void Foam::phaseProperties::setGlobalGasIds"
+                "void Foam::phaseProperties::setGlobalCarrierIds"
                 "("
                     "const PtrList<volScalarField>&"
                 ")"
@@ -215,7 +217,7 @@ Foam::phaseProperties::phaseProperties()
     names_(0),
     Y_(0),
     globalIds_(0),
-    globalGasIds_(0)
+    globalCarrierIds_(0)
 {}
 
 
@@ -226,7 +228,7 @@ Foam::phaseProperties::phaseProperties(const phaseProperties& pp)
     names_(pp.names_),
     Y_(pp.Y_),
     globalIds_(pp.globalIds_),
-    globalGasIds_(pp.globalGasIds_)
+    globalCarrierIds_(pp.globalCarrierIds_)
 {}
 
 
@@ -252,16 +254,16 @@ void Foam::phaseProperties::initialiseGlobalIds
         case GAS:
         {
             setGlobalIds(YGas);
-            forAll(globalGasIds_, i)
+            forAll(globalCarrierIds_, i)
             {
-                globalGasIds_[i] = globalIds_[i];
+                globalCarrierIds_[i] = globalIds_[i];
             }
             break;
         }
         case LIQUID:
         {
             setGlobalIds(liquidNames);
-            setGlobalGasIds(YGas);
+            setGlobalCarrierIds(YGas);
             break;
         }
         case SOLID:
@@ -272,7 +274,7 @@ void Foam::phaseProperties::initialiseGlobalIds
                 "phaseProperties::initialiseGlobalIds(...)"
             )   << "Assuming no mapping between solid and carrier species"
                 << endl;
-//            setGlobalGasIds(YGas);
+//            setGlobalCarrierIds(YGas);
             break;
         }
         default:
@@ -383,9 +385,9 @@ const Foam::labelList& Foam::phaseProperties::globalIds() const
 }
 
 
-const Foam::labelList& Foam::phaseProperties::globalGasIds() const
+const Foam::labelList& Foam::phaseProperties::globalCarrierIds() const
 {
-    return globalGasIds_;
+    return globalCarrierIds_;
 }
 
 
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
index be45bc51ca..c87f51b7a0 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
@@ -88,21 +88,21 @@ private:
         //- Global ids
         labelList globalIds_;
 
-        //- Map to gas global id
-        labelList globalGasIds_;
+        //- Map to carrier global id
+        labelList globalCarrierIds_;
 
 
     // Private member functions
 
-        //- Set global ids - specialisation for carrier gas phases
+        //- Set global ids - specialisation for carrier phases
         void setGlobalIds(const PtrList<volScalarField>& YGas);
 
         //- Set global ids - liquid and solid phases
         void setGlobalIds(const wordList& globalNames);
 
-        //- Set global gas ids - attempts to map component names to global
+        //- Set global carrier ids - attempts to map component names to global
         //  carrier species
-        void setGlobalGasIds(const PtrList<volScalarField>& YGas);
+        void setGlobalCarrierIds(const PtrList<volScalarField>& YGas);
 
         //- Check the total mass fraction
         void checkTotalMassFraction() const;
@@ -166,8 +166,8 @@ public:
             //- Return const acccess to the global ids
             const labelList& globalIds() const;
 
-            //- Return const acccess to the map to the gas global ids
-            const labelList& globalGasIds() const;
+            //- Return const acccess to the map to the carrier global ids
+            const labelList& globalCarrierIds() const;
 
             //- Return the global id of a component in the local list by name
             //  Returns -1 if not found
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
index 18da442052..2fbb79039b 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
@@ -36,7 +36,7 @@ Foam::phaseProperties::phaseProperties(Istream& is)
     names_(0),
     Y_(0),
     globalIds_(0),
-    globalGasIds_(0)
+    globalCarrierIds_(0)
 {
     is.check("Foam::phaseProperties::phaseProperties(Istream& is)");
 
@@ -51,7 +51,7 @@ Foam::phaseProperties::phaseProperties(Istream& is)
         names_.setSize(nComponents, "unknownSpecie");
         Y_.setSize(nComponents, 0.0);
         globalIds_.setSize(nComponents, -1);
-        globalGasIds_.setSize(nComponents, -1);
+        globalCarrierIds_.setSize(nComponents, -1);
 
         label cmptI = 0;
         forAllConstIter(IDLList<entry>, phaseInfo, iter)
@@ -87,7 +87,7 @@ Foam::Istream& Foam::operator>>(Istream& is, phaseProperties& pp)
         pp.names_.setSize(nComponents, "unknownSpecie");
         pp.Y_.setSize(nComponents, 0.0);
         pp.globalIds_.setSize(nComponents, -1);
-        pp.globalGasIds_.setSize(nComponents, -1);
+        pp.globalCarrierIds_.setSize(nComponents, -1);
 
         label cmptI = 0;
         forAllConstIter(IDLList<entry>, phaseInfo, iter)
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
index 1bbdc5221f..4336b72baa 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
@@ -178,6 +178,34 @@ Foam::CompositionModel<CloudType>::componentNames(const label phaseI) const
 }
 
 
+template<class CloudType>
+Foam::label Foam::CompositionModel<CloudType>::globalCarrierId
+(
+    const word& cmptName
+) const
+{
+    forAll(carrierThermo_.composition().Y(), i)
+    {
+        word carrierSpecieName = carrierThermo_.composition().Y()[i].name();
+        if (cmptName == carrierSpecieName)
+        {
+            return i;
+        }
+    }
+
+    FatalErrorIn
+    (
+        "Foam::label Foam::CompositionModel<CloudType>::globalCarrierId"
+        "("
+            "const word&"
+        ") const"
+    )   << "Unable to determine global id for requested component "
+        << cmptName << nl << abort(FatalError);
+
+    return -1;
+}
+
+
 template<class CloudType>
 Foam::label Foam::CompositionModel<CloudType>::globalId
 (
@@ -241,24 +269,25 @@ Foam::label Foam::CompositionModel<CloudType>::localId
 
 
 template<class CloudType>
-Foam::label Foam::CompositionModel<CloudType>::localToGlobalGasId
+Foam::label Foam::CompositionModel<CloudType>::localToGlobalCarrierId
 (
     const label phaseI,
     const label id
 ) const
 {
-    label gid = phaseProps_[phaseI].globalGasIds()[id];
+    label gid = phaseProps_[phaseI].globalCarrierIds()[id];
 
     if (gid < 0)
     {
         FatalErrorIn
         (
-            "Foam::label Foam::CompositionModel<CloudType>::localToGlobalGasId"
+            "Foam::label "
+            "Foam::CompositionModel<CloudType>::localToGlobalCarrierId"
             "("
                 "const label, "
                 "const label"
             ") const"
-        )   << "Unable to determine global gas id for phase "
+        )   << "Unable to determine global carrier id for phase "
             << phaseI << " with local id " << id
             << nl << abort(FatalError);
     }
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
index e45f7d96d0..8fb8762cf0 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
@@ -179,6 +179,9 @@ public:
                 //- Return the list of component names for phaseI
                 const wordList& componentNames(const label phaseI) const;
 
+                //- Return global id of component cmptName in carrier thermo
+                label globalCarrierId(const word& cmptName) const;
+
                 //- Return global id of component cmptName in phase phaseI
                 label globalId(const label phaseI, const word& cmptName) const;
 
@@ -188,8 +191,8 @@ public:
                 //- Return local id of component cmptName in phase phaseI
                 label localId(const label phaseI, const word& cmptName) const;
 
-                //- Return global gas id of component given local id
-                label localToGlobalGasId
+                //- Return global carrier id of component given local id
+                label localToGlobalCarrierId
                 (
                     const label phaseI,
                     const label id

From 868e2e4096bcd240855b3bab867192998e9fc308 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 19 May 2009 10:02:53 +0100
Subject: [PATCH 145/175] adding path to meshTools/lnInclude

---
 .../Lagrangian/uncoupledKinematicParcelFoam/Make/options       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/applications/solvers/Lagrangian/uncoupledKinematicParcelFoam/Make/options b/applications/solvers/Lagrangian/uncoupledKinematicParcelFoam/Make/options
index c9727abd52..818e371778 100644
--- a/applications/solvers/Lagrangian/uncoupledKinematicParcelFoam/Make/options
+++ b/applications/solvers/Lagrangian/uncoupledKinematicParcelFoam/Make/options
@@ -6,7 +6,8 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
     -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
 
 EXE_LIBS = \
     -llagrangian \

From 6f68f6fb20b6a4cc96af0173833f37bceba972c6 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 18 May 2009 19:36:31 +0100
Subject: [PATCH 146/175] typo - missing ()'s

---
 .../ReactingMultiphaseParcel/ReactingMultiphaseParcel.C         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 3ad7743863..7c2fd37583 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -176,7 +176,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::cellValueSourceCorrection
 
     const scalar fCarrier = -1.0/td.constProps().hRetentionCoeff();
     const scalar dh =
-        td.cloud().hsTrans()[cellI] + fCarrier*td.cloud().hcTrans[cellI];
+        td.cloud().hsTrans()[cellI] + fCarrier*td.cloud().hcTrans()[cellI];
 
     this->Tc_ += dh/(this->cpc_*massCellNew);
 }

From f2f7b74f0341fe546753ecd3cdb252be5ebd4493 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 18 May 2009 19:02:16 +0100
Subject: [PATCH 147/175] added pre-factor for reference field

---
 .../FieldActivatedInjection.C                 |  3 ++-
 .../FieldActivatedInjection.H                 | 20 ++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
index b6662e0c92..b02e642ff1 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
@@ -75,6 +75,7 @@ Foam::FieldActivatedInjection<CloudType>::FieldActivatedInjection
 )
 :
     InjectionModel<CloudType>(dict, owner, typeName),
+    factor_(readScalar(this->coeffDict().lookup("factor"))),
     referenceField_
     (
         owner.db().objectRegistry::lookupObject<volScalarField>
@@ -212,7 +213,7 @@ bool Foam::FieldActivatedInjection<CloudType>::validInjection
     if
     (
          nParcelsInjected_[parcelI] < nParcelsPerInjector_
-      && referenceField_[cellI] > thresholdField_[cellI]
+      && factor_*referenceField_[cellI] > thresholdField_[cellI]
     )
     {
         nParcelsInjected_[parcelI]++;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
index e82074bc6b..e28604b0e4 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
@@ -26,15 +26,18 @@ Class
     Foam::FieldActivatedInjection
 
 Description
-    Injection at specified positions, with the condition that for injection
-    to be allowed
+    Injection at specified positions, with the conditions:
 
-        referenceField[cellI] >= thresholdField[cellI]
+    - for injection to be allowed
 
-    where:
-      - referenceField is the field used to supply the look-up values
-      - thresholdField supplies the values beyond which the injection is
-        permitted
+        factor*referenceField[cellI] >= thresholdField[cellI]
+
+        where:
+          - referenceField is the field used to supply the look-up values
+          - thresholdField supplies the values beyond which the injection is
+            permitted
+
+    - limited to a user-supllied number of injections per injector location
 
 SourceFiles
     FieldActivatedInjection.C
@@ -66,6 +69,9 @@ class FieldActivatedInjection
 
         // Model parameters
 
+            //- Factor to apply to reference field
+            const scalar factor_;
+
             //- Reference field
             const volScalarField& referenceField_;
 

From a723b85abdd2908063f5d273a053ec0d620499cc Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 18 May 2009 19:04:04 +0100
Subject: [PATCH 148/175] updates to enable requested field activated injection

---
 .../coalChemistryFoam/coalChemistryFoam.C     |  5 +++-
 .../coalChemistryFoam/createFields.H          | 30 +++++--------------
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/applications/solvers/combustion/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/combustion/coalChemistryFoam/coalChemistryFoam.C
index 4b28e3b37f..142eb51a2f 100644
--- a/applications/solvers/combustion/coalChemistryFoam/coalChemistryFoam.C
+++ b/applications/solvers/combustion/coalChemistryFoam/coalChemistryFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,6 +76,9 @@ int main(int argc, char *argv[])
 
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
+        rhoEffLagrangian = coalParcels.rhoEff() + limestoneParcels.rhoEff();
+        pDyn = 0.5*rho*magSqr(U);
+
         Info << "Evolving coal cloud" << endl;
 
         coalParcels.evolve();
diff --git a/applications/solvers/combustion/coalChemistryFoam/createFields.H b/applications/solvers/combustion/coalChemistryFoam/createFields.H
index 0cc8632562..9c10e89164 100644
--- a/applications/solvers/combustion/coalChemistryFoam/createFields.H
+++ b/applications/solvers/combustion/coalChemistryFoam/createFields.H
@@ -28,50 +28,36 @@
         thermo->rho()
     );
 
-// lagrangian coal density field
-/*    volScalarField rholc
+    // lagrangian effective density field - used externally (optional)
+    volScalarField rhoEffLagrangian
     (
         IOobject
         (
-            "rholc",
+            "rhoEffLagrangian",
             runTime.timeName(),
             mesh,
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
         mesh,
-        dimensionedScalar("zero", dimensionSet(1, -3, 0, 0, 0, 0, 0), 0.0)
+        dimensionedScalar("zero", dimDensity, 0.0)
     );
 
-// lagrangian limestone density field
-    volScalarField rhols
+    // dynamic pressure field - used externally (optional)
+    volScalarField pDyn
     (
         IOobject
         (
-            "rhols",
+            "injectionIndicator",
             runTime.timeName(),
             mesh,
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
         mesh,
-        dimensionedScalar("zero", dimensionSet(1, -3, 0, 0, 0, 0, 0), 0.0)
+        dimensionedScalar("zero", dimPressure, 0.0)
     );
 
-// lagrangian total density field
-    volScalarField rhol
-    (
-        IOobject
-        (
-            "rhol",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh,
-        dimensionedScalar("zero", dimensionSet(1, -3, 0, 0, 0, 0, 0), 0.0)
-    );*/
 
     Info<< "\nReading field U\n" << endl;
     volVectorField U

From de937e59d1f042633adfe9c736825b24c553f9bf Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 18 May 2009 19:36:31 +0100
Subject: [PATCH 149/175] typo - missing ()'s

---
 .../ReactingMultiphaseParcel/ReactingMultiphaseParcel.C         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 4d4eae98fb..71d7a9e8a8 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -176,7 +176,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::cellValueSourceCorrection
 
     const scalar fCarrier = -1.0/td.constProps().hRetentionCoeff();
     const scalar dh =
-        td.cloud().hsTrans()[cellI] + fCarrier*td.cloud().hcTrans[cellI];
+        td.cloud().hsTrans()[cellI] + fCarrier*td.cloud().hcTrans()[cellI];
 
     this->Tc_ += dh/(this->cpc_*massCellNew);
 }

From ef1f48025785f6eaa6df498639f01fab795b3edb Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 19 May 2009 10:02:53 +0100
Subject: [PATCH 150/175] adding path to meshTools/lnInclude

---
 .../Lagrangian/uncoupledKinematicParcelFoam/Make/options       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/applications/solvers/Lagrangian/uncoupledKinematicParcelFoam/Make/options b/applications/solvers/Lagrangian/uncoupledKinematicParcelFoam/Make/options
index c9727abd52..818e371778 100644
--- a/applications/solvers/Lagrangian/uncoupledKinematicParcelFoam/Make/options
+++ b/applications/solvers/Lagrangian/uncoupledKinematicParcelFoam/Make/options
@@ -6,7 +6,8 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
     -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
 
 EXE_LIBS = \
     -llagrangian \

From 1d2a94c38bd513ab0e76a5def067e6ca3d319b08 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 19 May 2009 13:14:54 +0200
Subject: [PATCH 151/175] HashTable minor iterator issues

- made const_iterator::operator* and const_iterator::operator() const only
- added const versions of iterator::operator* and iterator::operator()
---
 .../HashTables/HashTable/HashTable.H          |  7 ++--
 .../HashTables/HashTable/HashTableI.H         | 32 +++++++++++++++----
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
index 826bb95741..0e13b7c9a1 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
@@ -330,6 +330,9 @@ public:
                 inline T& operator*();
                 inline T& operator()();
 
+                inline const T& operator*() const;
+                inline const T& operator()() const;
+
                 inline iterator& operator++();
                 inline iterator operator++(int);
 
@@ -389,8 +392,8 @@ public:
                 inline bool operator==(const iterator&) const;
                 inline bool operator!=(const iterator&) const;
 
-                inline const T& operator*();
-                inline const T& operator()();
+                inline const T& operator*() const;
+                inline const T& operator()() const;
 
                 inline const_iterator& operator++();
                 inline const_iterator operator++(int);
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
index 005979df3f..e2655da433 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
@@ -220,16 +220,34 @@ inline bool Foam::HashTable<T, Key, Hash>::iterator::operator!=
 
 
 template<class T, class Key, class Hash>
-inline T& Foam::HashTable<T, Key, Hash>::iterator::operator*()
+inline T&
+Foam::HashTable<T, Key, Hash>::iterator::operator*()
 {
     return elmtPtr_->obj_;
 }
 
 
 template<class T, class Key, class Hash>
-inline T& Foam::HashTable<T, Key, Hash>::iterator::operator()()
+inline T&
+Foam::HashTable<T, Key, Hash>::iterator::operator()()
 {
-    return operator*();
+    return elmtPtr_->obj_;
+}
+
+
+template<class T, class Key, class Hash>
+inline const T&
+Foam::HashTable<T, Key, Hash>::iterator::operator*() const
+{
+    return elmtPtr_->obj_;
+}
+
+
+template<class T, class Key, class Hash>
+inline const T&
+Foam::HashTable<T, Key, Hash>::iterator::operator()() const
+{
+    return elmtPtr_->obj_;
 }
 
 
@@ -410,16 +428,18 @@ inline bool Foam::HashTable<T, Key, Hash>::const_iterator::operator!=
 
 
 template<class T, class Key, class Hash>
-inline const T& Foam::HashTable<T, Key, Hash>::const_iterator::operator*()
+inline const T& 
+Foam::HashTable<T, Key, Hash>::const_iterator::operator*() const
 {
     return elmtPtr_->obj_;
 }
 
 #ifndef __CINT__
 template<class T, class Key, class Hash>
-inline const T& Foam::HashTable<T, Key, Hash>::const_iterator::operator()()
+inline const T&
+Foam::HashTable<T, Key, Hash>::const_iterator::operator()() const
 {
-    return operator*();
+    return elmtPtr_->obj_;
 }
 #endif
 

From 04064d110be5bb9113dd309e7479a936c2e86c8a Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 19 May 2009 15:03:00 +0100
Subject: [PATCH 152/175] fixed: wrong calculation of H1

---
 .../intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
index 6a476110dd..5885512511 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -110,7 +110,7 @@ void Foam::ThermoParcel<ParcelType>::calc
     scalar T1 = calcHeatTransfer(td, dt, cellI, d0, U0, rho0, T0, cp0, Sh);
 
     // Calculate new enthalpy state
-    scalar H1 = cp0 - T1;
+    scalar H1 = cp0*T1;
 
 
     // Motion

From 5dbc2e53c1b2195f4cfd3db457333afb8b420d07 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 19 May 2009 15:03:39 +0100
Subject: [PATCH 153/175] moved h-eqn out of PISO loop

---
 .../combustion/coalChemistryFoam/coalChemistryFoam.C      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/applications/solvers/combustion/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/combustion/coalChemistryFoam/coalChemistryFoam.C
index 142eb51a2f..3bccc682d3 100644
--- a/applications/solvers/combustion/coalChemistryFoam/coalChemistryFoam.C
+++ b/applications/solvers/combustion/coalChemistryFoam/coalChemistryFoam.C
@@ -79,18 +79,18 @@ int main(int argc, char *argv[])
         rhoEffLagrangian = coalParcels.rhoEff() + limestoneParcels.rhoEff();
         pDyn = 0.5*rho*magSqr(U);
 
-        Info << "Evolving coal cloud" << endl;
-
         coalParcels.evolve();
 
         coalParcels.info();
 
-        Info << "Evolving limestone cloud" << endl;
+        Info<< endl;
 
         limestoneParcels.evolve();
 
         limestoneParcels.info();
 
+        Info<< endl;
+
         #include "chemistry.H"
         #include "rhoEqn.H"
 
@@ -99,11 +99,11 @@ int main(int argc, char *argv[])
         {
             #include "UEqn.H"
             #include "YEqn.H"
+            #include "hEqn.H"
 
             // --- PISO loop
             for (int corr=1; corr<=nCorr; corr++)
             {
-                #include "hEqn.H"
                 #include "pEqn.H"
             }
 

From bbb9e52353945463d1850f38bae0fd2c3b8847b5 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 19 May 2009 15:05:18 +0100
Subject: [PATCH 154/175] updates to surface reaction models

---
 .../COxidationDiffusionLimitedRate.C          | 11 ++---
 .../COxidationKineticDiffusionLimitedRate.C   | 11 ++---
 .../COxidationMurphyShaddix.C                 | 49 +++++++------------
 .../COxidationMurphyShaddix.H                 | 19 ++++---
 4 files changed, 36 insertions(+), 54 deletions(-)

diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
index 516554874c..e86391182f 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
@@ -43,17 +43,12 @@ Foam::COxidationDiffusionLimitedRate::COxidationDiffusionLimitedRate
     Sb_(dimensionedScalar(this->coeffDict().lookup("Sb")).value()),
     D_(dimensionedScalar(this->coeffDict().lookup("D")).value()),
     CsLocalId_(-1),
-    O2GlobalId_(-1),
-    CO2GlobalId_(-1),
+    O2GlobalId_(owner.composition().globalCarrierId("O2")),
+    CO2GlobalId_(owner.composition().globalCarrierId("CO2")),
     WC_(0.0),
     WO2_(0.0),
     HcCO2_(0.0)
 {
-    // Determine carrier phase Ids of reactants/products
-    label idGas = owner.composition().idGas();
-    O2GlobalId_ = owner.composition().globalId(idGas, "O2");
-    CO2GlobalId_ = owner.composition().globalId(idGas, "CO2");
-
     // Determine Cs ids
     label idSolid = owner.composition().idSolid();
     CsLocalId_ = owner.composition().localId(idSolid, "C");
@@ -73,7 +68,7 @@ Foam::COxidationDiffusionLimitedRate::COxidationDiffusionLimitedRate
                 "const dictionary&, "
                 "ReactingMultiphaseCloud<coalParcel>&"
             ")"
-        )   << "Stoichiometry, Sb, must be greater than zero" << nl
+        )   << "Stoichiometry of reaction, Sb, must be greater than zero" << nl
             << exit(FatalError);
     }
 }
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
index eb44c6391a..bb3e28ae56 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
@@ -46,17 +46,12 @@ COxidationKineticDiffusionLimitedRate
     C2_(dimensionedScalar(this->coeffDict().lookup("C2")).value()),
     E_(dimensionedScalar(this->coeffDict().lookup("E")).value()),
     CsLocalId_(-1),
-    O2GlobalId_(-1),
-    CO2GlobalId_(-1),
+    O2GlobalId_(owner.composition().globalCarrierId("O2")),
+    CO2GlobalId_(owner.composition().globalCarrierId("CO2")),
     WC_(0.0),
     WO2_(0.0),
     HcCO2_(0.0)
 {
-    // Determine carrier phase Ids of reactants/products
-    label idGas = owner.composition().idGas();
-    O2GlobalId_ = owner.composition().globalId(idGas, "O2");
-    CO2GlobalId_ = owner.composition().globalId(idGas, "CO2");
-
     // Determine Cs ids
     label idSolid = owner.composition().idSolid();
     CsLocalId_ = owner.composition().localId(idSolid, "C");
@@ -76,7 +71,7 @@ COxidationKineticDiffusionLimitedRate
                 "const dictionary&, "
                 "ReactingMultiphaseCloud<coalParcel>&"
             ")"
-        )   << "Stoichiometry, Sb, must be greater than zero" << nl
+        )   << "Stoichiometry of reaction, Sb, must be greater than zero" << nl
             << exit(FatalError);
     }
 }
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
index c9e5ddfa49..128c5d64e9 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
@@ -55,20 +55,22 @@ Foam::COxidationMurphyShaddix::COxidationMurphyShaddix
     E_(dimensionedScalar(this->coeffDict().lookup("E")).value()),
     n_(dimensionedScalar(this->coeffDict().lookup("n")).value()),
     WVol_(dimensionedScalar(this->coeffDict().lookup("WVol")).value()),
-    dH0_(dimensionedScalar(this->coeffDict().lookup("dH0")).value()),
-    TMaxdH_(dimensionedScalar(this->coeffDict().lookup("TmaxdH")).value()),
     CsLocalId_(-1),
-    O2GlobalId_(-1),
-    CO2GlobalId_(-1)
+    O2GlobalId_(owner.composition().globalCarrierId("O2")),
+    CO2GlobalId_(owner.composition().globalCarrierId("CO2")),
+    WC_(0.0),
+    WO2_(0.0),
+    HcCO2_(0.0)
 {
-    // Determine carrier phase Ids of reactants/products
-    label idGas = owner.composition().idGas();
-    O2GlobalId_ = owner.composition().globalId(idGas, "O2");
-    CO2GlobalId_ = owner.composition().globalId(idGas, "CO2");
-
     // Determine Cs ids
     label idSolid = owner.composition().idSolid();
     CsLocalId_ = owner.composition().localId(idSolid, "Cs");
+
+    // Set local copies of thermo properties
+    WO2_ = owner.composition().carrierSpecies()[O2GlobalId_].W();
+    scalar WCO2 = owner.composition().carrierSpecies()[CO2GlobalId_].W();
+    WC_ = WCO2 - WO2_;
+    HcCO2_ = owner.composition().carrierSpecies()[CO2GlobalId_].Hc();
 }
 
 
@@ -118,8 +120,7 @@ Foam::scalar Foam::COxidationMurphyShaddix::calculate
 
     // Cell carrier phase O2 species density [kg/m^3]
     const scalar rhoO2 =
-        owner().carrierThermo().composition().Y(O2GlobalId_)[cellI]
-       *rhoc;
+        rhoc*owner().carrierThermo().composition().Y(O2GlobalId_)[cellI];
 
     if (rhoO2 < SMALL)
     {
@@ -129,25 +130,12 @@ Foam::scalar Foam::COxidationMurphyShaddix::calculate
     // Particle surface area [m^2]
     const scalar Ap = mathematicalConstant::pi*sqr(d);
 
-//    // Film temperature [K]
-//    const scalar Tf = (T + Tc)/2;
-
     // Calculate diffision constant at continuous phase temperature
     // and density [m^2/s]
     const scalar D = D0_*(rho0_/rhoc)*pow(Tc/T0_, Dn_);
 
-    // Molecular weight of O2 [kg/kmol]
-    const scalar WO2 = owner().composition().carrierSpecies()[O2GlobalId_].W();
-
-    // Molecular weight of CO2 [kg/kmol]
-    const scalar WCO2 =
-        owner().composition().carrierSpecies()[CO2GlobalId_].W();
-
-    // Molecular weight of C [kg/kmol]
-    const scalar WC = WCO2 - WO2;
-
     // Far field partial pressure O2 [Pa]
-    const scalar ppO2 = rhoO2/WO2*specie::RR*Tc;
+    const scalar ppO2 = rhoO2/WO2_*specie::RR*Tc;
 
     // Molar emission rate of volatiles per unit surface area
     const scalar qVol = sum(dMassVolatile)/(WVol_*Ap);
@@ -159,7 +147,6 @@ Foam::scalar Foam::COxidationMurphyShaddix::calculate
     {
         Pout<< "mass  = " << mass << nl
             << "fComb = " << fComb << nl
-            << "WC    = " << WC << nl
             << "Ap    = " << Ap << nl
             << "dt    = " << dt << nl
             << "C     = " << C << nl
@@ -170,7 +157,7 @@ Foam::scalar Foam::COxidationMurphyShaddix::calculate
     scalar qCsOld = 0;
     scalar qCs = 1;
 
-    const scalar qCsLim = mass*fComb/(WC*Ap*dt);
+    const scalar qCsLim = mass*fComb/(WC_*Ap*dt);
 
     if (debug)
     {
@@ -207,14 +194,14 @@ Foam::scalar Foam::COxidationMurphyShaddix::calculate
     scalar dOmega = qCs*Ap*dt;
 
     // Add to carrier phase mass transfer
-    dMassSRCarrier[O2GlobalId_] += -dOmega*WO2;
-    dMassSRCarrier[CO2GlobalId_] += dOmega*WCO2;
+    dMassSRCarrier[O2GlobalId_] += -dOmega*WO2_;
+    dMassSRCarrier[CO2GlobalId_] += dOmega*(WC_ + WO2_);
 
     // Add to particle mass transfer
-    dMassSolid[CsLocalId_] = dOmega*WC;
+    dMassSolid[CsLocalId_] += dOmega*WC_;
 
     // Heat of reaction
-    return dOmega*dH0_*cos(mathematicalConstant::pi/2*T/TMaxdH_);
+    return HcCO2_*dOmega*WC_;
 }
 
 
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H
index 5811fc085c..bc026db364 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H
@@ -26,7 +26,6 @@ Class
     COxidationMurphyShaddix
 
 Description
-    Kinetics/diffusion limited rate surface reaction model for coal parcel
     Limited to C(s) + O2 -> CO2
 
 \*---------------------------------------------------------------------------*/
@@ -77,12 +76,6 @@ class COxidationMurphyShaddix
             //- Effective molecular weight of gaseous volatiles
             const scalar WVol_;
 
-            //- Enthalpy retained by particle during surface combustion
-            const scalar dH0_;
-
-            //- TdHMax: dH = dH0_*cos(pi/2*Tp/TMaxdH_)
-            const scalar TMaxdH_;
-
 
         // Static constants
 
@@ -105,6 +98,18 @@ class COxidationMurphyShaddix
             label CO2GlobalId_;
 
 
+        // Local copies of thermo properties
+
+            //- Molecular weight of C [kg/kmol]
+            scalar WC_;
+
+            //- Molecular weight of O2 [kg/kmol]
+            scalar WO2_;
+
+            //- Chemical enthalpy of CO2 [J/kg]
+            scalar HcCO2_;
+
+
 public:
 
     //- Runtime type information

From 3efc299deac76515a94f6139ffa2af30e356fe48 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 19 May 2009 15:06:43 +0100
Subject: [PATCH 155/175] multiple updates

---
 .../ReactingMultiphaseParcel.C                | 17 +++++----
 .../ReactingMultiphaseParcelI.H               |  3 +-
 .../ReactingMultiphaseParcelIO.C              | 12 ++----
 .../Templates/ReactingParcel/ReactingParcel.C |  5 ++-
 .../phaseProperties/phaseProperties.C         | 36 +++++++++---------
 .../phaseProperties/phaseProperties.H         | 14 +++----
 .../phaseProperties/phasePropertiesIO.C       |  6 +--
 .../CompositionModel/CompositionModel.C       | 37 +++++++++++++++++--
 .../CompositionModel/CompositionModel.H       |  7 +++-
 9 files changed, 85 insertions(+), 52 deletions(-)

diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 71d7a9e8a8..7c2fd37583 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -341,19 +341,19 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
         // Transfer mass lost from particle to carrier mass source
         forAll(YGas_, i)
         {
-            label id = td.cloud().composition().localToGlobalGasId(GAS, i);
+            label id = td.cloud().composition().localToGlobalCarrierId(GAS, i);
             td.cloud().rhoTrans(id)[cellI] += np0*dMassGas[i];
         }
         forAll(YLiquid_, i)
         {
-            label id = td.cloud().composition().localToGlobalGasId(LIQ, i);
+            label id = td.cloud().composition().localToGlobalCarrierId(LIQ, i);
             td.cloud().rhoTrans(id)[cellI] += np0*dMassLiquid[i];
         }
 /*
         // No mapping between solid components and carrier phase
         forAll(YSolid_, i)
         {
-            label id = td.cloud().composition().localToGlobalGasId(SLD, i);
+            label id = td.cloud().composition().localToGlobalCarrierId(SLD, i);
             td.cloud().rhoTrans(id)[cellI] += np0*dMassSolid[i];
         }
 */
@@ -385,12 +385,14 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
             // Absorb parcel into carrier phase
             forAll(YGas_, i)
             {
-                label id = td.cloud().composition().localToGlobalGasId(GAS, i);
+                label id =
+                    td.cloud().composition().localToGlobalCarrierId(GAS, i);
                 td.cloud().rhoTrans(id)[cellI] += np0*mass1*YMix[GAS]*YGas_[i];
             }
             forAll(YLiquid_, i)
             {
-                label id = td.cloud().composition().localToGlobalGasId(LIQ, i);
+                label id =
+                    td.cloud().composition().localToGlobalCarrierId(LIQ, i);
                 td.cloud().rhoTrans(id)[cellI] +=
                     np0*mass1*YMix[LIQ]*YLiquid_[i];
             }
@@ -398,13 +400,14 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
             // No mapping between solid components and carrier phase
             forAll(YSolid_, i)
             {
-                label id = td.cloud().composition().localToGlobalGasId(SLD, i);
+                label id =
+                    td.cloud().composition().localToGlobalCarrierId(SLD, i);
                 td.cloud().rhoTrans(id)[cellI] +=
                     np0*mass1*YMix[SLD]*YSolid_[i];
             }
 */
-            td.cloud().hsTrans()[cellI] += np0*mass1*H1;
             td.cloud().UTrans()[cellI] += np0*mass1*U1;
+            td.cloud().hsTrans()[cellI] += np0*mass1*H1;
         }
     }
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
index 9709da663d..ef40cdc994 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
@@ -104,7 +104,8 @@ inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
     ),
     YGas_(YGas0),
     YLiquid_(YLiquid0),
-    YSolid_(YSolid0)
+    YSolid_(YSolid0),
+    canCombust_(false)
 {}
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
index b37f7c715e..bbf58e49a0 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
@@ -40,7 +40,8 @@ Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
     ReactingParcel<ParcelType>(cloud, is, readFields),
     YGas_(0),
     YLiquid_(0),
-    YSolid_(0)
+    YSolid_(0),
+    canCombust_(false)
 {
     if (readFields)
     {
@@ -58,14 +59,7 @@ Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
         YLiquid_.setSize(nLiquid);
         YSolid_.setSize(nSolid);
 
-        if (is.format() == IOstream::ASCII)
-        {
-            is >> YGas_ >> YLiquid_ >> YSolid_;
-        }
-        else
-        {
-            is >> YGas_ >> YLiquid_ >> YSolid_;
-        }
+        is >> YGas_ >> YLiquid_ >> YSolid_;
 
         // scale the mass fractions
         const scalarField& YMix = this->Y_;
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index 3ea161f28f..39658fcf2f 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -187,7 +187,7 @@ void Foam::ReactingParcel<ParcelType>::calc
         // Transfer mass lost from particle to carrier mass source
         forAll(dMassPC, i)
         {
-            label id = td.cloud().composition().localToGlobalGasId(0, i);
+            label id = td.cloud().composition().localToGlobalCarrierId(0, i);
             td.cloud().rhoTrans(id)[cellI] += np0*dMassPC[i];
         }
 
@@ -210,7 +210,8 @@ void Foam::ReactingParcel<ParcelType>::calc
             // Absorb parcel into carrier phase
             forAll(Y_, i)
             {
-                label id = td.cloud().composition().localToGlobalGasId(0, i);
+                label id =
+                    td.cloud().composition().localToGlobalCarrierId(0, i);
                 td.cloud().rhoTrans(id)[cellI] += np0*mass1*Y_[i];
             }
             td.cloud().UTrans()[cellI] += np0*mass1*U1;
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
index 1da9161508..eb451ba36f 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
@@ -63,22 +63,22 @@ void Foam::phaseProperties::setGlobalIds
         }
         if (globalIds_[i] == -1)
         {
-            wordList globalGasNames(YGas.size());
+            wordList globalCarrierNames(YGas.size());
 
             forAll (YGas, k)
             {
-                globalGasNames[k] = YGas[k].name();
+                globalCarrierNames[k] = YGas[k].name();
             }
 
             FatalErrorIn
             (
-                "void phaseProperties::setGlobalGasIds"
+                "void phaseProperties::setGlobalIds"
                 "("
                     "const PtrList<volScalarField>&"
                 ")"
-            )   << "Could not find gas species " << names_[i]
+            )   << "Could not find carrier species " << names_[i]
                 << " in species list" <<  nl
-                << "Available species are: " << nl << globalGasNames << nl
+                << "Available species are: " << nl << globalCarrierNames << nl
                 << exit(FatalError);
         }
     }
@@ -111,11 +111,13 @@ void Foam::phaseProperties::setGlobalIds(const wordList& globalNames)
 }
 
 
-void Foam::phaseProperties::setGlobalGasIds
+void Foam::phaseProperties::setGlobalCarrierIds
 (
     const PtrList<volScalarField>& YGas
 )
 {
+    globalCarrierIds_ = -1;
+
     forAll(names_, i)
     {
         forAll (YGas, j)
@@ -124,11 +126,11 @@ void Foam::phaseProperties::setGlobalGasIds
 
             if (specieName == names_[i])
             {
-                globalGasIds_[i] = j;
+                globalCarrierIds_[i] = j;
                 break;
             }
         }
-        if (globalGasIds_[i] == -1)
+        if (globalCarrierIds_[i] == -1)
         {
             wordList gasNames(YGas.size());
             forAll(YGas, gasI)
@@ -138,7 +140,7 @@ void Foam::phaseProperties::setGlobalGasIds
 
             FatalErrorIn
             (
-                "void Foam::phaseProperties::setGlobalGasIds"
+                "void Foam::phaseProperties::setGlobalCarrierIds"
                 "("
                     "const PtrList<volScalarField>&"
                 ")"
@@ -215,7 +217,7 @@ Foam::phaseProperties::phaseProperties()
     names_(0),
     Y_(0),
     globalIds_(0),
-    globalGasIds_(0)
+    globalCarrierIds_(0)
 {}
 
 
@@ -226,7 +228,7 @@ Foam::phaseProperties::phaseProperties(const phaseProperties& pp)
     names_(pp.names_),
     Y_(pp.Y_),
     globalIds_(pp.globalIds_),
-    globalGasIds_(pp.globalGasIds_)
+    globalCarrierIds_(pp.globalCarrierIds_)
 {}
 
 
@@ -252,16 +254,16 @@ void Foam::phaseProperties::initialiseGlobalIds
         case GAS:
         {
             setGlobalIds(YGas);
-            forAll(globalGasIds_, i)
+            forAll(globalCarrierIds_, i)
             {
-                globalGasIds_[i] = globalIds_[i];
+                globalCarrierIds_[i] = globalIds_[i];
             }
             break;
         }
         case LIQUID:
         {
             setGlobalIds(liquidNames);
-            setGlobalGasIds(YGas);
+            setGlobalCarrierIds(YGas);
             break;
         }
         case SOLID:
@@ -272,7 +274,7 @@ void Foam::phaseProperties::initialiseGlobalIds
                 "phaseProperties::initialiseGlobalIds(...)"
             )   << "Assuming no mapping between solid and carrier species"
                 << endl;
-//            setGlobalGasIds(YGas);
+//            setGlobalCarrierIds(YGas);
             break;
         }
         default:
@@ -383,9 +385,9 @@ const Foam::labelList& Foam::phaseProperties::globalIds() const
 }
 
 
-const Foam::labelList& Foam::phaseProperties::globalGasIds() const
+const Foam::labelList& Foam::phaseProperties::globalCarrierIds() const
 {
-    return globalGasIds_;
+    return globalCarrierIds_;
 }
 
 
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
index be45bc51ca..c87f51b7a0 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
@@ -88,21 +88,21 @@ private:
         //- Global ids
         labelList globalIds_;
 
-        //- Map to gas global id
-        labelList globalGasIds_;
+        //- Map to carrier global id
+        labelList globalCarrierIds_;
 
 
     // Private member functions
 
-        //- Set global ids - specialisation for carrier gas phases
+        //- Set global ids - specialisation for carrier phases
         void setGlobalIds(const PtrList<volScalarField>& YGas);
 
         //- Set global ids - liquid and solid phases
         void setGlobalIds(const wordList& globalNames);
 
-        //- Set global gas ids - attempts to map component names to global
+        //- Set global carrier ids - attempts to map component names to global
         //  carrier species
-        void setGlobalGasIds(const PtrList<volScalarField>& YGas);
+        void setGlobalCarrierIds(const PtrList<volScalarField>& YGas);
 
         //- Check the total mass fraction
         void checkTotalMassFraction() const;
@@ -166,8 +166,8 @@ public:
             //- Return const acccess to the global ids
             const labelList& globalIds() const;
 
-            //- Return const acccess to the map to the gas global ids
-            const labelList& globalGasIds() const;
+            //- Return const acccess to the map to the carrier global ids
+            const labelList& globalCarrierIds() const;
 
             //- Return the global id of a component in the local list by name
             //  Returns -1 if not found
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
index 18da442052..2fbb79039b 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
@@ -36,7 +36,7 @@ Foam::phaseProperties::phaseProperties(Istream& is)
     names_(0),
     Y_(0),
     globalIds_(0),
-    globalGasIds_(0)
+    globalCarrierIds_(0)
 {
     is.check("Foam::phaseProperties::phaseProperties(Istream& is)");
 
@@ -51,7 +51,7 @@ Foam::phaseProperties::phaseProperties(Istream& is)
         names_.setSize(nComponents, "unknownSpecie");
         Y_.setSize(nComponents, 0.0);
         globalIds_.setSize(nComponents, -1);
-        globalGasIds_.setSize(nComponents, -1);
+        globalCarrierIds_.setSize(nComponents, -1);
 
         label cmptI = 0;
         forAllConstIter(IDLList<entry>, phaseInfo, iter)
@@ -87,7 +87,7 @@ Foam::Istream& Foam::operator>>(Istream& is, phaseProperties& pp)
         pp.names_.setSize(nComponents, "unknownSpecie");
         pp.Y_.setSize(nComponents, 0.0);
         pp.globalIds_.setSize(nComponents, -1);
-        pp.globalGasIds_.setSize(nComponents, -1);
+        pp.globalCarrierIds_.setSize(nComponents, -1);
 
         label cmptI = 0;
         forAllConstIter(IDLList<entry>, phaseInfo, iter)
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
index 1bbdc5221f..4336b72baa 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
@@ -178,6 +178,34 @@ Foam::CompositionModel<CloudType>::componentNames(const label phaseI) const
 }
 
 
+template<class CloudType>
+Foam::label Foam::CompositionModel<CloudType>::globalCarrierId
+(
+    const word& cmptName
+) const
+{
+    forAll(carrierThermo_.composition().Y(), i)
+    {
+        word carrierSpecieName = carrierThermo_.composition().Y()[i].name();
+        if (cmptName == carrierSpecieName)
+        {
+            return i;
+        }
+    }
+
+    FatalErrorIn
+    (
+        "Foam::label Foam::CompositionModel<CloudType>::globalCarrierId"
+        "("
+            "const word&"
+        ") const"
+    )   << "Unable to determine global id for requested component "
+        << cmptName << nl << abort(FatalError);
+
+    return -1;
+}
+
+
 template<class CloudType>
 Foam::label Foam::CompositionModel<CloudType>::globalId
 (
@@ -241,24 +269,25 @@ Foam::label Foam::CompositionModel<CloudType>::localId
 
 
 template<class CloudType>
-Foam::label Foam::CompositionModel<CloudType>::localToGlobalGasId
+Foam::label Foam::CompositionModel<CloudType>::localToGlobalCarrierId
 (
     const label phaseI,
     const label id
 ) const
 {
-    label gid = phaseProps_[phaseI].globalGasIds()[id];
+    label gid = phaseProps_[phaseI].globalCarrierIds()[id];
 
     if (gid < 0)
     {
         FatalErrorIn
         (
-            "Foam::label Foam::CompositionModel<CloudType>::localToGlobalGasId"
+            "Foam::label "
+            "Foam::CompositionModel<CloudType>::localToGlobalCarrierId"
             "("
                 "const label, "
                 "const label"
             ") const"
-        )   << "Unable to determine global gas id for phase "
+        )   << "Unable to determine global carrier id for phase "
             << phaseI << " with local id " << id
             << nl << abort(FatalError);
     }
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
index e45f7d96d0..8fb8762cf0 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
@@ -179,6 +179,9 @@ public:
                 //- Return the list of component names for phaseI
                 const wordList& componentNames(const label phaseI) const;
 
+                //- Return global id of component cmptName in carrier thermo
+                label globalCarrierId(const word& cmptName) const;
+
                 //- Return global id of component cmptName in phase phaseI
                 label globalId(const label phaseI, const word& cmptName) const;
 
@@ -188,8 +191,8 @@ public:
                 //- Return local id of component cmptName in phase phaseI
                 label localId(const label phaseI, const word& cmptName) const;
 
-                //- Return global gas id of component given local id
-                label localToGlobalGasId
+                //- Return global carrier id of component given local id
+                label localToGlobalCarrierId
                 (
                     const label phaseI,
                     const label id

From 55e766bd6760d1b7aa08364f2f9f4b392718eace Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Tue, 19 May 2009 15:48:54 +0100
Subject: [PATCH 156/175] Fix: edge lookup from edgeLabels_ by index rather
 than just from edges

---
 src/meshTools/indexedOctree/treeDataEdge.C | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/meshTools/indexedOctree/treeDataEdge.C b/src/meshTools/indexedOctree/treeDataEdge.C
index 12f347c164..3f7ae86ce8 100644
--- a/src/meshTools/indexedOctree/treeDataEdge.C
+++ b/src/meshTools/indexedOctree/treeDataEdge.C
@@ -134,7 +134,7 @@ void Foam::treeDataEdge::findNearest
     {
         label index = indices[i];
 
-        const edge& e = edges_[index];
+        const edge& e = edges_[edgeLabels_[index]];
 
         pointHit nearHit = e.line(points_).nearestDist(sample);
 
@@ -170,7 +170,7 @@ void Foam::treeDataEdge::findNearest
     {
         label index = indices[i];
 
-        const edge& e = edges_[index];
+        const edge& e = edges_[edgeLabels_[index]];
 
         // Note: could do bb test ? Worthwhile?
 

From 724b034cc7b7fc3d13bd6bc24568d355620c92bb Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 19 May 2009 18:19:49 +0200
Subject: [PATCH 157/175] argList enhancement: added convenience methods for
 accessing options

Oriented somewhat on dictionary methods.

Return the argument string associated with the named option:
    Info<< "-foo: " << args.option("foo") << nl;

Return true if the named option is found
    if (args.optionFound("foo")) ...

Return an IStringStream to the named option
    old:      value = readScalar(IStringStream(args.options()["foo"])());
    newer:    value = readScalar(args.optionLookup("foo")());
    also:     List<scalar> lst(args.optionLookup("foo")());

Read a value from the named option
    newest:   value = args.optionRead<scalar>("foo");

Read a value from the named option if present.
    old:  if (args.options().found("foo"))
          {
              value = readScalar(IStringStream(args.options()["foo"])());
          }
    new:  args.optionReadIfPresent("foo", value);

Read a List of values from the named option
    patches = args.optionReadList<word>("patches");

Didn't bother adding optionReadListIfPresent<T>(const word&), since it
probably wouldn't be common anyhow.
---
 applications/test/List/ListTest.C     | 26 ++++++--
 src/OpenFOAM/global/argList/argList.H | 91 +++++++++++++++++++++------
 2 files changed, 91 insertions(+), 26 deletions(-)

diff --git a/applications/test/List/ListTest.C b/applications/test/List/ListTest.C
index d06c65d98a..0fee9a9e3b 100644
--- a/applications/test/List/ListTest.C
+++ b/applications/test/List/ListTest.C
@@ -50,6 +50,8 @@ int main(int argc, char *argv[])
     argList::validOptions.insert("reList", "reList");
     argList::validOptions.insert("wordList", "wordList");
     argList::validOptions.insert("stringList", "stringList");
+    argList::validOptions.insert("float", "xx");
+    argList::validOptions.insert("flag", "");
 
 #   include "setRootCase.H"
 
@@ -84,19 +86,31 @@ int main(int argc, char *argv[])
     stringList sLst;
 
 
-    if (args.options().found("reList"))
+    scalar xxx(-1);
+
+    if (args.optionFound("flag"))
     {
-        reLst = readList<wordRe>(IStringStream(args.options()["reList"])());
+        Info<<"-flag:" << args.option("flag") << endl;
     }
 
-    if (args.options().found("wordList"))
+    if (args.optionReadIfPresent<scalar>("float", xxx))
     {
-        wLst = readList<word>(IStringStream(args.options()["wordList"])());
+        Info<<"read float " << xxx << endl;
     }
 
-    if (args.options().found("stringList"))
+    if (args.optionFound("reList"))
     {
-        sLst = readList<string>(IStringStream(args.options()["stringList"])());
+        reLst = args.optionReadList<wordRe>("reList");
+    }
+
+    if (args.optionFound("wordList"))
+    {
+        wLst = args.optionReadList<word>("wordList");
+    }
+
+    if (args.optionFound("stringList"))
+    {
+        sLst = args.optionReadList<string>("stringList");
     }
 
     Info<< nl
diff --git a/src/OpenFOAM/global/argList/argList.H b/src/OpenFOAM/global/argList/argList.H
index c5fcf5d53c..9fdb0bb6d2 100644
--- a/src/OpenFOAM/global/argList/argList.H
+++ b/src/OpenFOAM/global/argList/argList.H
@@ -56,10 +56,10 @@ Description
     global case (same for serial and parallel jobs).
 
 Note
-    - Adjustment of the valid (mandatory) arguments by directly manipulating
-      the static member argList::validArgs.
-    - Adjustment of the valid options by directly manipulating
-      the static member argList::validOptions.
+    - Adjustment of the valid (mandatory) arguments
+      by directly manipulating the static member argList::validArgs.
+    - Adjustment of the valid options
+      by directly manipulating the static member argList::validOptions.
 
 SourceFiles
     argList.C
@@ -76,6 +76,7 @@ SourceFiles
 #include "word.H"
 #include "fileName.H"
 #include "parRun.H"
+#include "IStringStream.H"
 
 #include "sigFpe.H"
 #include "sigInt.H"
@@ -165,22 +166,6 @@ public:
 
         // Access
 
-            //- Return arguments
-            const stringList& args() const
-            {
-                return args_;
-            }
-
-            //- Return additionl arguments,
-            //  i.e. those additional to the executable itself
-            stringList::subList additionalArgs() const;
-
-            //- Return options
-            const Foam::HashTable<string>& options() const
-            {
-                return options_;
-            }
-
             //- Name of executable
             const word& executable() const
             {
@@ -211,6 +196,72 @@ public:
                 return rootPath()/caseName();
             }
 
+            //- Return arguments
+            const stringList& args() const
+            {
+                return args_;
+            }
+
+            //- Return additionl arguments,
+            //  i.e. those additional to the executable itself
+            stringList::subList additionalArgs() const;
+
+            //- Return options
+            const Foam::HashTable<string>& options() const
+            {
+                return options_;
+            }
+
+            //- Return the argument string associated with the named option
+            const string& option(const word& opt) const
+            {
+                return options_.operator[](opt);
+            }
+
+            //- Return true if the named option is found
+            bool optionFound(const word& opt) const
+            {
+                return options_.found(opt);
+            }
+
+            //- Return an IStringStream to the named option
+            IStringStream optionLookup(const word& opt) const
+            {
+                return IStringStream(option(opt));
+            }
+
+            //- Read a value from the named option
+            template<class T>
+            T optionRead(const word& opt) const
+            {
+                T val;
+                optionLookup(opt)() >> val;
+                return val;
+            }
+
+            //- Read a value from the named option if present.
+            //  Return true if the named option was found.
+            template<class T>
+            bool optionReadIfPresent(const word& opt, T& val) const
+            {
+                if (optionFound(opt))
+                {
+                    optionLookup(opt)() >> val;
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+
+            //- Read a List of values from the named option
+            template<class T>
+            List<T> optionReadList(const word& opt) const
+            {
+                return readList<T>(optionLookup(opt)());
+            }
+
 
         // Edit
 

From c4ac52e6b08f3caebf661545e7021c8f348b56e7 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 19 May 2009 17:37:04 +0100
Subject: [PATCH 158/175] fix: taking carrier specie id

---
 .../LiquidEvaporation/LiquidEvaporation.C              | 10 +++++-----
 .../LiquidEvaporation/LiquidEvaporation.H              |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
index a9f6e5738a..d0afb84cb0 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
@@ -81,7 +81,7 @@ Foam::LiquidEvaporation<CloudType>::LiquidEvaporation
         )
     ),
     activeLiquids_(this->coeffDict().lookup("activeLiquids")),
-    liqToGasMap_(activeLiquids_.size(), -1),
+    liqToCarrierMap_(activeLiquids_.size(), -1),
     liqToLiqMap_(activeLiquids_.size(), -1)
 {
     if (activeLiquids_.size() == 0)
@@ -98,14 +98,14 @@ Foam::LiquidEvaporation<CloudType>::LiquidEvaporation
     }
 
     // Determine mapping between liquid and carrier phase species
-    label idLiquid = owner.composition().idLiquid();
     forAll(activeLiquids_, i)
     {
-        liqToGasMap_[i] =
-            owner.composition().globalId(idLiquid, activeLiquids_[i]);
+        liqToCarrierMap_[i] =
+            owner.composition().globalCarrierId(activeLiquids_[i]);
     }
 
     // Determine mapping between local and global liquids
+    label idLiquid = owner.composition().idLiquid();
     forAll(activeLiquids_, i)
     {
         liqToLiqMap_[i] =
@@ -159,7 +159,7 @@ void Foam::LiquidEvaporation<CloudType>::calculate
     // calculate mass transfer of each specie in liquid
     forAll(activeLiquids_, i)
     {
-        label gid = liqToGasMap_[i];
+        label gid = liqToCarrierMap_[i];
         label lid = liqToLiqMap_[i];
 
         // vapour diffusivity [m2/s]
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
index d2a1f903da..9c650f1c2e 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
@@ -60,8 +60,8 @@ protected:
         //- List of active liquid names
         List<word> activeLiquids_;
 
-        //- Mapping between liquid and carrier gas species
-        List<label> liqToGasMap_;
+        //- Mapping between liquid and carrier species
+        List<label> liqToCarrierMap_;
 
         //- Mapping between local and global liquid species
         List<label> liqToLiqMap_;

From 4fa5f74f8aca43394f5a4bdb92dab428400858ee Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 19 May 2009 17:37:41 +0100
Subject: [PATCH 159/175] using null constructor for none option

---
 .../DispersionModel/DispersionModel/DispersionModel.C     | 8 ++++++++
 .../DispersionModel/DispersionModel/DispersionModel.H     | 3 +++
 .../Kinematic/DispersionModel/NoDispersion/NoDispersion.C | 4 ++--
 .../Kinematic/DispersionModel/NoDispersion/NoDispersion.H | 6 +++---
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.C
index d583a551c1..fa37b022ed 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.C
@@ -30,6 +30,14 @@ Description
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+template<class CloudType>
+Foam::DispersionModel<CloudType>::DispersionModel(CloudType& owner)
+:
+    dict_(dictionary::null),
+    owner_(owner)
+{}
+
+
 template<class CloudType>
 Foam::DispersionModel<CloudType>::DispersionModel
 (
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
index 5cd9eaab2f..085ff97b8a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
@@ -81,6 +81,9 @@ public:
 
     // Constructors
 
+        //- Construct null from owner
+        DispersionModel(CloudType& owner);
+
         //- Construct from components
         DispersionModel
         (
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C
index 5a41d3f39e..221eb2b229 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C
@@ -33,11 +33,11 @@ Description
 template<class CloudType>
 Foam::NoDispersion<CloudType>::NoDispersion
 (
-    const dictionary& dict,
+    const dictionary&,
     CloudType& owner
 )
 :
-    DispersionModel<CloudType>(dict, owner)
+    DispersionModel<CloudType>(owner)
 {}
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H
index 48af46260e..48e938cc03 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H
@@ -26,7 +26,7 @@ Class
     Foam::NoDispersion
 
 Description
-    No turbulent dispersion of the parcels
+    Place holder for 'none' option
 
 \*---------------------------------------------------------------------------*/
 
@@ -41,7 +41,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class NoDispersion Declaration
+                       Class NoDispersion Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class CloudType>
@@ -52,7 +52,7 @@ class NoDispersion
 public:
 
     //- Runtime type information
-    TypeName("NoDispersion");
+    TypeName("none");
 
 
     // Constructors

From 30baccd5098116325a128a94a08b86c3fcefce7b Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 19 May 2009 17:54:45 +0100
Subject: [PATCH 160/175] adding reactingParcelFoam tutorial

---
 .../reactingParcelFoam/evaporationTest/0/G    |  37 +++++
 .../reactingParcelFoam/evaporationTest/0/H2O  |  36 +++++
 .../reactingParcelFoam/evaporationTest/0/N2   |  36 +++++
 .../reactingParcelFoam/evaporationTest/0/O2   |  36 +++++
 .../reactingParcelFoam/evaporationTest/0/T    |  35 +++++
 .../reactingParcelFoam/evaporationTest/0/U    |  35 +++++
 .../evaporationTest/0/epsilon                 |  36 +++++
 .../reactingParcelFoam/evaporationTest/0/k    |  36 +++++
 .../reactingParcelFoam/evaporationTest/0/p    |  34 +++++
 .../evaporationTest/chemkin/chem.inp          |   6 +
 .../evaporationTest/chemkin/foam.dat          |  17 +++
 .../evaporationTest/chemkin/foam.inp          |  11 ++
 .../evaporationTest/chemkin/therm.dat         |  15 ++
 .../constant/chemistryProperties              |  47 ++++++
 .../constant/environmentalProperties          |  21 +++
 .../constant/polyMesh/blockMeshDict           |  61 ++++++++
 .../constant/radiationProperties              |  65 ++++++++
 .../constant/reactingCloud1Positions          |  44 ++++++
 .../constant/reactingCloud1Properties         | 129 ++++++++++++++++
 .../constant/thermophysicalProperties         |  35 +++++
 .../constant/turbulenceProperties             |  21 +++
 .../evaporationTest/system/controlDict        |  53 +++++++
 .../evaporationTest/system/decomposeParDict   |  50 ++++++
 .../evaporationTest/system/fvSchemes          |  72 +++++++++
 .../evaporationTest/system/fvSolution         | 143 ++++++++++++++++++
 25 files changed, 1111 insertions(+)
 create mode 100644 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/G
 create mode 100644 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/H2O
 create mode 100644 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/N2
 create mode 100644 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/O2
 create mode 100644 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/T
 create mode 100644 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/U
 create mode 100644 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/epsilon
 create mode 100644 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/k
 create mode 100644 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/p
 create mode 100644 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/chemkin/chem.inp
 create mode 100644 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/chemkin/foam.dat
 create mode 100644 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/chemkin/foam.inp
 create mode 100644 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/chemkin/therm.dat
 create mode 100644 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/chemistryProperties
 create mode 100644 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/environmentalProperties
 create mode 100644 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/blockMeshDict
 create mode 100644 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties
 create mode 100644 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Positions
 create mode 100644 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
 create mode 100644 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties
 create mode 100644 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/turbulenceProperties
 create mode 100644 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/controlDict
 create mode 100644 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/decomposeParDict
 create mode 100644 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/fvSchemes
 create mode 100644 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution

diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/G b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/G
new file mode 100644
index 0000000000..abe11dad91
--- /dev/null
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/G
@@ -0,0 +1,37 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev.wbm                               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      G;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 0 -3 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    walls
+    {
+        type            MarshakRadiation;
+        T               T;
+        emissivity      1.0;
+        value           uniform 0;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/H2O b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/H2O
new file mode 100644
index 0000000000..208798ede8
--- /dev/null
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/H2O
@@ -0,0 +1,36 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev.wbm                               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      H2O;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.0;
+
+boundaryField
+{
+    walls
+    {
+        type            zeroGradient;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/N2 b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/N2
new file mode 100644
index 0000000000..1b93101bda
--- /dev/null
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/N2
@@ -0,0 +1,36 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev.wbm                               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      N2;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.79;
+
+boundaryField
+{
+    walls
+    {
+        type            zeroGradient;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/O2 b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/O2
new file mode 100644
index 0000000000..a6e91c1098
--- /dev/null
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/O2
@@ -0,0 +1,36 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev.wbm                               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      O2;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.21;
+
+boundaryField
+{
+    walls
+    {
+        type            zeroGradient;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/T b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/T
new file mode 100644
index 0000000000..6f7b57f7da
--- /dev/null
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/T
@@ -0,0 +1,35 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev.wbm                               |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    location    "0";
+    class       volScalarField;
+    object      T;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 1 0 0 0];
+
+internalField   uniform 400;
+
+boundaryField
+{
+    walls
+    {
+        type            fixedValue;
+        value           uniform 400;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/U b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/U
new file mode 100644
index 0000000000..b107a985d3
--- /dev/null
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/U
@@ -0,0 +1,35 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev.wbm                               |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    location    "0";
+    class       volVectorField;
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    walls
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/epsilon b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/epsilon
new file mode 100644
index 0000000000..b749ed00db
--- /dev/null
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/epsilon
@@ -0,0 +1,36 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev.wbm                               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      epsilon;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -3 0 0 0 0];
+
+internalField   uniform 5390.5;
+
+boundaryField
+{
+    walls
+    {
+        type            compressible::epsilonWallFunction;
+        value           uniform 5390.5;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/k b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/k
new file mode 100644
index 0000000000..4e39b98fe9
--- /dev/null
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/k
@@ -0,0 +1,36 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev.wbm                               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      k;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -2 0 0 0 0];
+
+internalField   uniform 37.5;
+
+boundaryField
+{
+    walls
+    {
+        type            compressible::kQRWallFunction;
+        value           uniform 37.5;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/p b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/p
new file mode 100644
index 0000000000..e79f6cda35
--- /dev/null
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/p
@@ -0,0 +1,34 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev.wbm                               |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 100000;
+
+boundaryField
+{
+    walls
+    {
+        type            zeroGradient;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/chemkin/chem.inp b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/chemkin/chem.inp
new file mode 100644
index 0000000000..e1c6680825
--- /dev/null
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/chemkin/chem.inp
@@ -0,0 +1,6 @@
+ELEMENTS
+O  H  N
+END
+SPECIES
+N2  O2 H2O
+END
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/chemkin/foam.dat b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/chemkin/foam.dat
new file mode 100644
index 0000000000..36ef324312
--- /dev/null
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/chemkin/foam.dat
@@ -0,0 +1,17 @@
+(
+O2 O2   1   31.9988
+    200 5000    1000
+    3.69758 0.00061352 -1.25884e-07 1.77528e-11 -1.13644e-15 -1233.93 3.18917
+    3.21294 0.00112749 -5.75615e-07 1.31388e-09 -8.76855e-13 -1005.25 6.03474
+    1.67212e-06 170.672
+H2O H2O 1   18.0153
+    200 5000    1000
+    2.67215 0.00305629 -8.73026e-07 1.201e-10 -6.39162e-15 -29899.2 6.86282
+    3.38684 0.00347498 -6.3547e-06 6.96858e-09 -2.50659e-12 -30208.1 2.59023
+    1.67212e-06 170.672
+N2 N2   1   28.0134
+    200 5000    1000
+    2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053
+    3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44486e-12 -1020.9 3.95037
+    1.67212e-06 170.672
+)
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/chemkin/foam.inp b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/chemkin/foam.inp
new file mode 100644
index 0000000000..80d66f62c0
--- /dev/null
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/chemkin/foam.inp
@@ -0,0 +1,11 @@
+species
+(
+    O2
+    H2O
+    N2
+)
+;
+
+reactions
+(
+);
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/chemkin/therm.dat b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/chemkin/therm.dat
new file mode 100644
index 0000000000..2a896be398
--- /dev/null
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/chemkin/therm.dat
@@ -0,0 +1,15 @@
+THERMO ALL
+   200.000  1000.000  5000.000
+H2O                20387H   2O   1          G  0200.00   5000.00  1000.00      1
+ 0.02672146E+02 0.03056293E-01-0.08730260E-05 0.01200996E-08-0.06391618E-13    2
+-0.02989921E+06 0.06862817E+02 0.03386842E+02 0.03474982E-01-0.06354696E-04    3
+ 0.06968581E-07-0.02506588E-10-0.03020811E+06 0.02590233E+02                   4
+N2                121286N   2               G  0200.00   5000.00  1000.00      1
+ 0.02926640E+02 0.01487977E-01-0.05684761E-05 0.01009704E-08-0.06753351E-13    2
+-0.09227977E+04 0.05980528E+02 0.03298677E+02 0.01408240E-01-0.03963222E-04    3
+ 0.05641515E-07-0.02444855E-10-0.01020900E+05 0.03950372E+02                   4
+O2                121386O   2               G  0200.00   5000.00  1000.00      1
+ 0.03697578E+02 0.06135197E-02-0.01258842E-05 0.01775281E-09-0.01136435E-13    2
+-0.01233930E+05 0.03189166E+02 0.03212936E+02 0.01127486E-01-0.05756150E-05    3
+ 0.01313877E-07-0.08768554E-11-0.01005249E+05 0.06034738E+02                   4
+END
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/chemistryProperties b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/chemistryProperties
new file mode 100644
index 0000000000..5db89903b4
--- /dev/null
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/chemistryProperties
@@ -0,0 +1,47 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev.wbm                               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      chemistryProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+chemistry       off;
+
+turbulentReaction off;
+
+chemistrySolver ODE;
+
+initialChemicalTimeStep 1e-07;
+
+sequentialCoeffs
+{
+    cTauChem        0.001;
+}
+
+EulerImplicitCoeffs
+{
+    cTauChem        0.05;
+    equilibriumRateLimiter off;
+}
+
+ODECoeffs
+{
+    ODESolver       RK;
+    eps             0.05;
+    scale           1;
+}
+
+Cmix            Cmix [ 0 0 0 0 0 0 0 ] 1;
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/environmentalProperties b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/environmentalProperties
new file mode 100644
index 0000000000..e0915430ad
--- /dev/null
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/environmentalProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev.wbm                               |
+|   \\  /    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 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/blockMeshDict b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/blockMeshDict
new file mode 100644
index 0000000000..77435eb9a4
--- /dev/null
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/blockMeshDict
@@ -0,0 +1,61 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev.wbm                               |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant/polyMesh";
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 0.001;
+
+vertices
+(
+    ( 0  0  0)
+    (12  0  0)
+    (12 12  0)
+    ( 0 12  0)
+    ( 0  0  1)
+    (12  0  1)
+    (12 12  1)
+    ( 0 12  1)
+);
+
+blocks
+(
+    hex (0 1 2 3 4 5 6 7) (20 20 1) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+patches
+(
+    wall walls
+    (
+        (3 7 6 2)
+        (0 4 7 3)
+        (2 6 5 1)
+        (1 5 4 0)
+    )
+    empty frontAndBack
+    (
+        (0 3 2 1)
+        (4 5 6 7)
+    )
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties
new file mode 100644
index 0000000000..456288d5a8
--- /dev/null
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties
@@ -0,0 +1,65 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev.wbm                               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation       off;
+
+radiationModel  P1;
+
+solverFreq      10;
+
+noRadiation
+{
+}
+
+P1Coeffs
+{
+    C               C [ 0 0 0 0 0 0 0 ] 0;
+}
+
+absorptionEmissionModel binaryAbsorptionEmission;
+
+binaryAbsorptionEmissionCoeffs
+{
+    model1
+    {
+        absorptionEmissionModel constantAbsorptionEmission;
+        constantAbsorptionEmissionCoeffs
+        {
+            a               a [ 0 -1 0 0 0 0 0 ] 0.5;
+            e               e [ 0 -1 0 0 0 0 0 ] 0.5;
+            E               E [ 1 -1 -3 0 0 0 0 ] 0;
+        }
+    }
+    model2
+    {
+        absorptionEmissionModel cloudAbsorptionEmission;
+        cloudAbsorptionEmissionCoeffs
+        {
+            cloudNames      ( coalCloud1 limestoneCloud1 );
+        }
+    }
+}
+
+scatterModel    cloudScatter;
+
+cloudScatterCoeffs
+{
+    cloudNames      ( coalCloud1 limestoneCloud1 );
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Positions b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Positions
new file mode 100644
index 0000000000..6d19cbc19b
--- /dev/null
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Positions
@@ -0,0 +1,44 @@
+/*--------------------------------*- 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       vectorField;
+    location    "constant";
+    object      reactingCloud1Positions;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+(
+(0.002 0.002 0.00005)
+(0.004 0.002 0.00005)
+(0.006 0.002 0.00005)
+(0.008 0.002 0.00005)
+(0.010 0.002 0.00005)
+(0.002 0.004 0.00005)
+(0.004 0.004 0.00005)
+(0.006 0.004 0.00005)
+(0.008 0.004 0.00005)
+(0.010 0.004 0.00005)
+(0.002 0.006 0.00005)
+(0.004 0.006 0.00005)
+(0.006 0.006 0.00005)
+(0.008 0.006 0.00005)
+(0.010 0.006 0.00005)
+(0.002 0.008 0.00005)
+(0.004 0.008 0.00005)
+(0.006 0.008 0.00005)
+(0.008 0.008 0.00005)
+(0.010 0.008 0.00005)
+(0.002 0.010 0.00005)
+(0.004 0.010 0.00005)
+(0.006 0.010 0.00005)
+(0.008 0.010 0.00005)
+(0.010 0.010 0.00005)
+)
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
new file mode 100644
index 0000000000..8fca8a8227
--- /dev/null
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
@@ -0,0 +1,129 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev.wbm                               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      reactingCloud1Properties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+InjectionModel  ManualInjection;
+
+DragModel       SphereDrag;
+
+DispersionModel none;
+
+WallInteractionModel StandardWallInteraction;
+
+HeatTransferModel RanzMarshall;
+
+CompositionModel SinglePhaseMixture;
+
+PhaseChangeModel LiquidEvaporation;
+
+radiation       off;
+
+coupled         true;
+
+cellValueSourceCorrection on;
+
+parcelTypeId    1;
+
+constantProperties
+{
+    rhoMin          rhoMin [ 1 -3 0 0 0 ] 1e-15;
+    TMin            TMin [ 0 0 0 1 0 ] 200;
+    pMin            pMin [ 1 -1 2 0 0 ] 1000;
+    rho0            rho0 [ 1 -3 0 0 0 ] 1000;
+    minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15;
+    T0              T0 [ 0 0 0 1 0 ] 300;
+    cp0             cp0 [ 0 2 -2 -1 0 ] 4187;
+    epsilon0        epsilon0 [ 0 0 0 0 0 ] 1;
+    f0              f0 [ 0 0 0 0 0 ] 0.5;
+    Tbp             Tbp [ 0 0 0 1 0 ] 393;
+    Tvap            Tvap [ 0 0 0 1 0 ] 273;
+    constantVolume  false;
+}
+
+interpolationSchemes
+{
+    rho             cell;
+    U               cellPointFace;
+    mu              cell;
+    T               cell;
+    Cp              cell;
+    p               cell;
+}
+
+integrationSchemes
+{
+    U               Euler;
+    T               Analytical;
+}
+
+particleForces
+{
+    gravity         on;
+    virtualMass     off;
+    Cvm             0.5;
+    pressureGradient off;
+    gradU           gradU;
+}
+
+ManualInjectionCoeffs
+{
+    massTotal       massTotal [ 1 0 0 0 0 ] 1e-7;
+    parcelBasisType mass;
+    SOI             0;
+    positionsFile   "reactingCloud1Positions";
+    U0              ( 0 0 0 );
+    parcelPDF
+    {
+        pdfType         uniform;
+        uniformPDF
+        {
+            minValue        1e-04;
+            maxValue        1e-04;
+        }
+    }
+}
+
+StandardWallInteractionCoeffs
+{
+    e               e [ 0 0 0 0 0 ] 1;
+    mu              mu [ 0 0 0 0 0 ] 0;
+}
+
+RanzMarshallCoeffs
+{
+    Pr              Pr [ 0 0 0 0 0 ] 0.7;
+}
+
+SinglePhaseMixtureCoeffs
+{
+    phases
+    (
+        liquid
+        {
+            H2O 1;
+        }
+    );
+}
+
+LiquidEvaporationCoeffs
+{
+    activeLiquids
+    (
+        H2O
+    );
+}
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties
new file mode 100644
index 0000000000..4fd55a6916
--- /dev/null
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties
@@ -0,0 +1,35 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev.wbm                               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType      hMixtureThermo<reactingMixture>;
+
+chemistryReader foamChemistryReader;
+
+foamChemistryFile "$FOAM_CASE/chemkin/foam.inp";
+
+foamChemistryThermoFile "$FOAM_CASE/chemkin/foam.dat";
+
+liquidComponents ( H2O );
+
+solidFuelComponents ( );
+
+inertSpecie     N2;
+
+H2O             H2O defaultCoeffs;
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/turbulenceProperties b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/turbulenceProperties
new file mode 100644
index 0000000000..f6734cd86d
--- /dev/null
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev.wbm                               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/controlDict b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/controlDict
new file mode 100644
index 0000000000..3e3ea688b7
--- /dev/null
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/controlDict
@@ -0,0 +1,53 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev.wbm                               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         1;
+
+deltaT          0.001;
+
+writeControl    adjustableRunTime;
+
+writeInterval   0.1;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  10;
+
+writeCompression uncompressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+adjustTimeStep  yes;
+
+maxCo           0.3;
+
+maxDeltaT       1e-3;
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/decomposeParDict b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/decomposeParDict
new file mode 100644
index 0000000000..eb811c3f39
--- /dev/null
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/decomposeParDict
@@ -0,0 +1,50 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev.wbm                               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 4;
+
+method          metis;
+
+simpleCoeffs
+{
+    n               ( 2 2 1 );
+    delta           0.001;
+}
+
+hierarchicalCoeffs
+{
+    n               ( 1 1 1 );
+    delta           0.001;
+    order           xyz;
+}
+
+metisCoeffs
+{
+    processorWeights ( 1 1 1 1 );
+}
+
+manualCoeffs
+{
+    dataFile        "";
+}
+
+distributed     no;
+
+roots           ( );
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/fvSchemes b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/fvSchemes
new file mode 100644
index 0000000000..e8d1620ff8
--- /dev/null
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/fvSchemes
@@ -0,0 +1,72 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev.wbm                               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+    grad(p)         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+    div(phi,U)      Gauss upwind;
+    div(phid,p)     Gauss upwind;
+    div(phiU,p)     Gauss linear;
+    div(phi,h)      Gauss upwind;
+    div(phi,k)      Gauss upwind;
+    div(phi,epsilon) Gauss upwind;
+    div(U)          Gauss linear;
+    div((muEff*dev2(grad(U).T()))) Gauss linear;
+    div(phi,Yi_h)   Gauss upwind;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear corrected;
+    laplacian(muEff,U) Gauss linear corrected;
+    laplacian(mut,U) Gauss linear corrected;
+    laplacian(DkEff,k) Gauss linear corrected;
+    laplacian(DepsilonEff,epsilon) Gauss linear corrected;
+    laplacian(DREff,R) Gauss linear corrected;
+    laplacian((rho*(1|A(U))),p) Gauss linear corrected;
+    laplacian(alphaEff,h) Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+fluxRequired
+{
+    default         no;
+    p               ;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution
new file mode 100644
index 0000000000..c74c020453
--- /dev/null
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution
@@ -0,0 +1,143 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev.wbm                               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    rho
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-05;
+        relTol          0;
+    }
+    U
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    }
+    p
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    }
+    G
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-05;
+        relTol          0;
+    }
+    Yi
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    }
+    CO2
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    }
+    O2
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    }
+    N2
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    }
+    CH4
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    }
+    H2
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    }
+    H2O
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    }
+    CO
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    }
+    h
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    }
+    R
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    }
+    k
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    }
+    epsilon
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    }
+}
+
+PISO
+{
+    transonic       yes;
+    nCorrectors     2;
+    nNonOrthogonalCorrectors 0;
+    momentumPredictor yes;
+}
+
+
+// ************************************************************************* //

From 58871d43688ea8ba0027db0bf8c08b0ea5b935cf Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 19 May 2009 18:18:56 +0100
Subject: [PATCH 161/175] adding writeRegisteredObject

---
 src/postProcessing/functionObjects/Allwmake   |   1 +
 .../functionObjects/IO/Make/files             |   4 +
 .../functionObjects/IO/Make/options           |   9 ++
 .../IOwriteRegisteredObject.H                 |  50 ++++++
 .../writeRegisteredObject.C                   | 123 ++++++++++++++
 .../writeRegisteredObject.H                   | 150 ++++++++++++++++++
 .../writeRegisteredObjectFunctionObject.C     |  47 ++++++
 .../writeRegisteredObjectFunctionObject.H     |  55 +++++++
 8 files changed, 439 insertions(+)
 create mode 100644 src/postProcessing/functionObjects/IO/Make/files
 create mode 100644 src/postProcessing/functionObjects/IO/Make/options
 create mode 100644 src/postProcessing/functionObjects/IO/writeRegisteredObject/IOwriteRegisteredObject.H
 create mode 100644 src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C
 create mode 100644 src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H
 create mode 100644 src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObjectFunctionObject.C
 create mode 100644 src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObjectFunctionObject.H

diff --git a/src/postProcessing/functionObjects/Allwmake b/src/postProcessing/functionObjects/Allwmake
index 051f73227f..6c642dfe7b 100755
--- a/src/postProcessing/functionObjects/Allwmake
+++ b/src/postProcessing/functionObjects/Allwmake
@@ -4,6 +4,7 @@ set -x
 
 wmake libso field
 wmake libso forces
+wmake libso IO
 wmake libso utilities
 wmake libso systemCall
 
diff --git a/src/postProcessing/functionObjects/IO/Make/files b/src/postProcessing/functionObjects/IO/Make/files
new file mode 100644
index 0000000000..a3517e560f
--- /dev/null
+++ b/src/postProcessing/functionObjects/IO/Make/files
@@ -0,0 +1,4 @@
+writeRegisteredObject/writeRegisteredObject.C
+writeRegisteredObject/writeRegisteredObjectFunctionObject.C
+
+LIB = $(FOAM_LIBBIN)/libIOFunctionObjects
diff --git a/src/postProcessing/functionObjects/IO/Make/options b/src/postProcessing/functionObjects/IO/Make/options
new file mode 100644
index 0000000000..5166bcc9e3
--- /dev/null
+++ b/src/postProcessing/functionObjects/IO/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/IO/writeRegisteredObject/IOwriteRegisteredObject.H b/src/postProcessing/functionObjects/IO/writeRegisteredObject/IOwriteRegisteredObject.H
new file mode 100644
index 0000000000..cb014395c9
--- /dev/null
+++ b/src/postProcessing/functionObjects/IO/writeRegisteredObject/IOwriteRegisteredObject.H
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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
+
+Typedef
+    Foam::IOwriteRegisteredObject
+
+Description
+    Instance of the generic IOOutputFilter for writeRegisteredObject.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef IOwriteRegisteredObject_H
+#define IOwriteRegisteredObject_H
+
+#include "writeRegisteredObject.H"
+#include "IOOutputFilter.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef IOOutputFilter<writeRegisteredObject> IOwriteRegisteredObject;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C
new file mode 100644
index 0000000000..b5ad785ab1
--- /dev/null
+++ b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C
@@ -0,0 +1,123 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "writeRegisteredObject.H"
+#include "dictionary.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(writeRegisteredObject, 0);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::writeRegisteredObject::writeRegisteredObject
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    const bool loadFromFiles
+)
+:
+    name_(name),
+    obr_(obr),
+    active_(true),
+    objectNames_()
+{
+    read(dict);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::writeRegisteredObject::~writeRegisteredObject()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::writeRegisteredObject::read(const dictionary& dict)
+{
+    if (active_)
+    {
+        dict.lookup("objectNames") >> objectNames_;
+
+        forAll(objectNames_, i)
+        {
+            if (obr_.foundObject<regIOobject>(objectNames_[i]))
+            {
+                regIOobject& obj =
+                    const_cast<regIOobject&>
+                    (
+                        obr_.lookupObject<regIOobject>(objectNames_[i])
+                    );
+                obj.writeOpt() = IOobject::NO_WRITE;
+            }
+            else
+            {
+                FatalErrorIn
+                (
+                    "Foam::writeRegisteredObject::read(const dictionary&)"
+                )   << "Object " << objectNames_[i] << " not found in "
+                    << "database. Available objects are:" << nl << obr_.toc()
+                    << nl << exit(FatalError);
+            }
+        }
+    }
+}
+
+
+void Foam::writeRegisteredObject::execute()
+{
+    // Do nothing - only valid on write
+}
+
+
+void Foam::writeRegisteredObject::end()
+{
+    // Do nothing - only valid on write
+}
+
+
+void Foam::writeRegisteredObject::write()
+{
+    if (active_)
+    {
+        forAll(objectNames_, i)
+        {
+            const regIOobject& obj =
+                obr_.lookupObject<regIOobject>(objectNames_[i]);
+            obj.write();
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H
new file mode 100644
index 0000000000..6cfeaa5e0b
--- /dev/null
+++ b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H
@@ -0,0 +1,150 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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::writeRegisteredObject
+
+Description
+    Takes over the writing of registered IO objects
+
+SourceFiles
+    writeRegisteredObject.C
+    IOwriteRegisteredObject.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef writeRegisteredObject_H
+#define writeRegisteredObject_H
+
+#include "pointFieldFwd.H"
+#include "wordList.H"
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class objectRegistry;
+class dictionary;
+class mapPolyMesh;
+
+/*---------------------------------------------------------------------------*\
+                   Class writeRegisteredObject Declaration
+\*---------------------------------------------------------------------------*/
+
+class writeRegisteredObject
+{
+protected:
+
+    // Private data
+
+        //- Name of this set of writeRegisteredObject
+        word name_;
+
+        const objectRegistry& obr_;
+
+        //- On/off switch
+        bool active_;
+
+
+        // Read from dictionary
+
+            //- Names of objects to control
+            wordList objectNames_;
+
+
+    // Private Member Functions
+
+
+        //- Disallow default bitwise copy construct
+        writeRegisteredObject(const writeRegisteredObject&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const writeRegisteredObject&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("writeRegisteredObject");
+
+
+    // Constructors
+
+        //- Construct for given objectRegistry and dictionary.
+        //  Allow the possibility to load fields from files
+        writeRegisteredObject
+        (
+            const word& name,
+            const objectRegistry&,
+            const dictionary&,
+            const bool loadFromFiles = false
+        );
+
+
+    //- Destructor
+    virtual ~writeRegisteredObject();
+
+
+    // Member Functions
+
+        //- Return name of the writeRegisteredObject
+        virtual const word& name() const
+        {
+            return name_;
+        }
+
+        //- Read the writeRegisteredObject 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 writeRegisteredObject
+        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/IO/writeRegisteredObject/writeRegisteredObjectFunctionObject.C b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObjectFunctionObject.C
new file mode 100644
index 0000000000..9b4c324c9d
--- /dev/null
+++ b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObjectFunctionObject.C
@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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 "writeRegisteredObjectFunctionObject.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineNamedTemplateTypeNameAndDebug
+    (
+        writeRegisteredObjectFunctionObject,
+        0
+    );
+
+    addToRunTimeSelectionTable
+    (
+        functionObject,
+        writeRegisteredObjectFunctionObject,
+        dictionary
+    );
+}
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObjectFunctionObject.H b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObjectFunctionObject.H
new file mode 100644
index 0000000000..284aa6c17a
--- /dev/null
+++ b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObjectFunctionObject.H
@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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
+
+Typedef
+    Foam::writeRegisteredObjectFunctionObject
+
+Description
+    FunctionObject wrapper around writeRegisteredObject to allow them to be
+    created via the functions list within controlDict.
+
+SourceFiles
+    writeRegisteredObjectFunctionObject.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef writeRegisteredObjectFunctionObject_H
+#define writeRegisteredObjectFunctionObject_H
+
+#include "writeRegisteredObject.H"
+#include "OutputFilterFunctionObject.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef OutputFilterFunctionObject<writeRegisteredObject>
+        writeRegisteredObjectFunctionObject;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 5ccff5ffca34baa563fafbdb47a494864b6028cb Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 19 May 2009 18:23:41 +0100
Subject: [PATCH 162/175] updated version in header to 1.5.x

---
 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/G     | 2 +-
 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/H2O   | 2 +-
 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/N2    | 2 +-
 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/O2    | 2 +-
 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/T     | 2 +-
 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/U     | 2 +-
 .../Lagrangian/reactingParcelFoam/evaporationTest/0/epsilon     | 2 +-
 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/k     | 2 +-
 tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/p     | 2 +-
 .../evaporationTest/constant/chemistryProperties                | 2 +-
 .../evaporationTest/constant/environmentalProperties            | 2 +-
 .../evaporationTest/constant/polyMesh/blockMeshDict             | 2 +-
 .../evaporationTest/constant/radiationProperties                | 2 +-
 .../evaporationTest/constant/reactingCloud1Properties           | 2 +-
 .../evaporationTest/constant/thermophysicalProperties           | 2 +-
 .../evaporationTest/constant/turbulenceProperties               | 2 +-
 .../reactingParcelFoam/evaporationTest/system/controlDict       | 2 +-
 .../reactingParcelFoam/evaporationTest/system/decomposeParDict  | 2 +-
 .../reactingParcelFoam/evaporationTest/system/fvSchemes         | 2 +-
 .../reactingParcelFoam/evaporationTest/system/fvSolution        | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/G b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/G
index abe11dad91..fa160e6bb3 100644
--- a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/G
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/G
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev.wbm                               |
+|  \\    /   O peration     | Version:  1.5.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/H2O b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/H2O
index 208798ede8..a5001202ea 100644
--- a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/H2O
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/H2O
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev.wbm                               |
+|  \\    /   O peration     | Version:  1.5.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/N2 b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/N2
index 1b93101bda..61a0a0cd9d 100644
--- a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/N2
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/N2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev.wbm                               |
+|  \\    /   O peration     | Version:  1.5.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/O2 b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/O2
index a6e91c1098..3927d8183c 100644
--- a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/O2
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/O2
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev.wbm                               |
+|  \\    /   O peration     | Version:  1.5.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/T b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/T
index 6f7b57f7da..4a49016ccd 100644
--- a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/T
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev.wbm                               |
+|  \\    /   O peration     | Version:  1.5.x                                 |
 |   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/U b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/U
index b107a985d3..2b02dd199a 100644
--- a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/U
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/U
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev.wbm                               |
+|  \\    /   O peration     | Version:  1.5.x                                 |
 |   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/epsilon b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/epsilon
index b749ed00db..50b54646b3 100644
--- a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/epsilon
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/epsilon
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev.wbm                               |
+|  \\    /   O peration     | Version:  1.5.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/k b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/k
index 4e39b98fe9..26fcff0bab 100644
--- a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/k
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/k
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev.wbm                               |
+|  \\    /   O peration     | Version:  1.5.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/p b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/p
index e79f6cda35..9563def1f1 100644
--- a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/p
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/0/p
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev.wbm                               |
+|  \\    /   O peration     | Version:  1.5.x                                 |
 |   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/chemistryProperties b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/chemistryProperties
index 5db89903b4..53a5860d33 100644
--- a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/chemistryProperties
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/chemistryProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev.wbm                               |
+|  \\    /   O peration     | Version:  1.5.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/environmentalProperties b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/environmentalProperties
index e0915430ad..e5124f2452 100644
--- a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/environmentalProperties
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/environmentalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev.wbm                               |
+|  \\    /   O peration     | Version:  1.5.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/blockMeshDict b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/blockMeshDict
index 77435eb9a4..68e44fead4 100644
--- a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/blockMeshDict
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/blockMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev.wbm                               |
+|  \\    /   O peration     | Version:  1.5.x                                 |
 |   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties
index 456288d5a8..59468cd924 100644
--- a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev.wbm                               |
+|  \\    /   O peration     | Version:  1.5.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
index 8fca8a8227..470165c7f2 100644
--- a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev.wbm                               |
+|  \\    /   O peration     | Version:  1.5.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties
index 4fd55a6916..04b13b12cf 100644
--- a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev.wbm                               |
+|  \\    /   O peration     | Version:  1.5.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/turbulenceProperties b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/turbulenceProperties
index f6734cd86d..974e568fa8 100644
--- a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/turbulenceProperties
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/constant/turbulenceProperties
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev.wbm                               |
+|  \\    /   O peration     | Version:  1.5.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/controlDict b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/controlDict
index 3e3ea688b7..fb4a4c45a7 100644
--- a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/controlDict
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/controlDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev.wbm                               |
+|  \\    /   O peration     | Version:  1.5.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/decomposeParDict b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/decomposeParDict
index eb811c3f39..e9784a98d7 100644
--- a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/decomposeParDict
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/decomposeParDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev.wbm                               |
+|  \\    /   O peration     | Version:  1.5.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/fvSchemes b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/fvSchemes
index e8d1620ff8..99267208ea 100644
--- a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/fvSchemes
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/fvSchemes
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev.wbm                               |
+|  \\    /   O peration     | Version:  1.5.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution
index c74c020453..294428ed7b 100644
--- a/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution
+++ b/tutorials/Lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev.wbm                               |
+|  \\    /   O peration     | Version:  1.5.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

From d1295da31f72436f03c11355554663fac8e3e635 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 19 May 2009 20:21:50 +0200
Subject: [PATCH 163/175] adjust solvers and utilities to use new argList
 methods

- also drop various unused time options from src/OpenFOAM/include
---
 .../kinematicParcelFoam/createFields.H        |  6 +--
 .../basic/potentialFoam/potentialFoam.C       |  2 +-
 .../advanced/collapseEdges/collapseEdges.C    |  2 +-
 .../combinePatchFaces/combinePatchFaces.C     | 13 ++----
 .../mesh/advanced/modifyMesh/modifyMesh.C     |  2 +-
 .../advanced/refineHexMesh/refineHexMesh.C    |  2 +-
 .../refineWallLayer/refineWallLayer.C         |  6 +--
 .../refinementLevel/refinementLevel.C         |  2 +-
 .../mesh/advanced/removeFaces/removeFaces.C   |  2 +-
 .../mesh/advanced/splitCells/splitCells.C     | 16 +++-----
 .../mesh/conversion/ansysToFoam/ansysToFoam.L |  7 +---
 .../mesh/conversion/cfx4ToFoam/cfx4ToFoam.C   |  5 +--
 .../fluent3DMeshToFoam/fluent3DMeshToFoam.L   | 15 +++----
 .../fluentMeshToFoam/fluentMeshToFoam.L       |  9 ++--
 .../foamToStarMesh/foamToStarMesh.C           | 11 +++--
 .../conversion/gambitToFoam/gambitToFoam.L    |  7 +---
 .../mesh/conversion/gmshToFoam/gmshToFoam.C   |  2 +-
 .../ideasUnvToFoam/ideasUnvToFoam.C           |  2 +-
 .../mesh/conversion/kivaToFoam/kivaToFoam.C   | 13 +++---
 .../mesh/conversion/mshToFoam/mshToFoam.C     |  4 +-
 .../conversion/plot3dToFoam/plot3dToFoam.C    | 20 ++++-----
 .../conversion/polyDualMesh/polyDualMeshApp.C |  6 +--
 .../mesh/conversion/sammToFoam/sammToFoam.C   |  5 +--
 .../mesh/conversion/star4ToFoam/star4ToFoam.C | 11 +++--
 .../mesh/conversion/starToFoam/starToFoam.C   |  5 +--
 .../conversion/tetgenToFoam/tetgenToFoam.C    |  2 +-
 .../conversion/writeMeshObj/writeMeshObj.C    | 25 +++++------
 .../mesh/generation/blockMesh/blockMeshApp.C  | 12 +++---
 .../extrude2DMesh/doExtrude2DMesh.C           |  2 +-
 .../mesh/generation/extrudeMesh/extrudeMesh.C | 12 +++---
 .../mesh/manipulation/attachMesh/attachMesh.C |  2 +-
 .../mesh/manipulation/autoPatch/autoPatch.C   |  2 +-
 .../mesh/manipulation/checkMesh/checkMesh.C   |  6 +--
 .../createBaffles/createBaffles.C             |  6 +--
 .../manipulation/createPatch/createPatch.C    |  2 +-
 .../mergeOrSplitBaffles/mergeOrSplitBaffles.C |  6 +--
 .../mesh/manipulation/refineMesh/refineMesh.C |  4 +-
 .../manipulation/renumberMesh/renumberMesh.C  |  8 ++--
 .../mesh/manipulation/setSet/setSet.C         |  6 +--
 .../manipulation/setsToZones/setsToZones.C    |  2 +-
 .../mesh/manipulation/splitMesh/splitMesh.C   |  2 +-
 .../splitMeshRegions/splitMeshRegions.C       | 20 ++++-----
 .../mesh/manipulation/stitchMesh/stitchMesh.C |  6 +--
 .../mesh/manipulation/subsetMesh/subsetMesh.C |  6 +--
 .../transformPoints/transformPoints.C         | 28 ++++++-------
 .../foamDebugSwitches/foamDebugSwitches.C     |  6 +--
 .../miscellaneous/foamInfoExec/foamInfoExec.C | 26 +++++-------
 .../decomposePar/decomposePar.C               | 16 ++++----
 .../reconstructPar/reconstructPar.C           |  6 +--
 .../reconstructParMesh/reconstructParMesh.C   | 12 +++---
 .../redistributeMeshPar/redistributeMeshPar.C |  5 +--
 .../foamToEnsight/ensightMesh.C               |  8 ++--
 .../foamToEnsight/foamToEnsight.C             |  6 +--
 .../foamToEnsightParts/foamToEnsightParts.C   |  8 ++--
 .../foamToFieldview9/checkTimeOption.H        | 26 ------------
 .../foamToFieldview9/foamToFieldview9.C       |  2 +-
 .../dataConversion/foamToVTK/foamToVTK.C      | 41 +++++++++----------
 .../dsmcFieldsCalc/dsmcFieldsCalc.C           |  2 +-
 .../execFlowFunctionObjects.C                 |  6 +--
 .../postProcessing/velocityField/Co/Co.C      |  2 +-
 .../postProcessing/velocityField/Mach/Mach.C  |  2 +-
 .../postProcessing/velocityField/Pe/Pe.C      |  2 +-
 .../postProcessing/velocityField/Q/Q.C        |  2 +-
 .../velocityField/enstrophy/enstrophy.C       |  2 +-
 .../velocityField/uprime/uprime.C             |  2 +-
 .../velocityField/vorticity/vorticity.C       |  2 +-
 .../applyBoundaryLayer/applyBoundaryLayer.C   | 11 +++--
 .../applyWallFunctionBounaryConditions.C      |  2 +-
 .../foamUpgradeFvSolution.C                   |  2 +-
 .../preProcessing/mapFields/setRoots.H        | 19 ++-------
 .../preProcessing/mapFields/setTimeIndex.H    |  7 ++--
 .../utilities/surface/surfaceAdd/surfaceAdd.C | 12 +++---
 .../surface/surfaceCheck/surfaceCheck.C       |  4 +-
 .../surface/surfaceConvert/surfaceConvert.C   | 14 +++----
 .../surfaceFeatureExtract.C                   | 35 +++++++---------
 .../surface/surfaceFind/surfaceFind.C         | 10 +++--
 .../surfaceMeshConvert/surfaceMeshConvert.C   | 34 ++++++---------
 .../surfaceMeshConvertTesting.C               | 29 ++++++-------
 .../surfaceMeshExport/surfaceMeshExport.C     | 38 ++++++-----------
 .../surfaceMeshImport/surfaceMeshImport.C     | 38 ++++++-----------
 .../surfaceMeshTriangulate.C                  |  8 ++--
 .../surface/surfaceOrient/surfaceOrient.C     |  2 +-
 .../surfaceSplitNonManifolds.C                |  2 +-
 .../surface/surfaceToPatch/surfaceToPatch.C   | 10 ++---
 .../surfaceTransformPoints.C                  | 20 ++++-----
 src/OpenFOAM/include/addConstantOption.H      |  1 -
 src/OpenFOAM/include/addLatestTimeOption.H    |  1 -
 src/OpenFOAM/include/addNoZeroOption.H        |  1 -
 src/OpenFOAM/include/addTimeOption.H          |  1 -
 src/OpenFOAM/include/addTimeOptions.H         | 12 ++++--
 .../include/addTimeOptionsNoConstant.H        |  2 -
 src/OpenFOAM/include/checkConstantOption.H    |  8 +---
 src/OpenFOAM/include/checkLatestTimeOption.H  |  2 +-
 src/OpenFOAM/include/checkTimeOption.H        |  4 +-
 src/OpenFOAM/include/createNamedMesh.H        |  5 +--
 src/OpenFOAM/include/createNamedPolyMesh.H    |  5 +--
 96 files changed, 344 insertions(+), 513 deletions(-)
 delete mode 100644 applications/utilities/postProcessing/dataConversion/foamToFieldview9/checkTimeOption.H
 delete mode 100644 src/OpenFOAM/include/addConstantOption.H
 delete mode 100644 src/OpenFOAM/include/addLatestTimeOption.H
 delete mode 100644 src/OpenFOAM/include/addNoZeroOption.H
 delete mode 100644 src/OpenFOAM/include/addTimeOption.H
 delete mode 100644 src/OpenFOAM/include/addTimeOptionsNoConstant.H

diff --git a/applications/solvers/Lagrangian/kinematicParcelFoam/createFields.H b/applications/solvers/Lagrangian/kinematicParcelFoam/createFields.H
index 3854911dd9..c76a81ca46 100644
--- a/applications/solvers/Lagrangian/kinematicParcelFoam/createFields.H
+++ b/applications/solvers/Lagrangian/kinematicParcelFoam/createFields.H
@@ -47,11 +47,7 @@
     );
 
     word kinematicCloudName("kinematicCloud");
-
-    if (args.options().found("cloudName"))
-    {
-        kinematicCloudName = args.options()["cloudName"];
-    }
+    args.optionReadIfPresent("cloudName", kinematicCloudName);
 
     Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;
     basicKinematicCloud kinematicCloud
diff --git a/applications/solvers/basic/potentialFoam/potentialFoam.C b/applications/solvers/basic/potentialFoam/potentialFoam.C
index 9d2073bf2e..49188fcf00 100644
--- a/applications/solvers/basic/potentialFoam/potentialFoam.C
+++ b/applications/solvers/basic/potentialFoam/potentialFoam.C
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
     U.write();
     phi.write();
 
-    if (args.options().found("writep"))
+    if (args.optionFound("writep"))
     {
         p.write();
     }
diff --git a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
index e87078cc39..d4d6d11539 100644
--- a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
+++ b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
@@ -465,7 +465,7 @@ int main(int argc, char *argv[])
 
     scalar minLen(readScalar(IStringStream(args.additionalArgs()[0])()));
     scalar angle(readScalar(IStringStream(args.additionalArgs()[1])()));
-    bool overwrite = args.options().found("overwrite");
+    bool overwrite = args.optionFound("overwrite");
 
     scalar maxCos = Foam::cos(angle*180/mathematicalConstant::pi);
 
diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
index fa244430f6..60c9439561 100644
--- a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
+++ b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
@@ -448,19 +448,12 @@ int main(int argc, char *argv[])
     scalar minCos = Foam::cos(featureAngle*mathematicalConstant::pi/180.0);
 
     scalar concaveAngle = defaultConcaveAngle;
-
-    if (args.options().found("concaveAngle"))
-    {
-        concaveAngle = readScalar
-        (
-            IStringStream(args.options()["concaveAngle"])()
-        );
-    }
+    args.optionReadIfPresent("concaveAngle", concaveAngle);
 
     scalar concaveSin = Foam::sin(concaveAngle*mathematicalConstant::pi/180.0);
 
-    bool snapMeshDict = args.options().found("snapMesh");
-    bool overwrite = args.options().found("overwrite");
+    bool snapMeshDict = args.optionFound("snapMesh");
+    bool overwrite = args.optionFound("overwrite");
 
     Info<< "Merging all faces of a cell" << nl
         << "    - which are on the same patch" << nl
diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
index 0011d750e5..a78ade8d6d 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
+++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
@@ -336,7 +336,7 @@ int main(int argc, char *argv[])
 #   include "createPolyMesh.H"
     const word oldInstance = mesh.pointsInstance();
 
-    bool overwrite = args.options().found("overwrite");
+    bool overwrite = args.optionFound("overwrite");
 
     Info<< "Reading modifyMeshDict\n" << endl;
 
diff --git a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
index c18e0af978..77a09ff7b9 100644
--- a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
+++ b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
     pointMesh pMesh(mesh);
 
     word cellSetName(args.args()[1]);
-    bool overwrite = args.options().found("overwrite");
+    bool overwrite = args.optionFound("overwrite");
 
     Info<< "Reading cells to refine from cellSet " << cellSetName
         << nl << endl;
diff --git a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
index 9c608366aa..a78dade6fd 100644
--- a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
+++ b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
     word patchName(args.additionalArgs()[0]);
 
     scalar weight(readScalar(IStringStream(args.additionalArgs()[1])()));
-    bool overwrite = args.options().found("overwrite");
+    bool overwrite = args.optionFound("overwrite");
 
 
     label patchID = mesh.boundaryMesh().findPatchID(patchName);
@@ -101,11 +101,11 @@ int main(int argc, char *argv[])
     // List of cells to refine
     //
 
-    bool useSet = args.options().found("useSet");
+    bool useSet = args.optionFound("useSet");
 
     if (useSet)
     {
-        word setName(args.options()["useSet"]);
+        word setName(args.option("useSet"));
 
         Info<< "Subsetting cells to cut based on cellSet" << setName << endl
             << endl;
diff --git a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
index 25b13eba88..7732c985b8 100644
--- a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
+++ b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
         << " to allow for some truncation error."
         << nl << endl;
 
-    bool readLevel = args.options().found("readLevel");
+    bool readLevel = args.optionFound("readLevel");
 
     const scalarField& vols = mesh.cellVolumes();
 
diff --git a/applications/utilities/mesh/advanced/removeFaces/removeFaces.C b/applications/utilities/mesh/advanced/removeFaces/removeFaces.C
index 26ee404fe8..c3fcc727d2 100644
--- a/applications/utilities/mesh/advanced/removeFaces/removeFaces.C
+++ b/applications/utilities/mesh/advanced/removeFaces/removeFaces.C
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
 #   include "createMesh.H"
     const word oldInstance = mesh.pointsInstance();
 
-    bool overwrite = args.options().found("overwrite");
+    bool overwrite = args.optionFound("overwrite");
 
     word setName(args.additionalArgs()[0]);
 
diff --git a/applications/utilities/mesh/advanced/splitCells/splitCells.C b/applications/utilities/mesh/advanced/splitCells/splitCells.C
index 6424745e9a..3aa649ee8b 100644
--- a/applications/utilities/mesh/advanced/splitCells/splitCells.C
+++ b/applications/utilities/mesh/advanced/splitCells/splitCells.C
@@ -542,23 +542,19 @@ int main(int argc, char *argv[])
     scalar minCos = Foam::cos(radAngle);
     scalar minSin = Foam::sin(radAngle);
 
-    bool readSet = args.options().found("set");
-    bool geometry = args.options().found("geometry");
-    bool overwrite = args.options().found("overwrite");
+    bool readSet   = args.optionFound("set");
+    bool geometry  = args.optionFound("geometry");
+    bool overwrite = args.optionFound("overwrite");
 
     scalar edgeTol = 0.2;
-
-    if (args.options().found("tol"))
-    {
-        edgeTol = readScalar(IStringStream(args.options()["tol"])());
-    }
+    args.optionReadIfPresent("tol", edgeTol);
 
     Info<< "Trying to split cells with internal angles > feature angle\n" << nl
         << "featureAngle      : " << featureAngle << nl
         << "edge snapping tol : " << edgeTol << nl;
     if (readSet)
     {
-        Info<< "candidate cells   : cellSet " << args.options()["set"] << nl;
+        Info<< "candidate cells   : cellSet " << args.option("set") << nl;
     }
     else
     {
@@ -586,7 +582,7 @@ int main(int argc, char *argv[])
     if (readSet)
     {
         // Read cells to cut from cellSet
-        cellSet cells(mesh, args.options()["set"]);
+        cellSet cells(mesh, args.option("set"));
 
         cellsToCut = cells;
     }
diff --git a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
index 149d9af19b..2fffcaa813 100644
--- a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+++ b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
@@ -246,10 +246,7 @@ int main(int argc, char *argv[])
     }
 
     scalar scaleFactor = 1.0;
-    if (args.options().found("scale"))
-    {
-        scaleFactor = atof(args.options()["scale"].c_str());
-    }
+    args.optionReadIfPresent("scale", scaleFactor);
 
 #   include "createTime.H"
 
diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
index df84d13a79..d193a48133 100644
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
@@ -60,10 +60,7 @@ int main(int argc, char *argv[])
     }
 
     scalar scaleFactor = 1.0;
-    if (args.options().found("scale"))
-    {
-        scaleFactor = atof(args.options()["scale"].c_str());
-    }
+    args.optionReadIfPresent("scale", scaleFactor);
 
 #   include "createTime.H"
 
diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
index a8606e0df9..bbaab8b01d 100644
--- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
@@ -760,21 +760,18 @@ int main(int argc, char *argv[])
         FatalError.exit();
     }
 
-    if (args.options().found("scale"))
-    {
-        scaleFactor = atof(args.options()["scale"].c_str());
-    }
+    args.optionReadIfPresent("scale", scaleFactor);
 
     HashSet<word> ignoreCellGroups;
-    if (args.options().found("ignoreCellGroups"))
+    if (args.optionFound("ignoreCellGroups"))
     {
-        IStringStream(args.options()["ignoreCellGroups"])() >> ignoreCellGroups;
+        args.optionLookup("ignoreCellGroups")() >> ignoreCellGroups;
     }
 
     HashSet<word> ignoreFaceGroups;
-    if (args.options().found("ignoreFaceGroups"))
+    if (args.optionFound("ignoreFaceGroups"))
     {
-        IStringStream(args.options()["ignoreFaceGroups"])() >> ignoreFaceGroups;
+        args.optionLookup("ignoreFaceGroups")() >> ignoreFaceGroups;
     }
 
 #   include "createTime.H"
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
index 7b385bfe06..d1afc4523a 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
@@ -879,13 +879,10 @@ int main(int argc, char *argv[])
     }
 
     scalar scaleFactor = 1.0;
-    if (args.options().found("scale"))
-    {
-        scaleFactor = atof(args.options()["scale"].c_str());
-    }
+    args.optionReadIfPresent("scale", scaleFactor);
 
-    bool writeSets = args.options().found("writeSets");
-    bool writeZones = args.options().found("writeZones");
+    bool writeSets  = args.optionFound("writeSets");
+    bool writeZones = args.optionFound("writeZones");
 
 #   include "createTime.H"
 
diff --git a/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C b/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
index 5cdbcb77e8..b36ec77769 100644
--- a/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
+++ b/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C
@@ -87,7 +87,7 @@ int main(int argc, char *argv[])
     instantList timeDirs = timeSelector::select0(runTime, args);
 
     bool surfaceOnly = false;
-    if (args.options().found("surface") or args.options().found("tri"))
+    if (args.optionFound("surface") || args.optionFound("tri"))
     {
         surfaceOnly = true;
     }
@@ -98,16 +98,15 @@ int main(int argc, char *argv[])
         exportName = meshWriter::defaultSurfaceName;
     }
 
-    if (args.options().found("case"))
+    if (args.optionFound("case"))
     {
         exportName += '-' + args.globalCaseName();
     }
 
     // default: rescale from [m] to [mm]
     scalar scaleFactor = 1000;
-    if (args.options().found("scale"))
+    if (args.optionReadIfPresent("scale", scaleFactor))
     {
-        scaleFactor = readScalar(IStringStream(args.options()["scale"])());
         if (scaleFactor <= 0)
         {
             scaleFactor = 1;
@@ -129,7 +128,7 @@ int main(int argc, char *argv[])
         {
             meshWriters::STARCD writer(mesh, scaleFactor);
 
-            if (args.options().found("noBnd"))
+            if (args.optionFound("noBnd"))
             {
                 writer.noBoundary();
             }
@@ -142,7 +141,7 @@ int main(int argc, char *argv[])
 
             if (surfaceOnly)
             {
-                if (args.options().found("tri"))
+                if (args.optionFound("tri"))
                 {
                     writer.writeSurface(meshName, true);
                 }
diff --git a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
index 6c61a219f3..f815e81b53 100644
--- a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
+++ b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
@@ -646,10 +646,7 @@ int main(int argc, char *argv[])
     }
 
     scalar scaleFactor = 1.0;
-    if (args.options().found("scale"))
-    {
-        scaleFactor = atof(args.options()["scale"].c_str());
-    }
+    args.optionReadIfPresent("scale", scaleFactor);
 
 #   include "createTime.H"
 
diff --git a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
index 62edc15af0..68eb9c46cf 100644
--- a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
+++ b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
@@ -689,7 +689,7 @@ int main(int argc, char *argv[])
 
     fileName mshName(args.additionalArgs()[0]);
 
-    bool keepOrientation = args.options().found("keepOrientation");
+    bool keepOrientation = args.optionFound("keepOrientation");
 
     // Storage for points
     pointField points;
diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
index 520be5b146..6a9d85ba30 100644
--- a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
+++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
@@ -852,7 +852,7 @@ int main(int argc, char *argv[])
 
 
     // For debugging: dump boundary faces as triSurface
-    if (args.options().found("dump"))
+    if (args.optionFound("dump"))
     {
         DynamicList<labelledTri> triangles(boundaryFaces.size());
 
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C b/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
index 235f8986c6..1da7ba049e 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
+++ b/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
@@ -68,15 +68,15 @@ int main(int argc, char *argv[])
 #   include "createTime.H"
 
     fileName kivaFileName("otape17");
-    if (args.options().found("file"))
+    if (args.optionFound("file"))
     {
-        kivaFileName = args.options()["file"];
+        kivaFileName = args.option("file");
     }
 
     kivaVersions kivaVersion = kiva3v;
-    if (args.options().found("version"))
+    if (args.optionFound("version"))
     {
-        word kivaVersionName = args.options()["version"];
+        word kivaVersionName = args.option("version");
 
         if (kivaVersionName == "kiva3")
         {
@@ -99,10 +99,7 @@ int main(int argc, char *argv[])
     }
 
     scalar zHeadMin = -GREAT;
-    if (args.options().found("zHeadMin"))
-    {
-        zHeadMin = atof(args.options()["zHeadMin"].c_str());
-    }
+    args.optionReadIfPresent("zHeadMin", zHeadMin);
 
 #   include "readKivaGrid.H"
 
diff --git a/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C b/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C
index 2a48971abd..df438b3566 100644
--- a/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C
+++ b/applications/utilities/mesh/conversion/mshToFoam/mshToFoam.C
@@ -62,14 +62,12 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 
-    bool readHex(args.options().found("hex"));
+    bool readHex = args.optionFound("hex");
 
     fileName mshFile(args.additionalArgs()[0]);
-
     IFstream mshStream(mshFile);
 
     label nCells;
-
     mshStream >> nCells;
 
     if (readHex)
diff --git a/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C b/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
index 644efa906c..b1ea5df43f 100644
--- a/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
+++ b/applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C
@@ -71,18 +71,14 @@ int main(int argc, char *argv[])
     }
 
     scalar scaleFactor = 1.0;
-    if (args.options().found("scale"))
-    {
-        scaleFactor = atof(args.options()["scale"].c_str());
-    }
+    args.optionReadIfPresent("scale", scaleFactor);
 
-    bool readBlank = !args.options().found("noBlank");
-    bool singleBlock = args.options().found("singleBlock");
-    scalar twoDThicknes = -1;
-    if (args.options().found("2D"))
+    bool readBlank = !args.optionFound("noBlank");
+    bool singleBlock = args.optionFound("singleBlock");
+    scalar twoDThickness = -1;
+    if (args.optionReadIfPresent("2D", twoDThickness))
     {
-        twoDThicknes = readScalar(IStringStream(args.options()["2D"])());
-        Info<< "Reading 2D case by extruding points by " << twoDThicknes
+        Info<< "Reading 2D case by extruding points by " << twoDThickness
             << " in z direction." << nl << endl;
     }
 
@@ -114,7 +110,7 @@ int main(int argc, char *argv[])
 
         forAll (blocks, blockI)
         {
-            if (twoDThicknes > 0)
+            if (twoDThickness > 0)
             {
                 // Fake second set of points (done in readPoints below)
                 plot3dFile >> nx >> ny;
@@ -139,7 +135,7 @@ int main(int argc, char *argv[])
     forAll (blocks, blockI)
     {
         Info<< "block " << blockI << ":" << nl;
-        blocks[blockI].readPoints(readBlank, twoDThicknes, plot3dFile);
+        blocks[blockI].readPoints(readBlank, twoDThickness, plot3dFile);
         sumPoints += blocks[blockI].nBlockPoints();
         nMeshCells += blocks[blockI].nBlockCells();
         Info<< nl;
diff --git a/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C b/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C
index ffb2cb7daa..c7444c2be6 100644
--- a/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C
+++ b/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C
@@ -381,9 +381,9 @@ int main(int argc, char *argv[])
         << endl;
 
 
-    const bool splitAllFaces = args.options().found("splitAllFaces");
-    const bool overwrite = args.options().found("overwrite");
-    const bool doNotPreserveFaceZones = args.options().found
+    const bool splitAllFaces = args.optionFound("splitAllFaces");
+    const bool overwrite = args.optionFound("overwrite");
+    const bool doNotPreserveFaceZones = args.optionFound
     (
         "doNotPreserveFaceZones"
     );
diff --git a/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C b/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
index d676581a57..8095529d32 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
@@ -51,10 +51,7 @@ int main(int argc, char *argv[])
     }
 
     scalar scaleFactor = 1.0;
-    if (args.options().found("scale"))
-    {
-        scaleFactor = atof(args.options()["scale"].c_str());
-    }
+    args.optionReadIfPresent("scale", scaleFactor);
 
 #   include "createTime.H"
 
diff --git a/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C b/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
index c0d66dbb58..c4f8d6efc6 100644
--- a/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
+++ b/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C
@@ -68,27 +68,26 @@ int main(int argc, char *argv[])
 
     argList args(argc, argv);
     Time runTime(args.rootPath(), args.caseName());
-    stringList const& params = args.additionalArgs();
+    const stringList& params = args.additionalArgs();
 
     // default rescale from [mm] to [m]
     scalar scaleFactor = 0.001;
-    if (args.options().found("scale"))
+    if (args.optionReadIfPresent("scale", scaleFactor))
     {
-        scaleFactor = readScalar(IStringStream(args.options()["scale"])());
         if (scaleFactor <= 0)
         {
             scaleFactor = 1;
         }
     }
-
-    if (args.options().found("solids"))
+    
+    if (args.optionFound("solids"))
     {
         meshReaders::STARCD::keepSolids = true;
     }
 
     // default to binary output, unless otherwise specified
     IOstream::streamFormat format = IOstream::BINARY;
-    if (args.options().found("ascii"))
+    if (args.optionFound("ascii"))
     {
         format = IOstream::ASCII;
     }
diff --git a/applications/utilities/mesh/conversion/starToFoam/starToFoam.C b/applications/utilities/mesh/conversion/starToFoam/starToFoam.C
index 2f7d9c8980..2c2aeaa76b 100644
--- a/applications/utilities/mesh/conversion/starToFoam/starToFoam.C
+++ b/applications/utilities/mesh/conversion/starToFoam/starToFoam.C
@@ -51,10 +51,7 @@ int main(int argc, char *argv[])
     }
 
     scalar scaleFactor = 1.0;
-    if (args.options().found("scale"))
-    {
-        scaleFactor = atof(args.options()["scale"].c_str());
-    }
+    args.optionReadIfPresent("scale", scaleFactor);
 
 #   include "createTime.H"
 
diff --git a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
index 486041c714..9e9426d085 100644
--- a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
+++ b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
 #   include "createTime.H"
 
 
-    bool readFaceFile = !args.options().found("noFaceFile");
+    bool readFaceFile = !args.optionFound("noFaceFile");
 
     fileName prefix(args.additionalArgs()[0]);
 
diff --git a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
index 9eaaf2c199..e1d571e081 100644
--- a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
+++ b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
@@ -350,12 +350,12 @@ int main(int argc, char *argv[])
 #   include "createTime.H"
     runTime.functionObjects().off();
 
-    bool patchFaces = args.options().found("patchFaces");
-    bool doCell = args.options().found("cell");
-    bool doPoint = args.options().found("point");
-    bool doFace = args.options().found("face");
-    bool doCellSet = args.options().found("cellSet");
-    bool doFaceSet = args.options().found("faceSet");
+    bool patchFaces = args.optionFound("patchFaces");
+    bool doCell     = args.optionFound("cell");
+    bool doPoint    = args.optionFound("point");
+    bool doFace     = args.optionFound("face");
+    bool doCellSet  = args.optionFound("cellSet");
+    bool doFaceSet  = args.optionFound("faceSet");
 
 
     Info<< "Writing mesh objects as .obj files such that the object"
@@ -383,22 +383,19 @@ int main(int argc, char *argv[])
             }
             else if (doCell)
             {
-                label cellI =
-                    readLabel(IStringStream(args.options()["cell"])());
+                label cellI = args.optionRead<label>("cell");
 
                 writePoints(mesh, cellI, runTime.timeName());
             }
             else if (doPoint)
             {
-                label pointI =
-                    readLabel(IStringStream(args.options()["point"])());
+                label pointI = args.optionRead<label>("point");
 
                 writePointCells(mesh, pointI, runTime.timeName());
             }
             else if (doFace)
             {
-                label faceI =
-                    readLabel(IStringStream(args.options()["face"])());
+                label faceI = args.optionRead<label>("face");
 
                 fileName fName
                 (
@@ -420,7 +417,7 @@ int main(int argc, char *argv[])
             }
             else if (doCellSet)
             {
-                word setName(args.options()["cellSet"]);
+                word setName(args.option("cellSet"));
 
                 cellSet cells(mesh, setName);
 
@@ -432,7 +429,7 @@ int main(int argc, char *argv[])
             }
             else if (doFaceSet)
             {
-                word setName(args.options()["faceSet"]);
+                word setName(args.option("faceSet"));
 
                 faceSet faces(mesh, setName);
 
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
index 815f082ec7..1bcee69984 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
@@ -83,10 +83,10 @@ int main(int argc, char *argv[])
     word regionName;
     fileName polyMeshDir;
 
-    if (args.options().found("region"))
+    if (args.optionFound("region"))
     {
         // constant/<region>/polyMesh/blockMeshDict
-        regionName  = args.options()["region"];
+        regionName  = args.option("region");
         polyMeshDir = regionName/polyMesh::meshSubDir;
 
         Info<< nl << "Generating mesh for region " << regionName << endl;
@@ -100,9 +100,9 @@ int main(int argc, char *argv[])
 
     autoPtr<IOobject> meshDictIoPtr;
 
-    if (args.options().found("dict"))
+    if (args.optionFound("dict"))
     {
-        fileName dictPath(args.options()["dict"]);
+        fileName dictPath(args.option("dict"));
 
         meshDictIoPtr.set
         (
@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
             (
                 (
                     isDir(dictPath)
-                  ? dictPath/dictName 
+                  ? dictPath/dictName
                   : dictPath
                 ),
                 runTime,
@@ -153,7 +153,7 @@ int main(int argc, char *argv[])
     blockMesh blocks(meshDict);
 
 
-    if (args.options().found("blockTopology"))
+    if (args.optionFound("blockTopology"))
     {
         // Write mesh as edges.
         {
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/doExtrude2DMesh.C b/applications/utilities/mesh/generation/extrude2DMesh/doExtrude2DMesh.C
index 2e0c16a511..c71f91079c 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/doExtrude2DMesh.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/doExtrude2DMesh.C
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
     const word oldInstance = mesh.pointsInstance();
 
     scalar thickness(readScalar(IStringStream(args.additionalArgs()[0])()));
-    bool overwrite = args.options().found("overwrite");
+    bool overwrite = args.optionFound("overwrite");
 
 
     // Check that mesh is 2D
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C
index 37860e27b2..95ec6c5b8a 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C
@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
     #include "setRoots.H"
     #include "createTimeExtruded.H"
 
-    if (args.options().found("sourceCase") == args.options().found("surface"))
+    if (args.optionFound("sourceCase") == args.optionFound("surface"))
     {
         FatalErrorIn(args.executable())
             << "Specify either -sourceCase and -sourcePatch"
@@ -83,12 +83,12 @@ int main(int argc, char *argv[])
         )
     );
 
-    if (args.options().found("sourceCase"))
+    if (args.optionFound("sourceCase"))
     {
-        fileName sourceCasePath(args.options()["sourceCase"]);
+        fileName sourceCasePath(args.option("sourceCase"));
         fileName sourceRootDir = sourceCasePath.path();
         fileName sourceCaseDir = sourceCasePath.name();
-        word patchName(args.options()["sourcePatch"]);
+        word patchName(args.option("sourcePatch"));
 
         Info<< "Extruding patch " << patchName
             << " on mesh " << sourceCasePath << nl
@@ -144,7 +144,7 @@ int main(int argc, char *argv[])
     else
     {
         // Read from surface
-        fileName surfName(args.options()["surface"]);
+        fileName surfName(args.option("surface"));
 
         Info<< "Extruding surfaceMesh read from file " << surfName << nl
             << endl;
@@ -250,7 +250,7 @@ int main(int argc, char *argv[])
     // Merging front and back patch faces
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    if (args.options().found("mergeFaces"))
+    if (args.optionFound("mergeFaces"))
     {
         Info<< "Assuming full 360 degree axisymmetric case;"
             << " stitching faces on patches "
diff --git a/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C b/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C
index 52e0f2ae56..341fc4eab6 100644
--- a/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C
+++ b/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
 #   include "createPolyMesh.H"
     const word oldInstance = mesh.pointsInstance();
 
-    bool overwrite = args.options().found("overwrite");
+    bool overwrite = args.optionFound("overwrite");
 
     if (!overwrite)
     {
diff --git a/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C b/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C
index 96a7ee5197..758592590c 100644
--- a/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C
+++ b/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C
@@ -91,7 +91,7 @@ int main(int argc, char *argv[])
     boundaryMesh bMesh;
 
     scalar featureAngle(readScalar(IStringStream(args.additionalArgs()[0])()));
-    bool overwrite = args.options().found("overwrite");
+    bool overwrite = args.optionFound("overwrite");
 
     scalar minCos = Foam::cos(featureAngle * mathematicalConstant::pi/180.0);
 
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
index d226008f5c..2a589c1643 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
@@ -58,9 +58,9 @@ int main(int argc, char *argv[])
     instantList timeDirs = timeSelector::select0(runTime, args);
 #   include "createNamedPolyMesh.H"
 
-    const bool noTopology  = args.options().found("noTopology");
-    const bool allGeometry = args.options().found("allGeometry");
-    const bool allTopology = args.options().found("allTopology");
+    const bool noTopology  = args.optionFound("noTopology");
+    const bool allGeometry = args.optionFound("allGeometry");
+    const bool allTopology = args.optionFound("allTopology");
 
     forAll(timeDirs, timeI)
     {
diff --git a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
index ece5f4dde6..1fb8cc64ef 100644
--- a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
@@ -93,11 +93,11 @@ int main(int argc, char *argv[])
 
 
     // Additional patches
-    if (args.options().found("additionalPatches"))
+    if (args.optionFound("additionalPatches"))
     {
         const wordList patchNames
         (
-            IStringStream(args.options()["additionalPatches"])()
+            args.optionLookup("additionalPatches")()
         );
 
         newPatches.reserve(patchNames.size() + 1);
@@ -120,7 +120,7 @@ int main(int argc, char *argv[])
     }
 
 
-    bool overwrite = args.options().found("overwrite");
+    bool overwrite = args.optionFound("overwrite");
 
 
 
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
index 7e0443a614..3c799ca5a4 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
@@ -539,7 +539,7 @@ int main(int argc, char *argv[])
 #   include "createTime.H"
     runTime.functionObjects().off();
 
-    const bool overwrite = args.options().found("overwrite");
+    const bool overwrite = args.optionFound("overwrite");
 
     Info<< "Reading createPatchDict." << nl << endl;
 
diff --git a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
index f883c3138b..9d82619414 100644
--- a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
+++ b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
@@ -231,9 +231,9 @@ int main(int argc, char *argv[])
 #   include "createMesh.H"
     const word oldInstance = mesh.pointsInstance();
 
-    bool split = args.options().found("split");
-    bool overwrite = args.options().found("overwrite");
-    bool detectOnly = args.options().found("detectOnly");
+    bool split      = args.optionFound("split");
+    bool overwrite  = args.optionFound("overwrite");
+    bool detectOnly = args.optionFound("detectOnly");
 
     // Collect all boundary faces
     labelList boundaryFaces(mesh.nFaces() - mesh.nInternalFaces());
diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
index 7636801b51..5760d48aaf 100644
--- a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
+++ b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
@@ -309,8 +309,8 @@ int main(int argc, char *argv[])
     // Read/construct control dictionary
     //
 
-    bool readDict = args.options().found("dict");
-    bool overwrite = args.options().found("overwrite");
+    bool readDict = args.optionFound("dict");
+    bool overwrite = args.optionFound("overwrite");
 
     // List of cells to refine
     labelList refCells;
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index b066936f83..a2925210db 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -386,7 +386,7 @@ int main(int argc, char *argv[])
 #   include "createMesh.H"
     const word oldInstance = mesh.pointsInstance();
 
-    const bool blockOrder = args.options().found("blockOrder");
+    const bool blockOrder = args.optionFound("blockOrder");
 
     if (blockOrder)
     {
@@ -395,7 +395,7 @@ int main(int argc, char *argv[])
             << endl;
     }
 
-    const bool orderPoints = args.options().found("orderPoints");
+    const bool orderPoints = args.optionFound("orderPoints");
 
     if (orderPoints)
     {
@@ -403,7 +403,7 @@ int main(int argc, char *argv[])
             << endl;
     }
 
-    const bool writeMaps = args.options().found("writeMaps");
+    const bool writeMaps = args.optionFound("writeMaps");
 
     if (writeMaps)
     {
@@ -411,7 +411,7 @@ int main(int argc, char *argv[])
             << endl;
     }
 
-    bool overwrite = args.options().found("overwrite");
+    bool overwrite = args.optionFound("overwrite");
 
     label band = getBand(mesh.faceOwner(), mesh.faceNeighbour());
 
diff --git a/applications/utilities/mesh/manipulation/setSet/setSet.C b/applications/utilities/mesh/manipulation/setSet/setSet.C
index ff6d576b0a..21b77ff842 100644
--- a/applications/utilities/mesh/manipulation/setSet/setSet.C
+++ b/applications/utilities/mesh/manipulation/setSet/setSet.C
@@ -723,7 +723,7 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 
-    bool writeVTK = !args.options().found("noVTK");
+    bool writeVTK = !args.optionFound("noVTK");
 
     // Get times list
     instantList Times = runTime.times();
@@ -740,9 +740,9 @@ int main(int argc, char *argv[])
 
     std::ifstream* fileStreamPtr(NULL);
 
-    if (args.options().found("batch"))
+    if (args.optionFound("batch"))
     {
-        fileName batchFile(args.options()["batch"]);
+        fileName batchFile(args.option("batch"));
 
         Pout<< "Reading commands from file " << batchFile << endl;
 
diff --git a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
index ac32c1ccc9..9d27d8691b 100644
--- a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
+++ b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
 #   include "createTime.H"
 
 
-    bool noFlipMap = args.options().found("noFlipMap");
+    bool noFlipMap = args.optionFound("noFlipMap");
 
     // Get times list
     instantList Times = runTime.times();
diff --git a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
index b865472dad..65e4d33237 100644
--- a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
+++ b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
@@ -126,7 +126,7 @@ int main(int argc, char *argv[])
     word setName(args.additionalArgs()[0]);
     word masterPatch(args.additionalArgs()[1]);
     word slavePatch(args.additionalArgs()[2]);
-    bool overwrite = args.options().found("overwrite");
+    bool overwrite = args.optionFound("overwrite");
 
     // List of faces to split
     faceSet facesSet(mesh, setName);
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index e71a5f11c0..72c1fbd350 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -1239,20 +1239,20 @@ int main(int argc, char *argv[])
     const word oldInstance = mesh.pointsInstance();
 
     word blockedFacesName;
-    if (args.options().found("blockedFaces"))
+    if (args.optionFound("blockedFaces"))
     {
-        blockedFacesName = args.options()["blockedFaces"];
+        blockedFacesName = args.option("blockedFaces");
         Info<< "Reading blocked internal faces from faceSet "
             << blockedFacesName << nl << endl;
     }
 
-    bool makeCellZones = args.options().found("makeCellZones");
-    bool largestOnly = args.options().found("largestOnly");
-    bool insidePoint = args.options().found("insidePoint");
-    bool useCellZones = args.options().found("cellZones");
-    bool overwrite = args.options().found("overwrite");
-    bool detectOnly = args.options().found("detectOnly");
-    bool sloppyCellZones = args.options().found("sloppyCellZones");
+    bool makeCellZones   = args.optionFound("makeCellZones");
+    bool largestOnly     = args.optionFound("largestOnly");
+    bool insidePoint     = args.optionFound("insidePoint");
+    bool useCellZones    = args.optionFound("cellZones");
+    bool overwrite       = args.optionFound("overwrite");
+    bool detectOnly      = args.optionFound("detectOnly");
+    bool sloppyCellZones = args.optionFound("sloppyCellZones");
 
     if (insidePoint && largestOnly)
     {
@@ -1771,7 +1771,7 @@ int main(int argc, char *argv[])
 
         if (insidePoint)
         {
-            point insidePoint(IStringStream(args.options()["insidePoint"])());
+            point insidePoint(args.optionLookup("insidePoint")());
 
             label regionI = -1;
 
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
index 2a9784980a..e3536a5ad0 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
+++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
@@ -142,9 +142,9 @@ int main(int argc, char *argv[])
     word masterPatchName(args.additionalArgs()[0]);
     word slavePatchName(args.additionalArgs()[1]);
 
-    bool partialCover = args.options().found("partial");
-    bool perfectCover = args.options().found("perfect");
-    bool overwrite = args.options().found("overwrite");
+    bool partialCover = args.optionFound("partial");
+    bool perfectCover = args.optionFound("perfect");
+    bool overwrite    = args.optionFound("overwrite");
 
     if (partialCover && perfectCover)
     {
diff --git a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
index 56b48a2dd2..338c8dbcb1 100644
--- a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
+++ b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
@@ -162,7 +162,7 @@ int main(int argc, char *argv[])
     const word oldInstance = mesh.pointsInstance();
 
     word setName(args.additionalArgs()[0]);
-    bool overwrite = args.options().found("overwrite");
+    bool overwrite = args.optionFound("overwrite");
 
 
     Info<< "Reading cell set from " << setName << endl << endl;
@@ -172,9 +172,9 @@ int main(int argc, char *argv[])
 
     label patchI = -1;
 
-    if (args.options().found("patch"))
+    if (args.optionFound("patch"))
     {
-        word patchName(args.options()["patch"]);
+        word patchName(args.option("patch"));
 
         patchI = mesh.boundaryMesh().findPatchID(patchName);
 
diff --git a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
index bc2b017a2c..630243e2ef 100644
--- a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
+++ b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
@@ -144,7 +144,7 @@ int main(int argc, char *argv[])
     argList::validOptions.insert("yawPitchRoll", "(yaw pitch roll)");
     argList::validOptions.insert("rotateFields", "");
     argList::validOptions.insert("scale", "vector");
- 
+
 #   include "setRootCase.H"
 #   include "createTime.H"
 
@@ -171,18 +171,18 @@ int main(int argc, char *argv[])
             << exit(FatalError);
     }
 
-    if (args.options().found("translate"))
+    if (args.optionFound("translate"))
     {
-        vector transVector(IStringStream(args.options()["translate"])());
+        vector transVector(args.optionLookup("translate")());
 
         Info<< "Translating points by " << transVector << endl;
 
         points += transVector;
     }
 
-    if (args.options().found("rotate"))
+    if (args.optionFound("rotate"))
     {
-        Pair<vector> n1n2(IStringStream(args.options()["rotate"])());
+        Pair<vector> n1n2(args.optionLookup("rotate")());
         n1n2[0] /= mag(n1n2[0]);
         n1n2[1] /= mag(n1n2[1]);
         tensor T = rotationTensor(n1n2[0], n1n2[1]);
@@ -191,14 +191,14 @@ int main(int argc, char *argv[])
 
         points = transform(T, points);
 
-        if (args.options().found("rotateFields"))
+        if (args.optionFound("rotateFields"))
         {
             rotateFields(runTime, T);
         }
     }
-    else if (args.options().found("rollPitchYaw"))
+    else if (args.optionFound("rollPitchYaw"))
     {
-        vector v(IStringStream(args.options()["rollPitchYaw"])());
+        vector v(args.optionLookup("rollPitchYaw")());
 
         Info<< "Rotating points by" << nl
             << "    roll  " << v.x() << nl
@@ -214,14 +214,14 @@ int main(int argc, char *argv[])
         Info<< "Rotating points by quaternion " << R << endl;
         points = transform(R, points);
 
-        if (args.options().found("rotateFields"))
+        if (args.optionFound("rotateFields"))
         {
             rotateFields(runTime, R.R());
         }
     }
-    else if (args.options().found("yawPitchRoll"))
+    else if (args.optionFound("yawPitchRoll"))
     {
-        vector v(IStringStream(args.options()["yawPitchRoll"])());
+        vector v(args.optionLookup("yawPitchRoll")());
 
         Info<< "Rotating points by" << nl
             << "    yaw   " << v.x() << nl
@@ -243,15 +243,15 @@ int main(int argc, char *argv[])
         Info<< "Rotating points by quaternion " << R << endl;
         points = transform(R, points);
 
-        if (args.options().found("rotateFields"))
+        if (args.optionFound("rotateFields"))
         {
             rotateFields(runTime, R.R());
         }
     }
 
-    if (args.options().found("scale"))
+    if (args.optionFound("scale"))
     {
-        vector scaleVector(IStringStream(args.options()["scale"])());
+        vector scaleVector(args.optionLookup("scale")());
 
         Info<< "Scaling points by " << scaleVector << endl;
 
diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/foamDebugSwitches.C b/applications/utilities/miscellaneous/foamDebugSwitches/foamDebugSwitches.C
index 6854ba0b8d..d4eb9c3b63 100644
--- a/applications/utilities/miscellaneous/foamDebugSwitches/foamDebugSwitches.C
+++ b/applications/utilities/miscellaneous/foamDebugSwitches/foamDebugSwitches.C
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
     wordList currInfo(debug::infoSwitches().toc());
     wordList currOpt(debug::optimisationSwitches().toc());
 
-    if (args.options().found("old") || args.options().found("new"))
+    if (args.optionFound("old") || args.optionFound("new"))
     {
         dictionary controlDict(IFstream(findEtcFile("controlDict", true))());
 
@@ -80,7 +80,7 @@ int main(int argc, char *argv[])
         //  1. run without any options (get complete list)
         //  2. comment out DebugSwitches, run again with -new to find new ones
         //     and do a diff
-        if (args.options().found("old"))
+        if (args.optionFound("old"))
         {
             IOobject::writeDivider(Info);
 
@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
         }
 
         // list new switches
-        if (args.options().found("new"))
+        if (args.optionFound("new"))
         {
             IOobject::writeDivider(Info);
 
diff --git a/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C b/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
index 3de53a2f22..b55e5b9701 100644
--- a/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
+++ b/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
@@ -49,9 +49,9 @@ int main(int argc, char *argv[])
 
     Info<< endl;
 
-    if (args.options().found("times"))
+    if (args.optionFound("times"))
     {
-        instantList times 
+        instantList times
         (
             Foam::Time::findTimes(args.rootPath()/args.caseName())
         );
@@ -62,11 +62,11 @@ int main(int argc, char *argv[])
         }
     }
 
-    if (args.options().found("dictionary"))
+    if (args.optionFound("dictionary"))
     {
         fileName dictFileName
         (
-            args.rootPath()/args.caseName()/args.options()["dictionary"]
+            args.rootPath()/args.caseName()/args.option("dictionary")
         );
 
         IFstream dictFile(dictFileName);
@@ -75,11 +75,7 @@ int main(int argc, char *argv[])
         {
             dictionary dict(dictFile);
 
-            if
-            (
-                args.options().found("keywords")
-             && !args.options().found("entry")
-            )
+            if (args.optionFound("keywords") && !args.optionFound("entry"))
             {
                 for
                 (
@@ -91,11 +87,11 @@ int main(int argc, char *argv[])
                     Info<< iter().keyword() << endl;
                 }
             }
-            else if (args.options().found("entry"))
+            else if (args.optionFound("entry"))
             {
                 wordList entryNames
                 (
-                    fileName(args.options()["entry"]).components(':')
+                    fileName(args.option("entry")).components(':')
                 );
 
                 if (dict.found(entryNames[0]))
@@ -122,20 +118,20 @@ int main(int argc, char *argv[])
                         {
                             FatalErrorIn(args.executable())
                                 << "Cannot find sub-entry " << entryNames[i]
-                                << " in entry " << args.options()["entry"]
+                                << " in entry " << args.option("entry")
                                 << " in dictionary " << dictFileName;
                             FatalError.exit(3);
                         }
                     }
-                    
-                    if (args.options().found("keywords"))
+
+                    if (args.optionFound("keywords"))
                     {
                         /*
                         if (ent[1] != token::BEGIN_BLOCK)
                         {
                             FatalErrorIn(args.executable())
                                 << "Cannot find entry "
-                                << args.options()["entry"]
+                                << args.option("entry")
                                 << " in dictionary " << dictFileName
                                 << " is not a sub-dictionary";
                             FatalError.exit(4);
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index fef8c71aa1..65dd679ecd 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -99,20 +99,20 @@ int main(int argc, char *argv[])
     word regionName = fvMesh::defaultRegion;
     word regionDir = word::null;
 
-    if (args.options().found("region"))
+    if (args.optionFound("region"))
     {
-        regionName = args.options()["region"];
+        regionName = args.option("region");
         regionDir = regionName;
         Info<< "Decomposing mesh " << regionName << nl << endl;
     }
 
 
-    bool writeCellDist(args.options().found("cellDist"));
-    bool copyUniform(args.options().found("copyUniform"));
-    bool decomposeFieldsOnly(args.options().found("fields"));
-    bool filterPatches(args.options().found("filterPatches"));
-    bool forceOverwrite(args.options().found("force"));
-    bool ifRequiredDecomposition(args.options().found("ifRequired"));
+    bool writeCellDist           = args.optionFound("cellDist");
+    bool copyUniform             = args.optionFound("copyUniform");
+    bool decomposeFieldsOnly     = args.optionFound("fields");
+    bool filterPatches           = args.optionFound("filterPatches");
+    bool forceOverwrite          = args.optionFound("force");
+    bool ifRequiredDecomposition = args.optionFound("ifRequired");
 
 #   include "createTime.H"
 
diff --git a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
index 1e3ed2b9bf..dd014c299f 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
+++ b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
@@ -57,12 +57,12 @@ int main(int argc, char *argv[])
 #   include "createTime.H"
 
     HashSet<word> selectedFields;
-    if (args.options().found("fields"))
+    if (args.optionFound("fields"))
     {
-        IStringStream(args.options()["fields"])() >> selectedFields;
+        args.optionLookup("fields")() >> selectedFields;
     }
 
-    bool noLagrangian = args.options().found("noLagrangian");
+    bool noLagrangian = args.optionFound("noLagrangian");
 
     // determine the processor count directly
     label nProcs = 0;
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index 627f2b15b4..dc28db7097 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@@ -306,18 +306,16 @@ int main(int argc, char *argv[])
 
     word regionName = polyMesh::defaultRegion;
     fileName regionPrefix = "";
-    if (args.options().found("region"))
+    if (args.optionFound("region"))
     {
-        regionName = args.options()["region"];
+        regionName = args.option("region");
         regionPrefix = regionName;
         Info<< "Operating on region " << regionName << nl << endl;
     }
 
     scalar mergeTol = defaultMergeTol;
-    if (args.options().found("mergeTol"))
-    {
-        mergeTol = readScalar(IStringStream(args.options()["mergeTol"])());
-    }
+    args.optionReadIfPresent("mergeTol", mergeTol);
+
     scalar writeTol = Foam::pow(10.0, -scalar(IOstream::defaultPrecision()));
 
     Info<< "Merge tolerance : " << mergeTol << nl
@@ -337,7 +335,7 @@ int main(int argc, char *argv[])
     }
 
 
-    const bool fullMatch = args.options().found("fullMatch");
+    const bool fullMatch = args.optionFound("fullMatch");
 
     if (fullMatch)
     {
diff --git a/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C b/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
index c46a41b273..c0859573e0 100644
--- a/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
+++ b/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
@@ -240,10 +240,7 @@ scalar getMergeDistance
 )
 {
     scalar mergeTol = defaultMergeTol;
-    if (args.options().found("mergeTol"))
-    {
-        mergeTol = readScalar(IStringStream(args.options()["mergeTol"])());
-    }
+    args.optionReadIfPresent("mergeTol", mergeTol);
 
     scalar writeTol =
         Foam::pow(scalar(10.0), -scalar(IOstream::defaultPrecision()));
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
index 94f8c19c3f..079145a0c5 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
@@ -107,7 +107,7 @@ Foam::ensightMesh::ensightMesh
     const cellModel& wedge = *(cellModeller::lookup("wedge"));
     const cellModel& hex = *(cellModeller::lookup("hex"));
 
-    if (!args.options().found("noPatches"))
+    if (!args.optionFound("noPatches"))
     {
         forAll (mesh_.boundaryMesh(), patchI)
         {
@@ -136,9 +136,9 @@ Foam::ensightMesh::ensightMesh
 
         combineReduce(allPatchNames_, concatPatchNames());
 
-        if (args.options().found("patches"))
+        if (args.optionFound("patches"))
         {
-            wordList patchNameList(IStringStream(args.options()["patches"])());
+            wordList patchNameList(args.optionLookup("patches")());
 
             if (patchNameList.empty())
             {
@@ -228,7 +228,7 @@ Foam::ensightMesh::ensightMesh
         reduce(meshCellSets_.nPolys, sumOp<label>());
     }
 
-    if (!args.options().found("noPatches"))
+    if (!args.optionFound("noPatches"))
     {
         forAll (mesh.boundary(), patchI)
         {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
index 5dc6af99f3..a6a429318e 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
@@ -100,11 +100,7 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 
     // Check options
-    bool binary = true;
-    if (args.options().found("ascii"))
-    {
-        binary = false;
-    }
+    bool binary = !args.optionFound("ascii");
 
 #   include "createTime.H"
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
index 651224d17c..5e38986331 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
@@ -107,7 +107,7 @@ int main(int argc, char *argv[])
 
     // default to binary output, unless otherwise specified
     IOstream::streamFormat format = IOstream::BINARY;
-    if (args.options().found("ascii"))
+    if (args.optionFound("ascii"))
     {
         format = IOstream::ASCII;
     }
@@ -115,14 +115,14 @@ int main(int argc, char *argv[])
     // control for renumbering iterations
     bool optIndex = false;
     label indexingNumber = 0;
-    if (args.options().found("index"))
+    if (args.optionFound("index"))
     {
         optIndex = true;
-        indexingNumber = readLabel(IStringStream(args.options()["index"])());
+        indexingNumber = args.optionRead<label>("index");
     }
 
     // always write the geometry, unless the -noMesh option is specified
-    bool optNoMesh = args.options().found("noMesh");
+    bool optNoMesh = args.optionFound("noMesh");
 
     fileName ensightDir = args.rootPath()/args.globalCaseName()/"Ensight";
     fileName dataDir = ensightDir/"data";
diff --git a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/checkTimeOption.H b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/checkTimeOption.H
deleted file mode 100644
index ad0aadf7c0..0000000000
--- a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/checkTimeOption.H
+++ /dev/null
@@ -1,26 +0,0 @@
-    if (args.options().found("time"))
-    {
-        scalar time(readScalar(IStringStream(args.options()["time"])()));
-
-        int nearestIndex = -1;
-        scalar nearestDiff = Foam::GREAT;
-
-        forAll(Times, timeIndex)
-        {
-            scalar diff = fabs(Times[timeIndex].value() - time);
-            if (diff < nearestDiff)
-            {
-                nearestDiff = diff;
-                nearestIndex = timeIndex;
-            }
-        }
-
-        startTime = nearestIndex;
-        endTime = nearestIndex + 1;
-    }
-    else
-    {
-        startTime = 0;
-        endTime = Times.size();
-    }
-
diff --git a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C
index 7fc54a8cf2..cc146bc576 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C
@@ -307,7 +307,7 @@ int main(int argc, char *argv[])
                 new fieldviewTopology
                 (
                     mesh,
-                    !args.options().found("noWall")
+                    !args.optionFound("noWall")
                 )
             );
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index 2d5e747990..9bce0df59f 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -246,11 +246,10 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 
-    bool doWriteInternal = !args.options().found("noInternal");
-    bool doFaceZones = !args.options().found("noFaceZones");
-    bool doLinks = !args.options().found("noLinks");
-
-    bool binary = !args.options().found("ascii");
+    bool doWriteInternal = !args.optionFound("noInternal");
+    bool doFaceZones     = !args.optionFound("noFaceZones");
+    bool doLinks         = !args.optionFound("noLinks");
+    bool binary          = !args.optionFound("ascii");
 
     if (binary && (sizeof(floatScalar) != 4 || sizeof(label) != 4))
     {
@@ -260,7 +259,7 @@ int main(int argc, char *argv[])
             << exit(FatalError);
     }
 
-    bool nearCellValue = args.options().found("nearCellValue");
+    bool nearCellValue = args.optionFound("nearCellValue");
 
     if (nearCellValue)
     {
@@ -269,7 +268,7 @@ int main(int argc, char *argv[])
             << nl << endl;
     }
 
-    bool noPointValues = args.options().found("noPointValues");
+    bool noPointValues = args.optionFound("noPointValues");
 
     if (noPointValues)
     {
@@ -277,12 +276,12 @@ int main(int argc, char *argv[])
             << "Outputting cell values only" << nl << endl;
     }
 
-    bool allPatches = args.options().found("allPatches");
+    bool allPatches = args.optionFound("allPatches");
 
     HashSet<word> excludePatches;
-    if (args.options().found("excludePatches"))
+    if (args.optionFound("excludePatches"))
     {
-        IStringStream(args.options()["excludePatches"])() >> excludePatches;
+        args.optionLookup("excludePatches")() >> excludePatches;
 
         Info<< "Not including patches " << excludePatches << nl << endl;
     }
@@ -290,9 +289,9 @@ int main(int argc, char *argv[])
     word cellSetName;
     string vtkName;
 
-    if (args.options().found("cellSet"))
+    if (args.optionFound("cellSet"))
     {
-        cellSetName = args.options()["cellSet"];
+        cellSetName = args.option("cellSet");
         vtkName = cellSetName;
     }
     else if (Pstream::parRun())
@@ -332,8 +331,8 @@ int main(int argc, char *argv[])
     {
         if
         (
-            args.options().found("time")
-         || args.options().found("latestTime")
+            args.optionFound("time")
+         || args.optionFound("latestTime")
          || cellSetName.size()
          || regionName != polyMesh::defaultRegion
         )
@@ -377,10 +376,10 @@ int main(int argc, char *argv[])
 
 
         // If faceSet: write faceSet only (as polydata)
-        if (args.options().found("faceSet"))
+        if (args.optionFound("faceSet"))
         {
             // Load the faceSet
-            faceSet set(mesh, args.options()["faceSet"]);
+            faceSet set(mesh, args.option("faceSet"));
 
             // Filename as if patch with same name.
             mkDir(fvPath/set.name());
@@ -400,10 +399,10 @@ int main(int argc, char *argv[])
             continue;
         }
         // If pointSet: write pointSet only (as polydata)
-        if (args.options().found("pointSet"))
+        if (args.optionFound("pointSet"))
         {
             // Load the pointSet
-            pointSet set(mesh, args.options()["pointSet"]);
+            pointSet set(mesh, args.option("pointSet"));
 
             // Filename as if patch with same name.
             mkDir(fvPath/set.name());
@@ -428,9 +427,9 @@ int main(int argc, char *argv[])
         IOobjectList objects(mesh, runTime.timeName());
 
         HashSet<word> selectedFields;
-        if (args.options().found("fields"))
+        if (args.optionFound("fields"))
         {
-            IStringStream(args.options()["fields"])() >> selectedFields;
+            args.optionLookup("fields")() >> selectedFields;
         }
 
         // Construct the vol fields (on the original mesh if subsetted)
@@ -608,7 +607,7 @@ int main(int argc, char *argv[])
         //
         //---------------------------------------------------------------------
 
-        if (args.options().found("surfaceFields"))
+        if (args.optionFound("surfaceFields"))
         {
             PtrList<surfaceScalarField> ssf;
             readFields
diff --git a/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/dsmcFieldsCalc.C b/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/dsmcFieldsCalc.C
index ee4fd2c50f..15c1153db5 100644
--- a/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/dsmcFieldsCalc.C
+++ b/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/dsmcFieldsCalc.C
@@ -82,7 +82,7 @@ namespace Foam
 
 void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
 {
-    bool writeResults = !args.options().found("noWrite");
+    bool writeResults = !args.optionFound("noWrite");
 
     wordList extensiveVSFNames
     (
diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
index 45faede694..0843f3acf3 100644
--- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
+++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
@@ -53,15 +53,13 @@ namespace Foam
 {
     void execFlowFunctionObjects(const argList& args, const Time& runTime)
     {
-        if (args.options().found("dict"))
+        if (args.optionFound("dict"))
         {
-            fileName dictName(args.options()["dict"]);
-
             IOdictionary dict
             (
                 IOobject
                 (
-                    dictName,
+                    args.option("dict"),
                     runTime.system(),
                     runTime,
                     IOobject::MUST_READ
diff --git a/applications/utilities/postProcessing/velocityField/Co/Co.C b/applications/utilities/postProcessing/velocityField/Co/Co.C
index 694172b724..23d7b008a7 100644
--- a/applications/utilities/postProcessing/velocityField/Co/Co.C
+++ b/applications/utilities/postProcessing/velocityField/Co/Co.C
@@ -86,7 +86,7 @@ namespace Foam
 
 void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
 {
-    bool writeResults = !args.options().found("noWrite");
+    bool writeResults = !args.optionFound("noWrite");
 
     IOobject phiHeader
     (
diff --git a/applications/utilities/postProcessing/velocityField/Mach/Mach.C b/applications/utilities/postProcessing/velocityField/Mach/Mach.C
index 02c69df34a..daa4aa2ccf 100644
--- a/applications/utilities/postProcessing/velocityField/Mach/Mach.C
+++ b/applications/utilities/postProcessing/velocityField/Mach/Mach.C
@@ -38,7 +38,7 @@ Description
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
 {
-    bool writeResults = !args.options().found("noWrite");
+    bool writeResults = !args.optionFound("noWrite");
 
     IOobject Uheader
     (
diff --git a/applications/utilities/postProcessing/velocityField/Pe/Pe.C b/applications/utilities/postProcessing/velocityField/Pe/Pe.C
index 08c3334816..905074131d 100644
--- a/applications/utilities/postProcessing/velocityField/Pe/Pe.C
+++ b/applications/utilities/postProcessing/velocityField/Pe/Pe.C
@@ -47,7 +47,7 @@ Description
 
 void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
 {
-    bool writeResults = !args.options().found("noWrite");
+    bool writeResults = !args.optionFound("noWrite");
 
     IOobject phiHeader
     (
diff --git a/applications/utilities/postProcessing/velocityField/Q/Q.C b/applications/utilities/postProcessing/velocityField/Q/Q.C
index e233818954..34a09790d1 100644
--- a/applications/utilities/postProcessing/velocityField/Q/Q.C
+++ b/applications/utilities/postProcessing/velocityField/Q/Q.C
@@ -39,7 +39,7 @@ Description
 
 void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
 {
-    bool writeResults = !args.options().found("noWrite");
+    bool writeResults = !args.optionFound("noWrite");
 
     IOobject Uheader
     (
diff --git a/applications/utilities/postProcessing/velocityField/enstrophy/enstrophy.C b/applications/utilities/postProcessing/velocityField/enstrophy/enstrophy.C
index 5d098240fd..96ccb4b907 100644
--- a/applications/utilities/postProcessing/velocityField/enstrophy/enstrophy.C
+++ b/applications/utilities/postProcessing/velocityField/enstrophy/enstrophy.C
@@ -39,7 +39,7 @@ Description
 
 void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
 {
-    bool writeResults = !args.options().found("noWrite");
+    bool writeResults = !args.optionFound("noWrite");
 
     IOobject Uheader
     (
diff --git a/applications/utilities/postProcessing/velocityField/uprime/uprime.C b/applications/utilities/postProcessing/velocityField/uprime/uprime.C
index a546cab627..c1f7071f74 100644
--- a/applications/utilities/postProcessing/velocityField/uprime/uprime.C
+++ b/applications/utilities/postProcessing/velocityField/uprime/uprime.C
@@ -39,7 +39,7 @@ Description
 
 void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
 {
-    bool writeResults = !args.options().found("noWrite");
+    bool writeResults = !args.optionFound("noWrite");
 
     IOobject kheader
     (
diff --git a/applications/utilities/postProcessing/velocityField/vorticity/vorticity.C b/applications/utilities/postProcessing/velocityField/vorticity/vorticity.C
index e24a3b9e46..3b4a85ca3e 100644
--- a/applications/utilities/postProcessing/velocityField/vorticity/vorticity.C
+++ b/applications/utilities/postProcessing/velocityField/vorticity/vorticity.C
@@ -39,7 +39,7 @@ Description
 
 void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
 {
-    bool writeResults = !args.options().found("noWrite");
+    bool writeResults = !args.optionFound("noWrite");
 
     IOobject Uheader
     (
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
index dac7cd0393..8aae7e124c 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
@@ -76,16 +76,15 @@ int main(int argc, char *argv[])
     // Set the mean boundary-layer thickness
     dimensionedScalar ybl("ybl", dimLength, 0);
 
-    if (args.options().found("ybl"))
+    if (args.optionFound("ybl"))
     {
         // If the boundary-layer thickness is provided use it
-        ybl.value() = readScalar(IStringStream(args.options()["ybl"])());
+        ybl.value() = args.optionRead<scalar>("ybl");
     }
-    else if (args.options().found("Cbl"))
+    else if (args.optionFound("Cbl"))
     {
         // Calculate boundary layer thickness as Cbl * mean distance to wall
-        ybl.value() =
-            gAverage(y)*readScalar(IStringStream(args.options()["Cbl"])());
+        ybl.value() = gAverage(y) * args.optionRead<scalar>("Cbl");
     }
     else
     {
@@ -155,7 +154,7 @@ int main(int argc, char *argv[])
         sqr(kappa*min(y, ybl))*::sqrt(2)*mag(dev(symm(fvc::grad(U))))
     );
 
-    if (args.options().found("writenut"))
+    if (args.optionFound("writenut"))
     {
         Info<< "Writing nut" << endl;
         nut.write();
diff --git a/applications/utilities/preProcessing/applyWallFunctionBounaryConditions/applyWallFunctionBounaryConditions.C b/applications/utilities/preProcessing/applyWallFunctionBounaryConditions/applyWallFunctionBounaryConditions.C
index e571cc4373..1cdc3f28ab 100644
--- a/applications/utilities/preProcessing/applyWallFunctionBounaryConditions/applyWallFunctionBounaryConditions.C
+++ b/applications/utilities/preProcessing/applyWallFunctionBounaryConditions/applyWallFunctionBounaryConditions.C
@@ -240,7 +240,7 @@ int main(int argc, char *argv[])
 #   include "createTime.H"
 #   include "createMesh.H"
 
-    bool compressible = args.options().found("compressible");
+    bool compressible = args.optionFound("compressible");
 
     Info<< "Updating turbulence fields to operate using new run time "
         << "selectable" << nl << "wall functions"
diff --git a/applications/utilities/preProcessing/foamUpgradeFvSolution/foamUpgradeFvSolution.C b/applications/utilities/preProcessing/foamUpgradeFvSolution/foamUpgradeFvSolution.C
index 669d7186f2..d2e7981c68 100644
--- a/applications/utilities/preProcessing/foamUpgradeFvSolution/foamUpgradeFvSolution.C
+++ b/applications/utilities/preProcessing/foamUpgradeFvSolution/foamUpgradeFvSolution.C
@@ -78,7 +78,7 @@ int main(int argc, char *argv[])
     Info<< nChanged << " solver settings changed" << nl << endl;
     if (nChanged)
     {
-        if (args.options().found("test"))
+        if (args.optionFound("test"))
         {
             Info<< "-test option: no changes made" << nl << endl;
         }
diff --git a/applications/utilities/preProcessing/mapFields/setRoots.H b/applications/utilities/preProcessing/mapFields/setRoots.H
index 5c4ca19170..6aceba234f 100644
--- a/applications/utilities/preProcessing/mapFields/setRoots.H
+++ b/applications/utilities/preProcessing/mapFields/setRoots.H
@@ -24,20 +24,7 @@
     Info<< "Source: " << rootDirSource << " " << caseDirSource << nl
         << "Target: " << rootDirTarget << " " << caseDirTarget << endl;
 
-    bool parallelSource = false;
-    if (args.options().found("parallelSource"))
-    {
-        parallelSource = true;
-    }
+    bool parallelSource = args.optionFound("parallelSource");
+    bool parallelTarget = args.optionFound("parallelTarget");
+    bool consistent     = args.optionFound("consistent");
 
-    bool parallelTarget = false;
-    if (args.options().found("parallelTarget"))
-    {
-        parallelTarget = true;
-    }
-
-    bool consistent = false;
-    if (args.options().found("consistent"))
-    {
-        consistent = true;
-    }
diff --git a/applications/utilities/preProcessing/mapFields/setTimeIndex.H b/applications/utilities/preProcessing/mapFields/setTimeIndex.H
index c5afed3e2f..15f8efdb0f 100644
--- a/applications/utilities/preProcessing/mapFields/setTimeIndex.H
+++ b/applications/utilities/preProcessing/mapFields/setTimeIndex.H
@@ -1,15 +1,14 @@
     instantList sourceTimes = runTimeSource.times();
     label sourceTimeIndex = runTimeSource.timeIndex();
-    if (args.options().found("sourceTime"))
+    if (args.optionFound("sourceTime"))
     {
-        if ((args.options()["sourceTime"]) == "latestTime")
+        if (args.option("sourceTime") == "latestTime")
         {
             sourceTimeIndex = sourceTimes.size() - 1;
         }
         else
         {
-            scalar sourceTime =
-                readScalar(IStringStream(args.options()["sourceTime"])());
+            scalar sourceTime = args.optionRead<scalar>("sourceTime");
             sourceTimeIndex = getTimeIndex(sourceTimes, sourceTime);
         }
     }
diff --git a/applications/utilities/surface/surfaceAdd/surfaceAdd.C b/applications/utilities/surface/surfaceAdd/surfaceAdd.C
index bbff3715c7..6441486cd1 100644
--- a/applications/utilities/surface/surfaceAdd/surfaceAdd.C
+++ b/applications/utilities/surface/surfaceAdd/surfaceAdd.C
@@ -59,8 +59,8 @@ int main(int argc, char *argv[])
     fileName inFileName2(args.additionalArgs()[1]);
     fileName outFileName(args.additionalArgs()[2]);
 
-    bool addPoint = args.options().found("points");
-    bool mergeRegions = args.options().found("mergeRegions");
+    bool addPoint     = args.optionFound("points");
+    bool mergeRegions = args.optionFound("mergeRegions");
 
     if (addPoint)
     {
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
             << nl << endl;
 
         Info<< "Surface  : " << inFileName1<< nl
-            << "Points   : " << args.options()["points"] << nl
+            << "Points   : " << args.option("points") << nl
             << "Writing  : " << outFileName << nl << endl;
     }
     else
@@ -111,8 +111,8 @@ int main(int argc, char *argv[])
 
     if (addPoint)
     {
-        IFstream pointStr(args.options()["points"]);
-        pointField extraPoints(pointStr);
+        IFstream pointsFile(args.option("points"));
+        pointField extraPoints(pointsFile);
 
         Info<< "Additional Points:" << extraPoints.size() << endl;
 
@@ -252,7 +252,7 @@ int main(int argc, char *argv[])
                 newPatches[newPatchI++] = surface2.patches()[ patchI];
             }
         }
- 
+
 
         Info<< "New patches:" << nl;
         forAll(newPatches, patchI)
diff --git a/applications/utilities/surface/surfaceCheck/surfaceCheck.C b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
index d714c19ec3..d283ec66af 100644
--- a/applications/utilities/surface/surfaceCheck/surfaceCheck.C
+++ b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
@@ -176,8 +176,8 @@ int main(int argc, char *argv[])
     argList::validOptions.insert("verbose", "");
     argList args(argc, argv);
 
-    bool checkSelfIntersection = args.options().found("checkSelfIntersection");
-    bool verbose = args.options().found("verbose");
+    bool checkSelfIntersection = args.optionFound("checkSelfIntersection");
+    bool verbose = args.optionFound("verbose");
 
     fileName surfFileName(args.additionalArgs()[0]);
     Pout<< "Reading surface from " << surfFileName << " ..." << nl << endl;
diff --git a/applications/utilities/surface/surfaceConvert/surfaceConvert.C b/applications/utilities/surface/surfaceConvert/surfaceConvert.C
index fd7b223827..f7df57d1e1 100644
--- a/applications/utilities/surface/surfaceConvert/surfaceConvert.C
+++ b/applications/utilities/surface/surfaceConvert/surfaceConvert.C
@@ -70,12 +70,6 @@ int main(int argc, char *argv[])
     argList args(argc, argv);
     const stringList& params = args.additionalArgs();
 
-    scalar scaleFactor = 0;
-    if (args.options().found("scale"))
-    {
-        IStringStream(args.options()["scale"])() >> scaleFactor;
-    }
-
     fileName importName(params[0]);
     fileName exportName(params[1]);
 
@@ -93,7 +87,7 @@ int main(int argc, char *argv[])
     surf.writeStats(Info);
     Info<< endl;
 
-    if (args.options().found("clean"))
+    if (args.optionFound("clean"))
     {
         Info<< "Cleaning up surface" << endl;
         surf.cleanup(true);
@@ -103,7 +97,7 @@ int main(int argc, char *argv[])
         Info<< endl;
     }
 
-    bool sortByRegion = args.options().found("group");
+    bool sortByRegion = args.optionFound("group");
 
     if (sortByRegion)
     {
@@ -115,7 +109,9 @@ int main(int argc, char *argv[])
     }
 
     Info<< "writing " << exportName;
-    if (scaleFactor > 0)
+
+    scalar scaleFactor = 0;
+    if (args.optionReadIfPresent("scale", scaleFactor) && scaleFactor > 0)
     {
         Info<< " with scaling " << scaleFactor;
         surf.scalePoints(scaleFactor);
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index 8907ac46db..c3a7e5a26d 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
     argList::validOptions.insert("deleteBox", "((x0 y0 z0)(x1 y1 z1))");
     argList args(argc, argv);
 
-    Pout<< "Feature line extraction is only valid on closed manifold surfaces." 
+    Pout<< "Feature line extraction is only valid on closed manifold surfaces."
         << endl;
 
 
@@ -139,27 +139,24 @@ int main(int argc, char *argv[])
 
     surfaceFeatures set(surf);
 
-    if (args.options().found("set"))
+    if (args.optionFound("set"))
     {
-        fileName setName(args.options()["set"]);
+        fileName setName(args.option("set"));
 
         Pout<< "Reading existing feature set from file " << setName << endl;
 
         set = surfaceFeatures(surf, setName);
     }
-    else if (args.options().found("includedAngle"))
+    else if (args.optionFound("includedAngle"))
     {
-        scalar includedAngle
-        (
-            readScalar(IStringStream(args.options()["includedAngle"])())
-        );
+        scalar includedAngle = args.optionRead<scalar>("includedAngle");
 
         Pout<< "Constructing feature set from included angle " << includedAngle
             << endl;
 
         set = surfaceFeatures(surf, includedAngle);
 
-        Pout<< endl << "Writing initial features" << endl;    
+        Pout<< endl << "Writing initial features" << endl;
         set.write("initial.fSet");
         set.writeObj("initial");
     }
@@ -190,16 +187,14 @@ int main(int argc, char *argv[])
     // ~~~~~~~~
 
     scalar minLen = -GREAT;
-    if (args.options().found("minLen"))
+    if (args.optionReadIfPresent("minLen", minLen))
     {
-        minLen = readScalar(IStringStream(args.options()["minLen"])());
         Pout<< "Removing features of length < " << minLen << endl;
     }
-    
+
     label minElem = 0;
-    if (args.options().found("minElem"))
+    if (args.optionReadIfPresent("minElem", minElem))
     {
-        minElem = readLabel(IStringStream(args.options()["minElem"])());
         Pout<< "Removing features with number of edges < " << minElem << endl;
     }
 
@@ -207,7 +202,7 @@ int main(int argc, char *argv[])
     if (minLen > 0 || minLen > 0)
     {
         set.trimFeatures(minLen, minElem);
-        Pout<< endl << "Removed small features" << endl;    
+        Pout<< endl << "Removed small features" << endl;
     }
 
 
@@ -218,9 +213,9 @@ int main(int argc, char *argv[])
     // Convert to marked edges, points
     List<surfaceFeatures::edgeStatus> edgeStat(set.toStatus());
 
-    if (args.options().found("subsetBox"))
+    if (args.optionFound("subsetBox"))
     {
-        treeBoundBox bb(IStringStream(args.options()["subsetBox"])());
+        treeBoundBox bb(args.optionLookup("subsetBox")());
 
         Pout<< "Removing all edges outside bb " << bb << endl;
         dumpBox(bb, "subsetBox.obj");
@@ -233,9 +228,9 @@ int main(int argc, char *argv[])
             edgeStat
         );
     }
-    else if (args.options().found("deleteBox"))
+    else if (args.optionFound("deleteBox"))
     {
-        treeBoundBox bb(IStringStream(args.options()["deleteBox"])());
+        treeBoundBox bb(args.optionLookup("deleteBox")());
 
         Pout<< "Removing all edges inside bb " << bb << endl;
         dumpBox(bb, "deleteBox.obj");
@@ -254,7 +249,7 @@ int main(int argc, char *argv[])
 
     Pout<< endl << "Writing trimmed features to " << outFileName << endl;
     newSet.write(outFileName);
-    
+
     Pout<< endl << "Writing edge objs." << endl;
     newSet.writeObj("final");
 
diff --git a/applications/utilities/surface/surfaceFind/surfaceFind.C b/applications/utilities/surface/surfaceFind/surfaceFind.C
index e162c179b6..13d769fd1a 100644
--- a/applications/utilities/surface/surfaceFind/surfaceFind.C
+++ b/applications/utilities/surface/surfaceFind/surfaceFind.C
@@ -52,10 +52,12 @@ int main(int argc, char *argv[])
 
     argList args(argc, argv);
 
-    scalar x(readScalar(IStringStream(args.options()["x"])()));
-    scalar y(readScalar(IStringStream(args.options()["y"])()));
-    scalar z(readScalar(IStringStream(args.options()["z"])()));
-    point samplePt(x, y, z);
+    point samplePt
+    (
+        args.optionRead<scalar>("x"),
+        args.optionRead<scalar>("y"),
+        args.optionRead<scalar>("z")
+    );
     Info<< "Looking for nearest face/vertex to " << samplePt << endl;
 
 
diff --git a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
index 4f607e89fb..6e730cc60a 100644
--- a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
+++ b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
@@ -110,13 +110,13 @@ int main(int argc, char *argv[])
     autoPtr<coordinateSystem> fromCsys;
     autoPtr<coordinateSystem> toCsys;
 
-    if (args.options().found("from") || args.options().found("to"))
+    if (args.optionFound("from") || args.optionFound("to"))
     {
         autoPtr<IOobject> csDictIoPtr;
 
-        if (args.options().found("dict"))
+        if (args.optionFound("dict"))
         {
-            fileName dictPath(args.options()["dict"]);
+            fileName dictPath(args.option("dict"));
 
             csDictIoPtr.set
             (
@@ -161,9 +161,9 @@ int main(int argc, char *argv[])
 
         coordinateSystems csLst(csDictIoPtr());
 
-        if (args.options().found("from"))
+        if (args.optionFound("from"))
         {
-            const word csName(args.options()["from"]);
+            const word csName(args.option("from"));
 
             label csId = csLst.find(csName);
             if (csId < 0)
@@ -177,9 +177,9 @@ int main(int argc, char *argv[])
             fromCsys.reset(new coordinateSystem(csLst[csId]));
         }
 
-        if (args.options().found("to"))
+        if (args.optionFound("to"))
         {
-            const word csName(args.options()["to"]);
+            const word csName(args.option("to"));
 
             label csId = csLst.find(csName);
             if (csId < 0)
@@ -203,32 +203,23 @@ int main(int argc, char *argv[])
         }
     }
 
-    scalar scaleIn = 0;
-    scalar scaleOut = 0;
-    if (args.options().found("scaleIn"))
-    {
-        IStringStream(args.options()["scaleIn"])() >> scaleIn;
-    }
-    if (args.options().found("scaleOut"))
-    {
-        IStringStream(args.options()["scaleOut"])() >> scaleOut;
-    }
-
 
     {
         MeshedSurface<face> surf(importName);
 
-        if (args.options().found("clean"))
+        if (args.optionFound("clean"))
         {
             surf.cleanup(true);
         }
 
-        if (scaleIn > 0)
+        scalar scaleIn = 0;
+        if (args.optionReadIfPresent("scaleIn", scaleIn) && scaleIn > 0)
         {
             Info<< " -scaleIn " << scaleIn << endl;
             surf.scalePoints(scaleIn);
         }
 
+
         if (fromCsys.valid())
         {
             Info<< " -from " << fromCsys().name() << endl;
@@ -243,7 +234,8 @@ int main(int argc, char *argv[])
             surf.movePoints(tpf());
         }
 
-        if (scaleOut > 0)
+        scalar scaleOut = 0;
+        if (args.optionReadIfPresent("scaleOut", scaleOut) && scaleOut > 0)
         {
             Info<< " -scaleOut " << scaleOut << endl;
             surf.scalePoints(scaleOut);
diff --git a/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C b/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
index f245e4088b..e53a8616d8 100644
--- a/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
+++ b/applications/utilities/surface/surfaceMeshConvertTesting/surfaceMeshConvertTesting.C
@@ -86,10 +86,7 @@ int main(int argc, char *argv[])
     const stringList& params = args.additionalArgs();
 
     scalar scaleFactor = 0;
-    if (args.options().found("scale"))
-    {
-        IStringStream(args.options()["scale"])() >> scaleFactor;
-    }
+    args.optionReadIfPresent("scale", scaleFactor);
 
     fileName importName(params[0]);
     fileName exportName(params[1]);
@@ -110,7 +107,7 @@ int main(int argc, char *argv[])
         return 1;
     }
 
-    if (args.options().found("triSurface"))
+    if (args.optionFound("triSurface"))
     {
         triSurface surf(importName);
 
@@ -118,14 +115,14 @@ int main(int argc, char *argv[])
         surf.writeStats(Info);
         Info<< endl;
 
-        if (args.options().found("orient"))
+        if (args.optionFound("orient"))
         {
             Info<< "Checking surface orientation" << endl;
             PatchTools::checkOrientation(surf, true);
             Info<< endl;
         }
 
-        if (args.options().found("clean"))
+        if (args.optionFound("clean"))
         {
             Info<< "Cleaning up surface" << endl;
             surf.cleanup(true);
@@ -149,7 +146,7 @@ int main(int argc, char *argv[])
         // write sorted by region
         surf.write(exportName, true);
     }
-    else if (args.options().found("unsorted"))
+    else if (args.optionFound("unsorted"))
     {
         UnsortedMeshedSurface<face> surf(importName);
 
@@ -157,14 +154,14 @@ int main(int argc, char *argv[])
         surf.writeStats(Info);
         Info<< endl;
 
-        if (args.options().found("orient"))
+        if (args.optionFound("orient"))
         {
             Info<< "Checking surface orientation" << endl;
             PatchTools::checkOrientation(surf, true);
             Info<< endl;
         }
 
-        if (args.options().found("clean"))
+        if (args.optionFound("clean"))
         {
             Info<< "Cleaning up surface" << endl;
             surf.cleanup(true);
@@ -187,7 +184,7 @@ int main(int argc, char *argv[])
         surf.write(exportName);
     }
 #if 1
-    else if (args.options().found("triFace"))
+    else if (args.optionFound("triFace"))
     {
         MeshedSurface<triFace> surf(importName);
 
@@ -195,14 +192,14 @@ int main(int argc, char *argv[])
         surf.writeStats(Info);
         Info<< endl;
 
-        if (args.options().found("orient"))
+        if (args.optionFound("orient"))
         {
             Info<< "Checking surface orientation" << endl;
             PatchTools::checkOrientation(surf, true);
             Info<< endl;
         }
 
-        if (args.options().found("clean"))
+        if (args.optionFound("clean"))
         {
             Info<< "Cleaning up surface" << endl;
             surf.cleanup(true);
@@ -233,14 +230,14 @@ int main(int argc, char *argv[])
         surf.writeStats(Info);
         Info<< endl;
 
-        if (args.options().found("orient"))
+        if (args.optionFound("orient"))
         {
             Info<< "Checking surface orientation" << endl;
             PatchTools::checkOrientation(surf, true);
             Info<< endl;
         }
 
-        if (args.options().found("clean"))
+        if (args.optionFound("clean"))
         {
             Info<< "Cleaning up surface" << endl;
             surf.cleanup(true);
@@ -263,7 +260,7 @@ int main(int argc, char *argv[])
         }
         surf.write(exportName);
 
-        if (args.options().found("surfMesh"))
+        if (args.optionFound("surfMesh"))
         {
             Foam::Time runTime
             (
diff --git a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
index 34d93c93eb..b6538d0bc1 100644
--- a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
+++ b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
@@ -89,6 +89,7 @@ int main(int argc, char *argv[])
 
     fileName exportName(params[0]);
     word importName("default");
+    args.optionReadIfPresent("name", importName);
 
     // check that writing is supported
     if (!MeshedSurface<face>::canWriteType(exportName.ext(), true))
@@ -96,23 +97,18 @@ int main(int argc, char *argv[])
         return 1;
     }
 
-    if (args.options().found("name"))
-    {
-        importName = args.options()["name"];
-    }
-
 
     // get the coordinate transformations
     autoPtr<coordinateSystem> fromCsys;
     autoPtr<coordinateSystem> toCsys;
 
-    if (args.options().found("from") || args.options().found("to"))
+    if (args.optionFound("from") || args.optionFound("to"))
     {
         autoPtr<IOobject> ioPtr;
 
-        if (args.options().found("dict"))
+        if (args.optionFound("dict"))
         {
-            fileName dictPath(args.options()["dict"]);
+            fileName dictPath(args.option("dict"));
 
             ioPtr.set
             (
@@ -157,9 +153,9 @@ int main(int argc, char *argv[])
 
         coordinateSystems csLst(ioPtr());
 
-        if (args.options().found("from"))
+        if (args.optionFound("from"))
         {
-            const word csName(args.options()["from"]);
+            const word csName(args.option("from"));
 
             label csId = csLst.find(csName);
             if (csId < 0)
@@ -173,9 +169,9 @@ int main(int argc, char *argv[])
             fromCsys.reset(new coordinateSystem(csLst[csId]));
         }
 
-        if (args.options().found("to"))
+        if (args.optionFound("to"))
         {
-            const word csName(args.options()["to"]);
+            const word csName(args.option("to"));
 
             label csId = csLst.find(csName);
             if (csId < 0)
@@ -219,24 +215,13 @@ int main(int argc, char *argv[])
 
     MeshedSurface<face> surf(smesh);
 
-    if (args.options().found("clean"))
+    if (args.optionFound("clean"))
     {
         surf.cleanup(true);
     }
 
     scalar scaleIn = 0;
-    scalar scaleOut = 0;
-    if (args.options().found("scaleIn"))
-    {
-        IStringStream(args.options()["scaleIn"])() >> scaleIn;
-    }
-    if (args.options().found("scaleOut"))
-    {
-        IStringStream(args.options()["scaleOut"])() >> scaleOut;
-    }
-
-
-    if (scaleIn > 0)
+    if (args.optionReadIfPresent("scaleIn", scaleIn) && scaleIn > 0)
     {
         Info<< " -scaleIn " << scaleIn << endl;
         surf.scalePoints(scaleIn);
@@ -256,7 +241,8 @@ int main(int argc, char *argv[])
         surf.movePoints(tpf());
     }
 
-    if (scaleOut > 0)
+    scalar scaleOut = 0;
+    if (args.optionReadIfPresent("scaleOut", scaleOut) && scaleOut > 0)
     {
         Info<< " -scaleOut " << scaleOut << endl;
         surf.scalePoints(scaleOut);
diff --git a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
index 0cb131e4eb..808eefcd76 100644
--- a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
+++ b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
@@ -103,6 +103,7 @@ int main(int argc, char *argv[])
 
     fileName importName(params[0]);
     word exportName("default");
+    args.optionReadIfPresent("name", exportName);
 
     // check that reading is supported
     if (!MeshedSurface<face>::canRead(importName, true))
@@ -110,23 +111,18 @@ int main(int argc, char *argv[])
         return 1;
     }
 
-    if (args.options().found("name"))
-    {
-        exportName = args.options()["name"];
-    }
-
 
     // get the coordinate transformations
     autoPtr<coordinateSystem> fromCsys;
     autoPtr<coordinateSystem> toCsys;
 
-    if (args.options().found("from") || args.options().found("to"))
+    if (args.optionFound("from") || args.optionFound("to"))
     {
         autoPtr<IOobject> ioPtr;
 
-        if (args.options().found("dict"))
+        if (args.optionFound("dict"))
         {
-            fileName dictPath(args.options()["dict"]);
+            fileName dictPath(args.option("dict"));
 
             ioPtr.set
             (
@@ -171,9 +167,9 @@ int main(int argc, char *argv[])
 
         coordinateSystems csLst(ioPtr());
 
-        if (args.options().found("from"))
+        if (args.optionFound("from"))
         {
-            const word csName(args.options()["from"]);
+            const word csName(args.option("from"));
 
             label csId = csLst.find(csName);
             if (csId < 0)
@@ -187,9 +183,9 @@ int main(int argc, char *argv[])
             fromCsys.reset(new coordinateSystem(csLst[csId]));
         }
 
-        if (args.options().found("to"))
+        if (args.optionFound("to"))
         {
-            const word csName(args.options()["to"]);
+            const word csName(args.option("to"));
 
             label csId = csLst.find(csName);
             if (csId < 0)
@@ -217,25 +213,14 @@ int main(int argc, char *argv[])
 
     MeshedSurface<face> surf(importName);
 
-    if (args.options().found("clean"))
+    if (args.optionFound("clean"))
     {
         surf.cleanup(true);
     }
 
 
     scalar scaleIn = 0;
-    scalar scaleOut = 0;
-    if (args.options().found("scaleIn"))
-    {
-        IStringStream(args.options()["scaleIn"])() >> scaleIn;
-    }
-    if (args.options().found("scaleOut"))
-    {
-        IStringStream(args.options()["scaleOut"])() >> scaleOut;
-    }
-
-
-    if (scaleIn > 0)
+    if (args.optionReadIfPresent("scaleIn", scaleIn) && scaleIn > 0)
     {
         Info<< " -scaleIn " << scaleIn << endl;
         surf.scalePoints(scaleIn);
@@ -255,7 +240,8 @@ int main(int argc, char *argv[])
         surf.movePoints(tpf());
     }
 
-    if (scaleOut > 0)
+    scalar scaleOut = 0;
+    if (args.optionReadIfPresent("scaleOut", scaleOut) && scaleOut > 0)
     {
         Info<< " -scaleOut " << scaleOut << endl;
         surf.scalePoints(scaleOut);
diff --git a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
index a57f7c9d48..3ea9e07a82 100644
--- a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
+++ b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
 
     bool includeProcPatches =
        !(
-            args.options().found("excludeProcPatches")
+            args.optionFound("excludeProcPatches")
          || Pstream::parRun()
         );
 
@@ -78,15 +78,15 @@ int main(int argc, char *argv[])
     // - all patches (default in sequential mode)
     // - all non-processor patches (default in parallel mode)
     // - all non-processor patches (sequential mode, -excludeProcPatches option)
-    
+
     // Construct table of patches to include.
     const polyBoundaryMesh& bMesh = mesh.boundaryMesh();
 
     labelHashSet includePatches(bMesh.size());
 
-    if (args.options().found("patches"))
+    if (args.optionFound("patches"))
     {
-        wordList patchNames(IStringStream(args.options()["patches"])());
+        wordList patchNames(args.optionLookup("patches")());
 
         forAll(patchNames, patchNameI)
         {
diff --git a/applications/utilities/surface/surfaceOrient/surfaceOrient.C b/applications/utilities/surface/surfaceOrient/surfaceOrient.C
index 720b858a21..1b728711cd 100644
--- a/applications/utilities/surface/surfaceOrient/surfaceOrient.C
+++ b/applications/utilities/surface/surfaceOrient/surfaceOrient.C
@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
     point visiblePoint(IStringStream(args.additionalArgs()[1])());
     Info<< "Visible point " << visiblePoint << endl;
 
-    bool orientInside = args.options().found("inside");
+    bool orientInside = args.optionFound("inside");
 
     if (orientInside)
     {
diff --git a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
index b56c8e2cf0..8608fe33af 100644
--- a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
+++ b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
@@ -692,7 +692,7 @@ int main(int argc, char *argv[])
 
     fileName inSurfName(args.additionalArgs()[0]);
     fileName outSurfName(args.additionalArgs()[1]);
-    bool debug = args.options().found("debug");
+    bool debug = args.optionFound("debug");
 
 
     Info<< "Reading surface from " << inSurfName << endl;
diff --git a/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C b/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C
index baf64f3555..87ce69ddf7 100644
--- a/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C
+++ b/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C
@@ -177,12 +177,12 @@ int main(int argc, char *argv[])
 
     Info<< "Reading surface from " << surfName << " ..." << endl;
 
-    bool readSet = args.options().found("faceSet");
+    bool readSet = args.optionFound("faceSet");
     word setName;
 
     if (readSet)
     {
-        setName = args.options()["faceSet"];
+        setName = args.option("faceSet");
 
         Info<< "Repatching only the faces in faceSet " << setName
             << " according to nearest surface triangle ..." << endl;
@@ -194,11 +194,7 @@ int main(int argc, char *argv[])
     }
 
     scalar searchTol = 1E-3;
-
-    if (args.options().found("tol"))
-    {
-        searchTol =  readScalar(IStringStream(args.options()["tol"])());
-    }
+    args.optionReadIfPresent("tol", searchTol);
 
     // Get search box. Anything not within this box will not be considered.
     const boundBox& meshBb = mesh.globalData().bb();
diff --git a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
index 1d4597515d..c3243b71ae 100644
--- a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
+++ b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
@@ -86,18 +86,18 @@ int main(int argc, char *argv[])
 
     pointField points(surf1.points());
 
-    if (args.options().found("translate"))
+    if (args.optionFound("translate"))
     {
-        vector transVector(IStringStream(args.options()["translate"])());
+        vector transVector(args.optionLookup("translate")());
 
         Info<< "Translating points by " << transVector << endl;
 
         points += transVector;
     }
 
-    if (args.options().found("rotate"))
+    if (args.optionFound("rotate"))
     {
-        Pair<vector> n1n2(IStringStream(args.options()["rotate"])());
+        Pair<vector> n1n2(args.optionLookup("rotate")());
         n1n2[0] /= mag(n1n2[0]);
         n1n2[1] /= mag(n1n2[1]);
 
@@ -107,9 +107,9 @@ int main(int argc, char *argv[])
 
         points = transform(T, points);
     }
-    else if (args.options().found("rollPitchYaw"))
+    else if (args.optionFound("rollPitchYaw"))
     {
-        vector v(IStringStream(args.options()["rollPitchYaw"])());
+        vector v(args.optionLookup("rollPitchYaw")());
 
         Info<< "Rotating points by" << nl
             << "    roll  " << v.x() << nl
@@ -125,9 +125,9 @@ int main(int argc, char *argv[])
         Info<< "Rotating points by quaternion " << R << endl;
         points = transform(R, points);
     }
-    else if (args.options().found("yawPitchRoll"))
+    else if (args.optionFound("yawPitchRoll"))
     {
-        vector v(IStringStream(args.options()["yawPitchRoll"])());
+        vector v(args.optionLookup("yawPitchRoll")());
 
         Info<< "Rotating points by" << nl
             << "    yaw   " << v.x() << nl
@@ -150,9 +150,9 @@ int main(int argc, char *argv[])
         points = transform(R, points);
     }
 
-    if (args.options().found("scale"))
+    if (args.optionFound("scale"))
     {
-        vector scaleVector(IStringStream(args.options()["scale"])());
+        vector scaleVector(args.optionLookup("scale")());
 
         Info<< "Scaling points by " << scaleVector << endl;
 
diff --git a/src/OpenFOAM/include/addConstantOption.H b/src/OpenFOAM/include/addConstantOption.H
deleted file mode 100644
index 22ef88d33b..0000000000
--- a/src/OpenFOAM/include/addConstantOption.H
+++ /dev/null
@@ -1 +0,0 @@
-    argList::validOptions.insert("constant", "");
diff --git a/src/OpenFOAM/include/addLatestTimeOption.H b/src/OpenFOAM/include/addLatestTimeOption.H
deleted file mode 100644
index d241032e9a..0000000000
--- a/src/OpenFOAM/include/addLatestTimeOption.H
+++ /dev/null
@@ -1 +0,0 @@
-    argList::validOptions.insert("latestTime", "");
diff --git a/src/OpenFOAM/include/addNoZeroOption.H b/src/OpenFOAM/include/addNoZeroOption.H
deleted file mode 100644
index deb25ee153..0000000000
--- a/src/OpenFOAM/include/addNoZeroOption.H
+++ /dev/null
@@ -1 +0,0 @@
-    argList::validOptions.insert("noZero", "");
diff --git a/src/OpenFOAM/include/addTimeOption.H b/src/OpenFOAM/include/addTimeOption.H
deleted file mode 100644
index 1151c51dfd..0000000000
--- a/src/OpenFOAM/include/addTimeOption.H
+++ /dev/null
@@ -1 +0,0 @@
-    argList::validOptions.insert("time", "time");
diff --git a/src/OpenFOAM/include/addTimeOptions.H b/src/OpenFOAM/include/addTimeOptions.H
index 016d9c3ea5..d55374486b 100644
--- a/src/OpenFOAM/include/addTimeOptions.H
+++ b/src/OpenFOAM/include/addTimeOptions.H
@@ -1,4 +1,8 @@
-#include "addConstantOption.H"
-#include "addTimeOption.H"
-#include "addLatestTimeOption.H"
-#include "addNoZeroOption.H"
+//
+// addTimeOptions.H
+// ~~~~~~~~~~~~~~~~
+
+    argList::validOptions.insert("constant", "");
+    argList::validOptions.insert("latestTime", "");
+    argList::validOptions.insert("noZero", "");
+    argList::validOptions.insert("time", "time");
diff --git a/src/OpenFOAM/include/addTimeOptionsNoConstant.H b/src/OpenFOAM/include/addTimeOptionsNoConstant.H
deleted file mode 100644
index 91056f6a3a..0000000000
--- a/src/OpenFOAM/include/addTimeOptionsNoConstant.H
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "addTimeOption.H"
-#include "addLatestTimeOption.H"
diff --git a/src/OpenFOAM/include/checkConstantOption.H b/src/OpenFOAM/include/checkConstantOption.H
index 4b5dbc4356..be3aa5b9f7 100644
--- a/src/OpenFOAM/include/checkConstantOption.H
+++ b/src/OpenFOAM/include/checkConstantOption.H
@@ -1,8 +1,4 @@
-    if
-    (
-        !args.options().found("constant")
-     && Times.size() > 1
-    )
-    {    
+    if (Times.size() > 1 && !args.optionFound("constant"))
+    {
         startTime = 1;
     }
diff --git a/src/OpenFOAM/include/checkLatestTimeOption.H b/src/OpenFOAM/include/checkLatestTimeOption.H
index 9256865d2f..38d24a34d5 100644
--- a/src/OpenFOAM/include/checkLatestTimeOption.H
+++ b/src/OpenFOAM/include/checkLatestTimeOption.H
@@ -1,4 +1,4 @@
-    if (args.options().found("latestTime"))
+    if (args.optionFound("latestTime"))
     {
         startTime = Times.size() - 1;
     }
diff --git a/src/OpenFOAM/include/checkTimeOption.H b/src/OpenFOAM/include/checkTimeOption.H
index 70759dd81b..a3a43141fc 100644
--- a/src/OpenFOAM/include/checkTimeOption.H
+++ b/src/OpenFOAM/include/checkTimeOption.H
@@ -1,6 +1,6 @@
-    if (args.options().found("time"))
+    if (args.optionFound("time"))
     {
-        scalar timeValue(readScalar(IStringStream(args.options()["time"])()));
+        scalar timeValue = args.optionRead<scalar>("time");
 
         startTime = Time::findClosestTimeIndex(Times, timeValue);
         endTime = startTime + 1;
diff --git a/src/OpenFOAM/include/createNamedMesh.H b/src/OpenFOAM/include/createNamedMesh.H
index 2caebe8583..fe61435e47 100644
--- a/src/OpenFOAM/include/createNamedMesh.H
+++ b/src/OpenFOAM/include/createNamedMesh.H
@@ -1,16 +1,13 @@
     word regionName;
 
-    if (args.options().found("region"))
+    if (args.optionReadIfPresent("region", regionName))
     {
-        regionName = args.options()["region"];
-
         Info<< "Create mesh " << regionName << " for time = "
             << runTime.timeName() << nl << endl;
     }
     else
     {
         regionName = fvMesh::defaultRegion;
-
         Info<< "Create mesh for time = "
             << runTime.timeName() << nl << endl;
     }
diff --git a/src/OpenFOAM/include/createNamedPolyMesh.H b/src/OpenFOAM/include/createNamedPolyMesh.H
index 4bb8d1d34a..a1670fb8ed 100644
--- a/src/OpenFOAM/include/createNamedPolyMesh.H
+++ b/src/OpenFOAM/include/createNamedPolyMesh.H
@@ -1,16 +1,13 @@
     word regionName;
 
-    if (args.options().found("region"))
+    if (args.optionReadIfPresent("region", regionName))
     {
-        regionName = args.options()["region"];
-
         Info<< "Create polyMesh " << regionName << " for time = "
             << runTime.timeName() << nl << endl;
     }
     else
     {
         regionName = polyMesh::defaultRegion;
-
         Info<< "Create polyMesh for time = "
             << runTime.timeName() << nl << endl;
     }

From 8edf105c45afdcc8b1a59797cf4abc9b3d1f2eb2 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Wed, 20 May 2009 15:40:30 +0200
Subject: [PATCH 164/175] cleanup of time handling (cosmetic changes), used
 timeSelector in more places

---
 .../conversion/polyDualMesh/polyDualMeshApp.C | 11 ++--
 .../manipulation/deformedGeom/deformedGeom.C  |  7 +--
 .../manipulation/renumberMesh/renumberMesh.C  |  2 -
 .../mesh/manipulation/setSet/setSet.C         | 25 ++------
 .../manipulation/setsToZones/setsToZones.C    |  4 +-
 .../foamToEnsight/foamToEnsight.C             |  1 +
 .../foamToFieldview9/foamToFieldview9.C       | 28 ++++-----
 .../foamToFieldview9/getFieldNames.H          |  4 +-
 .../PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C     |  3 -
 .../USERD_get_maxsize_info.H                  | 21 +++----
 .../ensightFoamReader/USERD_get_sol_times.H   | 14 ++---
 .../USERD_get_timeset_description.H           | 10 ++--
 .../ensightFoamReader/USERD_set_filenames.H   | 12 ++--
 .../USERD_set_time_set_and_step.H             | 18 +++++-
 .../ensightFoamReader/getLagrangianVector.H   |  3 +-
 .../graphics/ensightFoamReader/globalFoam.H   |  2 +-
 .../postChannel/calculateFields.H             |  8 +--
 .../miscellaneous/postChannel/postChannel.C   | 18 ++----
 .../miscellaneous/postChannel/readFields.H    | 16 ++---
 .../preProcessing/mapFields/createTimes.H     |  2 +-
 .../preProcessing/mapFields/mapFields.C       | 31 +---------
 .../preProcessing/mapFields/setTimeIndex.H    | 14 +++--
 .../preProcessing/setFields/setFields.C       | 19 +++---
 src/OpenFOAM/db/Time/Time.C                   | 58 +++++++++----------
 src/OpenFOAM/db/Time/timeSelector.C           | 12 ++--
 src/OpenFOAM/db/Time/timeSelector.H           |  6 +-
 src/OpenFOAM/include/CintDefs.H               |  8 +--
 src/OpenFOAM/include/CintUndefs.H             |  8 +--
 src/OpenFOAM/include/addRegionOption.H        |  6 +-
 src/OpenFOAM/include/addTimeOptions.H         |  8 +--
 src/OpenFOAM/include/checkConstantOption.H    | 14 ++++-
 src/OpenFOAM/include/checkLatestTimeOption.H  |  4 --
 src/OpenFOAM/include/checkTimeOption.H        | 14 ++++-
 src/OpenFOAM/include/checkTimeOptions.H       | 12 +++-
 .../include/checkTimeOptionsNoConstant.H      | 10 +++-
 src/OpenFOAM/include/createMesh.H             |  7 ++-
 src/OpenFOAM/include/createMeshNoClear.H      | 18 ++++--
 src/OpenFOAM/include/createNamedMesh.H        | 24 +++++---
 src/OpenFOAM/include/createNamedPolyMesh.H    | 24 +++++---
 src/OpenFOAM/include/createPolyMesh.H         | 17 ++++--
 src/OpenFOAM/include/createTime.H             |  4 ++
 src/OpenFOAM/include/setRootCase.H            | 13 +++--
 .../basic/addSubtract/addSubtract.C           | 12 ++--
 43 files changed, 283 insertions(+), 269 deletions(-)
 delete mode 100644 src/OpenFOAM/include/checkLatestTimeOption.H

diff --git a/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C b/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C
index c7444c2be6..e2bf673ce2 100644
--- a/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C
+++ b/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C
@@ -45,6 +45,7 @@ Description
 
 #include "argList.H"
 #include "Time.H"
+#include "timeSelector.H"
 #include "fvMesh.H"
 #include "mathematicalConstants.H"
 #include "polyTopoChange.H"
@@ -340,7 +341,8 @@ void dumpFeatures
 int main(int argc, char *argv[])
 {
     argList::noParallel();
-#   include "addTimeOptions.H"
+    timeSelector::addOptions(true, false);
+
     argList::validArgs.append("feature angle[0-180]");
     argList::validOptions.insert("splitAllFaces", "");
     argList::validOptions.insert("doNotPreserveFaceZones", "");
@@ -349,13 +351,10 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 
-    // Get times list
-    instantList Times = runTime.times();
-
-#   include "checkTimeOptions.H"
-    runTime.setTime(Times[startTime], startTime);
+    instantList timeDirs = timeSelector::select0(runTime, args);
 
 #   include "createMesh.H"
+
     const word oldInstance = mesh.pointsInstance();
 
     // Mark boundary edges and points.
diff --git a/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C b/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
index 7b64177da5..f438a1f963 100644
--- a/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
+++ b/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
@@ -59,11 +59,10 @@ int main(int argc, char *argv[])
 
     pointField zeroPoints(mesh.points());
 
-    runTime.setTime(Times[0], 0);
-
-    for (int i = 1; i<Times.size(); i++)
+    // skip "constant" time
+    for (label timeI = 1; timeI < Times.size(); ++timeI)
     {
-        runTime.setTime(Times[i], i);
+        runTime.setTime(Times[timeI], timeI);
 
         Info<< "Time = " << runTime.timeName() << endl;
 
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index a2925210db..bdc60d724b 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -387,7 +387,6 @@ int main(int argc, char *argv[])
     const word oldInstance = mesh.pointsInstance();
 
     const bool blockOrder = args.optionFound("blockOrder");
-
     if (blockOrder)
     {
         Info<< "Ordering cells into regions (using decomposition);"
@@ -396,7 +395,6 @@ int main(int argc, char *argv[])
     }
 
     const bool orderPoints = args.optionFound("orderPoints");
-
     if (orderPoints)
     {
         Info<< "Ordering points into internal and boundary points." << nl
diff --git a/applications/utilities/mesh/manipulation/setSet/setSet.C b/applications/utilities/mesh/manipulation/setSet/setSet.C
index 21b77ff842..d79d516806 100644
--- a/applications/utilities/mesh/manipulation/setSet/setSet.C
+++ b/applications/utilities/mesh/manipulation/setSet/setSet.C
@@ -591,24 +591,10 @@ commandStatus parseType
     }
     else if (setType == "time")
     {
-        scalar time = readScalar(is);
-
+        scalar requestedTime = readScalar(is);
         instantList Times = runTime.times();
 
-        int nearestIndex = -1;
-        scalar nearestDiff = Foam::GREAT;
-
-        forAll(Times, timeIndex)
-        {
-            if (Times[timeIndex].name() == "constant") continue;
-
-            scalar diff = fabs(Times[timeIndex].value() - time);
-            if (diff < nearestDiff)
-            {
-                nearestDiff = diff;
-                nearestIndex = timeIndex;
-            }
-        }
+        label nearestIndex = Time::findClosestTimeIndex(Times, requestedTime);
 
         Pout<< "Changing time from " << runTime.timeName()
             << " to " << Times[nearestIndex].name()
@@ -646,7 +632,8 @@ commandStatus parseType
             }
             default:
             {
-                FatalErrorIn("parseType") << "Illegal mesh update state "
+                FatalErrorIn("parseType")
+                    << "Illegal mesh update state "
                     << stat  << abort(FatalError);
                 break;
             }
@@ -746,7 +733,7 @@ int main(int argc, char *argv[])
 
         Pout<< "Reading commands from file " << batchFile << endl;
 
-        // we also cannot handle .gz files
+        // we cannot handle .gz files
         if (!isFile(batchFile, false))
         {
             FatalErrorIn(args.executable())
@@ -864,7 +851,7 @@ int main(int argc, char *argv[])
         delete fileStreamPtr;
     }
 
-    Pout << nl << "End" << endl;
+    Pout<< "\nEnd" << endl;
 
     return 0;
 }
diff --git a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
index 9d27d8691b..dfd7262fd1 100644
--- a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
+++ b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
@@ -64,7 +64,6 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
 
-
     bool noFlipMap = args.optionFound("noFlipMap");
 
     // Get times list
@@ -73,9 +72,8 @@ int main(int argc, char *argv[])
     label startTime = Times.size()-1;
     label endTime = Times.size();
 
+    // check -time and -latestTime options
 #   include "checkTimeOption.H"
-#   include "checkLatestTimeOption.H"
-
 
     runTime.setTime(Times[startTime], startTime);
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
index a6a429318e..881bb4b05a 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
@@ -48,6 +48,7 @@ Note
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
+#include "timeSelector.H"
 #include "IOobjectList.H"
 #include "IOmanip.H"
 #include "OFstream.H"
diff --git a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C
index cc146bc576..87270649df 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C
@@ -23,7 +23,8 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Description
-    Write out the FOAM mesh in Version 3.0  Fieldview-UNS format (binary).
+    Write out the OpenFOAM mesh in Version 3.0 Fieldview-UNS format (binary).
+
     See Fieldview Release 9 Reference Manual - Appendix D
     (Unstructured Data Format)
     Borrows various from uns/write_binary_uns.c from FieldView dist.
@@ -31,6 +32,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
+#include "timeSelector.H"
 #include "volFields.H"
 #include "surfaceFields.H"
 #include "pointFields.H"
@@ -176,20 +178,15 @@ int main(int argc, char *argv[])
 {
     argList::noParallel();
     argList::validOptions.insert("noWall", "");
+    timeSelector::addOptions(true, false);
 
-#   include "addTimeOptions.H"
 #   include "setRootCase.H"
 #   include "createTime.H"
 
-    instantList Times = runTime.times();
-
-#   include "checkTimeOptions.H"
-
-    runTime.setTime(Times[startTime], startTime);
+    instantList timeDirs = timeSelector::select0(runTime, args);
 
 #   include "createMesh.H"
 
-
     // Initialize name mapping table
     FieldviewNames.insert("alpha", "aalpha");
     FieldviewNames.insert("Alpha", "AAlpha");
@@ -285,17 +282,16 @@ int main(int argc, char *argv[])
 
     label fieldViewTime = 0;
 
-    for (label i=startTime; i<endTime; i++)
+    forAll(timeDirs, timeI)
     {
-        runTime.setTime(Times[i], i);
-
-        Info<< "Time " << Times[i].name() << endl;
+        runTime.setTime(timeDirs[timeI], timeI);
+        Info<< "Time: " << runTime.timeName() << endl;
 
         fvMesh::readUpdateState state = mesh.readUpdate();
 
         if
         (
-            i == startTime
+            timeI == 0
          || state == fvMesh::TOPO_CHANGE
          || state == fvMesh::TOPO_PATCH_CHANGE
         )
@@ -334,7 +330,7 @@ int main(int argc, char *argv[])
 
         fileName fvFileName
         (
-            fvPath/runTime.caseName() + "_" + Foam::name(i) + ".uns"
+            fvPath/runTime.caseName() + "_" + Foam::name(timeI) + ".uns"
         );
 
         Info<< "    file:" << fvFileName.c_str() << endl;
@@ -364,7 +360,7 @@ int main(int argc, char *argv[])
 
         // Output constants for time, fsmach, alpha and re.
         float fBuf[4];
-        fBuf[0] = Times[i].value();
+        fBuf[0] = runTime.value();
         fBuf[1] = 0.0;
         fBuf[2] = 0.0;
         fBuf[3] = 1.0;
@@ -892,7 +888,7 @@ int main(int argc, char *argv[])
             writeInt(fvParticleFile, fieldViewTime + 1);
 
             // Time value
-            writeFloat(fvParticleFile, Times[i].value());
+            writeFloat(fvParticleFile, runTime.value());
 
             // Read particles
             Cloud<passiveParticle> parcels(mesh);
diff --git a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/getFieldNames.H b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/getFieldNames.H
index 129d788738..ec540efe7d 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/getFieldNames.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/getFieldNames.H
@@ -5,9 +5,9 @@ HashSet<word> surfVectorHash;
 HashSet<word> sprayScalarHash;
 HashSet<word> sprayVectorHash;
 
-forAll(Times, timeI)
+forAll(timeDirs, timeI)
 {
-    runTime.setTime(Times[timeI], timeI);
+    runTime.setTime(timeDirs[timeI], timeI);
 
     // Add all fields to hashtable
     IOobjectList objects(mesh, runTime.timeName());
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
index 118e99fc91..04518db985 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
@@ -113,11 +113,9 @@ int Foam::vtkPV3Foam::setTime(int nRequest, const double requestTimes[])
     instantList Times = runTime.times();
 
     int nearestIndex = timeIndex_;
-
     for (int requestI = 0; requestI < nRequest; ++requestI)
     {
         int index = Time::findClosestTimeIndex(Times, requestTimes[requestI]);
-
         if (index >= 0 && index != timeIndex_)
         {
             nearestIndex = index;
@@ -125,7 +123,6 @@ int Foam::vtkPV3Foam::setTime(int nRequest, const double requestTimes[])
         }
     }
 
-
     if (nearestIndex < 0)
     {
         nearestIndex = 0;
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_maxsize_info.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_maxsize_info.H
index e143dd359d..7c4ef69a4f 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_maxsize_info.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_maxsize_info.H
@@ -8,7 +8,7 @@ int USERD_get_maxsize_info
     return Z_ERR; 
 
 #ifdef ENSIGHTDEBUG
-    Info << "Entering: USERD_get_maxsize_info" << endl << flush;
+    Info << "Entering: USERD_get_maxsize_info" << endl;
 #endif
 
     label maxNPoints = 0;
@@ -19,9 +19,9 @@ int USERD_get_maxsize_info
     label nPyr05Max = 0;
     label nTet04Max = 0;
 
-    Info << "Checking all time steps for EnSight memory allocation purpose. This can take some time." << endl;
+    Info<< "Checking all time steps for EnSight memory allocation purpose. This can take some time." << endl;
 
-    for (label t=1; t < TimeList.size(); t++)
+    for (label timeI=1; timeI < timeDirs.size(); ++timeI)
     {
 
         label nPen06 = 0;
@@ -29,21 +29,21 @@ int USERD_get_maxsize_info
         label nPyr05 = 0;
         label nTet04 = 0;
 
-        runTimePtr->setTime(TimeList[t], t);
+        runTimePtr->setTime(timeDirs[timeI], timeI);
 
-        Info << "Checking time = " << TimeList[t].value() << endl << flush;
+        Info<< "Checking time = " << runTimePtr->timeName() << endl;
 
         const cellShapeList& cells = meshPtr->cellShapes();
         
-        label nPoints = meshPtr->nPoints();
-        label nCells = cells.size();
+        const label nPoints = meshPtr->nPoints();
+        const label nCells  = cells.size();
         
         maxNPoints = max(maxNPoints, nPoints);
 
         for (label n=0; n<nCells;n++)
         {
             label nFaces = cells[n].nFaces();
-            labelList points = cells[n];
+            const labelList& points = cells[n];
 
             if ((nFaces == 6) && (points.size() == 8))
             {
@@ -70,7 +70,6 @@ int USERD_get_maxsize_info
 
         if (Numparts_available > 1)
         {
-
             // Get the maximum number of spray parcels
             // and store it
             Cloud<passiveParticle> lagrangian(*meshPtr);
@@ -79,9 +78,7 @@ int USERD_get_maxsize_info
             {
                 nMaxParcels = lagrangian.size();
             }
-
         }
-
     }
 
     max_number_of_nodes[0] = maxNPoints;
@@ -97,7 +94,7 @@ int USERD_get_maxsize_info
     }
 
 #ifdef ENSIGHTDEBUG
-    Info << "Leaving: USERD_get_maxsize_info" << endl << flush;
+    Info<< "Leaving: USERD_get_maxsize_info" << endl;
 #endif
 
     return Z_OK;
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_sol_times.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_sol_times.H
index 353b67def1..dcc6482289 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_sol_times.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_sol_times.H
@@ -10,18 +10,18 @@ int USERD_get_sol_times
 )
 {
 #ifdef ENSIGHTDEBUG
-    Info << "Entering: USERD_get_sol_times" << endl << flush;
-    Info << TimeList << endl;
+    Info<< "Entering: USERD_get_sol_times\n" << timeDirs << endl;
 #endif
+
     for (label n=0; n<Num_time_steps;n++)
     {
-        solution_times[n] = TimeList[n+1].value();
+        solution_times[n] = timeDirs[n+1].value();
     }
 
-    if (TimeList[1].value() < 0)
+    if (timeDirs[1].value() < 0)
     {
         scalar addCAD = 360.0;
-        while (TimeList[1].value() + addCAD < 0.0)
+        while (timeDirs[1].value() + addCAD < 0.0)
         {
             addCAD += 360.0;
         }
@@ -29,14 +29,14 @@ int USERD_get_sol_times
         {
             solution_times[n] += addCAD;
 
-            Info << "Time[" << n << "] = " << TimeList[n+1].value()
+            Info << "Time[" << n << "] = " << timeDirs[n+1].value()
                 << " was corrected to " << solution_times[n]  << endl;
         }
 
     }
 
 #ifdef ENSIGHTDEBUG
-    Info << "Leaving: USERD_get_sol_times" << endl << flush;
+    Info<< "Leaving: USERD_get_sol_times" << endl;
 #endif
 
     return Z_OK;
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_timeset_description.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_timeset_description.H
index 6eebf9b345..e3c98ba240 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_timeset_description.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_timeset_description.H
@@ -4,13 +4,12 @@ int USERD_get_timeset_description
     char timeset_description[Z_BUFL]
 )
 {
-   
+
 #ifdef ENSIGHTDEBUG
-    Info << "Entering: USERD_get_timeset_description" << endl 
-        << flush;
+    Info<< "Entering: USERD_get_timeset_description" << endl;
 #endif
 
-    if (TimeList[1].value() < 0)
+    if (timeDirs[1].value() < 0)
     {
         strncpy(timeset_description, "CAD", Z_BUFL);
     }
@@ -20,8 +19,7 @@ int USERD_get_timeset_description
     }
 
 #ifdef ENSIGHTDEBUG
-    Info << "Leaving: USERD_get_timeset_description" << endl 
-        << flush;
+    Info<< "Leaving: USERD_get_timeset_description" << endl;
 #endif
 
     return Z_OK;
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H
index 83303fef71..712ce53b86 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H
@@ -79,18 +79,18 @@ int USERD_set_filenames
     );
 
     // set the available number of time-steps
-    TimeList = (const instantList&)Foam::Time::findTimes(rootDir/caseDir);
+    timeDirs = Foam::Time::findTimes(rootDir/caseDir);
 
-    Num_time_steps = TimeList.size() - 1;
+    Num_time_steps = timeDirs.size() - 1;
 
     nPatches = meshPtr->boundaryMesh().size();
 
     // set the number of fields and store their names
     // a valid field must exist for all time-steps
-    runTime.setTime(TimeList[TimeList.size()-1], TimeList.size()-1);
+    runTime.setTime(timeDirs[timeDirs.size()-1], timeDirs.size()-1);
     IOobjectList objects(*meshPtr, runTime.timeName());
 
-    fieldNames = (const wordList&)objects.names();
+    fieldNames = objects.names();
 
     // because of the spray being a 'field' ...
     // get the availabe number of variables and
@@ -149,7 +149,7 @@ int USERD_set_filenames
     label n = 0;
     while (!lagrangianNamesFound && n < Num_time_steps)
     {
-        runTime.setTime(TimeList[n+1], n+1);
+        runTime.setTime(timeDirs[n+1], n+1);
 
         Cloud<passiveParticle> lagrangian(*meshPtr);
 
@@ -195,7 +195,7 @@ int USERD_set_filenames
     }
 
     Current_time_step = Num_time_steps;
-    runTime.setTime(TimeList[Current_time_step], Current_time_step);
+    runTime.setTime(timeDirs[Current_time_step], Current_time_step);
 
     Num_variables = nVar + nSprayVariables;
     Numparts_available = Num_unstructured_parts + Num_structured_parts + nPatches;
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_time_set_and_step.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_time_set_and_step.H
index ef2f9a2453..5e4c581532 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_time_set_and_step.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_time_set_and_step.H
@@ -20,18 +20,30 @@ void USERD_set_time_set_and_step
 
         if (time_step == 0)
         {
-            runTime.setTime(TimeList[Current_time_step], Current_time_step);
+            runTime.setTime
+            (
+                timeDirs[Current_time_step],
+                Current_time_step
+            );
         }
         else
         {
-            runTime.setTime(TimeList[Current_time_step + 1], Current_time_step + 1);
+            runTime.setTime
+            (
+                timeDirs[Current_time_step + 1],
+                Current_time_step + 1
+            );
         }
 
         meshPtr->readUpdate();
 
         if (time_step == 0)
         {
-            runTime.setTime(TimeList[Current_time_step + 1], Current_time_step + 1);
+            runTime.setTime
+            (
+                timeDirs[Current_time_step + 1],
+                Current_time_step + 1
+            );
         }
 
         if (Numparts_available > nPatches+1)
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/getLagrangianVector.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/getLagrangianVector.H
index 80c71ba028..c6548c1408 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/getLagrangianVector.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/getLagrangianVector.H
@@ -5,7 +5,6 @@ nVar -= Num_variables - nSprayVariables + lagrangianScalarNames.size();
 
 if (nVar >= 0)
 {
-
     word name = lagrangianVectorNames[nVar];
 
     IOField<vector> v
@@ -42,7 +41,7 @@ if (nVar >= 0)
 }
 else
 {
-    //Info << "getLagrangianVector: nVar = " << nVar << endl;
+    // Info<< "getLagrangianVector: nVar = " << nVar << endl;
     return Z_UNDEF;
 }
 
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/globalFoam.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/globalFoam.H
index d68861b138..7c7f2b16d8 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/globalFoam.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/globalFoam.H
@@ -41,7 +41,7 @@ static word pointPrepend           = "point_";
 static fileName rootDir;
 static fileName caseDir;
 
-static instantList TimeList;
+static instantList timeDirs;
 
 static List<word> fieldNames;
 static List<word> lagrangianScalarNames;
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/calculateFields.H b/applications/utilities/postProcessing/miscellaneous/postChannel/calculateFields.H
index e4f4f411e1..6c7cffcf0a 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/calculateFields.H
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/calculateFields.H
@@ -12,7 +12,7 @@
             IOobject
             (
                 "txx",
-                Times[i].name(),
+                runTime.timeName(),
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
@@ -28,7 +28,7 @@
             IOobject
             (
                 "tyy",
-                Times[i].name(),
+                runTime.timeName(),
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
@@ -44,7 +44,7 @@
             IOobject
             (
                 "tzz",
-                Times[i].name(),
+                runTime.timeName(),
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
@@ -60,7 +60,7 @@
             IOobject
             (
                 "txy",
-                Times[i].name(),
+                runTime.timeName(),
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C b/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C
index 943bff5811..559e769cf1 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C
@@ -48,18 +48,13 @@ Description
 int main(int argc, char *argv[])
 {
     argList::noParallel();
-#   include "addTimeOptions.H"
-#   include "setRootCase.H"
+    timeSelector::addOptions();
 
+#   include "setRootCase.H"
 #   include "createTime.H"
 
     // Get times list
-    instantList Times = runTime.times();
-
-    // set startTime and endTime depending on -time and -latestTime options
-#   include "checkTimeOptions.H"
-
-    runTime.setTime(Times[startTime], startTime);
+    instantList timeDirs = timeSelector::select0(runTime, args);
 
 #   include "createMesh.H"
 #   include "readTransportProperties.H"
@@ -83,10 +78,9 @@ int main(int argc, char *argv[])
 
 
     // For each time step read all fields
-    for (label i=startTime; i<endTime; i++)
+    forAll(timeDirs, timeI)
     {
-        runTime.setTime(Times[i], i);
-
+        runTime.setTime(timeDirs[timeI], timeI);
         Info<< "Collapsing fields for time " << runTime.timeName() << endl;
 
 #       include "readFields.H"
@@ -96,7 +90,7 @@ int main(int argc, char *argv[])
 #       include "collapse.H"
     }
 
-    Info<< "end" << endl;
+    Info<< "\nEnd" << endl;
 
     return 0;
 }
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/readFields.H b/applications/utilities/postProcessing/miscellaneous/postChannel/readFields.H
index d281b63351..e0ce9b1f6d 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/readFields.H
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/readFields.H
@@ -1,7 +1,7 @@
     IOobject UMeanHeader
     (
         "UMean",
-        runTime.times()[i].name(),
+        runTime.timeName(),
         mesh,
         IOobject::MUST_READ
     );
@@ -23,7 +23,7 @@
         IOobject
         (
             "UPrime2Mean",
-            runTime.times()[i].name(),
+            runTime.timeName(),
             mesh,
             IOobject::MUST_READ
         ),
@@ -39,7 +39,7 @@
         IOobject
         (
             "pPrime2Mean",
-            runTime.times()[i].name(),
+            runTime.timeName(),
             mesh,
             IOobject::MUST_READ
         ),
@@ -52,7 +52,7 @@
         IOobject
         (
             "epsilonMean",
-            runTime.times()[i].name(),
+            runTime.timeName(),
             mesh,
             IOobject::MUST_READ
         ),
@@ -64,7 +64,7 @@
         IOobject
         (
             "nuMean",
-            runTime.times()[i].name(),
+            runTime.timeName(),
             mesh,
             IOobject::MUST_READ
         ),
@@ -76,7 +76,7 @@
         IOobject
         (
             "gammaDotMean",
-            runTime.times()[i].name(),
+            runTime.timeName(),
             mesh,
             IOobject::MUST_READ
         ),
@@ -88,7 +88,7 @@
         IOobject
         (
             "nuPrime",
-            runTime.times()[i].name(),
+            runTime.timeName(),
             mesh,
             IOobject::MUST_READ
         ),
@@ -102,7 +102,7 @@
         IOobject
         (
             "gammaDotPrime",
-            runTime.times()[i].name(),
+            runTime.timeName(),
             mesh,
             IOobject::MUST_READ
         ),
diff --git a/applications/utilities/preProcessing/mapFields/createTimes.H b/applications/utilities/preProcessing/mapFields/createTimes.H
index b7c8a1fe33..8367e59557 100644
--- a/applications/utilities/preProcessing/mapFields/createTimes.H
+++ b/applications/utilities/preProcessing/mapFields/createTimes.H
@@ -1,4 +1,4 @@
-    Info<< nl << "Create databases as time" << endl;
+    Info << "\nCreate databases as time" << endl;
 
     Time runTimeSource
     (
diff --git a/applications/utilities/preProcessing/mapFields/mapFields.C b/applications/utilities/preProcessing/mapFields/mapFields.C
index bd840ab267..fde815d76f 100644
--- a/applications/utilities/preProcessing/mapFields/mapFields.C
+++ b/applications/utilities/preProcessing/mapFields/mapFields.C
@@ -43,31 +43,6 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-int getTimeIndex
-(
-    const instantList& times,
-    const scalar t
-)
-{
-    int nearestIndex = -1;
-    scalar nearestDiff = Foam::GREAT;
-
-    forAll(times, timeIndex)
-    {
-        if (times[timeIndex].name() == "constant") continue;
-
-        scalar diff = fabs(times[timeIndex].value() - t);
-        if (diff < nearestDiff)
-        {
-            nearestDiff = diff;
-            nearestIndex = timeIndex;
-        }
-    }
-
-    return nearestIndex;
-}
-
-
 void mapConsistentMesh
 (
     const fvMesh& meshSource,
@@ -254,9 +229,7 @@ wordList addProcessorPatches
 int main(int argc, char *argv[])
 {
 #   include "setRoots.H"
-
 #   include "createTimes.H"
-
 #   include "setTimeIndex.H"
 
     runTimeSource.setTime(sourceTimes[sourceTimeIndex], sourceTimeIndex);
@@ -357,7 +330,7 @@ int main(int argc, char *argv[])
             }
         }
     }
-    else if(!parallelSource && parallelTarget)
+    else if (!parallelSource && parallelTarget)
     {
         IOdictionary decompositionDict
         (
@@ -426,7 +399,7 @@ int main(int argc, char *argv[])
             }
         }
     }
-    else if(parallelSource && parallelTarget)
+    else if (parallelSource && parallelTarget)
     {
         IOdictionary decompositionDictSource
         (
diff --git a/applications/utilities/preProcessing/mapFields/setTimeIndex.H b/applications/utilities/preProcessing/mapFields/setTimeIndex.H
index 15f8efdb0f..19efd9ff5b 100644
--- a/applications/utilities/preProcessing/mapFields/setTimeIndex.H
+++ b/applications/utilities/preProcessing/mapFields/setTimeIndex.H
@@ -8,12 +8,18 @@
         }
         else
         {
-            scalar sourceTime = args.optionRead<scalar>("sourceTime");
-            sourceTimeIndex = getTimeIndex(sourceTimes, sourceTime);
+            sourceTimeIndex = Time::findClosestTimeIndex
+            (
+                sourceTimes,
+                args.optionRead<scalar>("sourceTime")
+            );
         }
     }
     else
     {
-        scalar sourceTime = runTimeTarget.time().value();
-        sourceTimeIndex = getTimeIndex(sourceTimes, sourceTime);
+        sourceTimeIndex = Time::findClosestTimeIndex
+        (
+            sourceTimes,
+            runTimeTarget.time().value()
+        );
     }
diff --git a/applications/utilities/preProcessing/setFields/setFields.C b/applications/utilities/preProcessing/setFields/setFields.C
index 085a1abe2d..5ba3727b39 100644
--- a/applications/utilities/preProcessing/setFields/setFields.C
+++ b/applications/utilities/preProcessing/setFields/setFields.C
@@ -28,6 +28,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
+#include "timeSelector.H"
 #include "Time.H"
 #include "fvMesh.H"
 #include "topoSetSource.H"
@@ -174,19 +175,13 @@ public:
 
 int main(int argc, char *argv[])
 {
+    timeSelector::addOptions();
 
-#   include "addTimeOptions.H"
 #   include "setRootCase.H"
-
 #   include "createTime.H"
 
     // Get times list
-    instantList Times = runTime.times();
-
-    // set startTime and endTime depending on -time and -latestTime options
-#   include "checkTimeOptions.H"
-
-    runTime.setTime(Times[startTime], startTime);
+    instantList timeDirs = timeSelector::select0(runTime, args);
 
 #   include "createMesh.H"
 
@@ -220,11 +215,11 @@ int main(int argc, char *argv[])
 
     PtrList<entry> regions(setFieldsDict.lookup("regions"));
 
-    forAll(regions, regioni)
+    forAll(regions, regionI)
     {
-        const entry& region = regions[regioni];
+        const entry& region = regions[regionI];
 
-        autoPtr<topoSetSource> cellSelector = 
+        autoPtr<topoSetSource> cellSelector =
             topoSetSource::New(region.keyword(), mesh, region.dict());
 
         cellSet selectedCellSet
@@ -247,7 +242,7 @@ int main(int argc, char *argv[])
         );
     }
 
-    Info << nl << "End" << endl;
+    Info<< "\nEnd" << endl;
 
     return 0;
 }
diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index 0a3cbedc18..cc2c8e710d 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -109,20 +109,20 @@ void Foam::Time::setControls()
     else
     {
         // Search directory for valid time directories
-        instantList Times = findTimes(path());
+        instantList timeDirs = findTimes(path());
 
         if (startFrom == "firstTime")
         {
-            if (Times.size())
+            if (timeDirs.size())
             {
-                startTime_ = Times[0].value();
+                startTime_ = timeDirs[0].value();
             }
         }
         else if (startFrom == "latestTime")
         {
-            if (Times.size())
+            if (timeDirs.size())
             {
-                startTime_ = Times[Times.size()-1].value();
+                startTime_ = timeDirs[timeDirs.size()-1].value();
             }
         }
         else
@@ -385,13 +385,13 @@ Foam::instantList Foam::Time::times() const
 
 Foam::word Foam::Time::findInstancePath(const instant& t) const
 {
-    instantList times = Time::findTimes(path());
+    instantList timeDirs = findTimes(path());
 
-    forAllReverse(times, i)
+    forAllReverse(timeDirs, timeI)
     {
-        if (times[i] == t)
+        if (timeDirs[timeI] == t)
         {
-            return times[i].name();
+            return timeDirs[timeI].name();
         }
     }
 
@@ -401,37 +401,37 @@ Foam::word Foam::Time::findInstancePath(const instant& t) const
 
 Foam::instant Foam::Time::findClosestTime(const scalar t) const
 {
-    instantList times = Time::findTimes(path());
+    instantList timeDirs = findTimes(path());
 
-    // If there is only one time it is "constant" so return it
-    if (times.size() == 1)
+    // there is only one time (likely "constant") so return it
+    if (timeDirs.size() == 1)
     {
-        return times[0];
+        return timeDirs[0];
     }
 
-    if (t < times[1].value())
+    if (t < timeDirs[1].value())
     {
-        return times[1];
+        return timeDirs[1];
     }
-    else if (t > times[times.size() - 1].value())
+    else if (t > timeDirs[timeDirs.size()-1].value())
     {
-        return times[times.size() - 1];
+        return timeDirs[timeDirs.size()-1];
     }
 
     label nearestIndex = -1;
     scalar deltaT = GREAT;
 
-    for (label i=1; i < times.size(); i++)
+    for (label timeI=1; timeI < timeDirs.size(); ++timeI)
     {
-        scalar diff = mag(times[i].value() - t);
+        scalar diff = mag(timeDirs[timeI].value() - t);
         if (diff < deltaT)
         {
             deltaT = diff;
-            nearestIndex = i;
+            nearestIndex = timeI;
         }
     }
 
-    return times[nearestIndex];
+    return timeDirs[nearestIndex];
 }
 
 
@@ -440,29 +440,29 @@ Foam::instant Foam::Time::findClosestTime(const scalar t) const
 //
 // Foam::instant Foam::Time::findClosestTime(const scalar t) const
 // {
-//     instantList times = Time::findTimes(path());
-//     label timeIndex = min(findClosestTimeIndex(times, t), 0);
-//     return times[timeIndex];
+//     instantList timeDirs = findTimes(path());
+//     label timeIndex = min(findClosestTimeIndex(timeDirs, t), 0);
+//     return timeDirs[timeIndex];
 // }
 
 Foam::label Foam::Time::findClosestTimeIndex
 (
-    const instantList& times,
+    const instantList& timeDirs,
     const scalar t
 )
 {
     label nearestIndex = -1;
     scalar deltaT = GREAT;
 
-    forAll (times, i)
+    forAll(timeDirs, timeI)
     {
-        if (times[i].name() == "constant") continue;
+        if (timeDirs[timeI].name() == "constant") continue;
 
-        scalar diff = fabs(times[i].value() - t);
+        scalar diff = mag(timeDirs[timeI].value() - t);
         if (diff < deltaT)
         {
             deltaT = diff;
-            nearestIndex = i;
+            nearestIndex = timeI;
         }
     }
 
diff --git a/src/OpenFOAM/db/Time/timeSelector.C b/src/OpenFOAM/db/Time/timeSelector.C
index 8cd7940ccf..caf8c4f3a0 100644
--- a/src/OpenFOAM/db/Time/timeSelector.C
+++ b/src/OpenFOAM/db/Time/timeSelector.C
@@ -170,7 +170,7 @@ Foam::List<Foam::instant> Foam::timeSelector::select
         // determine latestTime selection (if any)
         // this must appear before the -time option processing
         label latestIdx = -1;
-        if (args.options().found("latestTime"))
+        if (args.optionFound("latestTime"))
         {
             selectTimes = false;
             latestIdx = timeDirs.size() - 1;
@@ -182,12 +182,12 @@ Foam::List<Foam::instant> Foam::timeSelector::select
             }
         }
 
-        if (args.options().found("time"))
+        if (args.optionFound("time"))
         {
             // can match 0/, but can never match constant/
             selectTimes = timeSelector
             (
-                IStringStream(args.options()["time"])()
+                args.optionLookup("time")()
             ).selected(timeDirs);
         }
 
@@ -201,13 +201,13 @@ Foam::List<Foam::instant> Foam::timeSelector::select
         if (constantIdx >= 0)
         {
             // only add constant/ if specifically requested
-            selectTimes[constantIdx] = args.options().found("constant");
+            selectTimes[constantIdx] = args.optionFound("constant");
         }
 
         // special treatment for 0/
         if (zeroIdx >= 0)
         {
-            if (args.options().found("noZero"))
+            if (args.optionFound("noZero"))
             {
                 // exclude 0/ if specifically requested
                 selectTimes[zeroIdx] = false;
@@ -215,7 +215,7 @@ Foam::List<Foam::instant> Foam::timeSelector::select
             else if (argList::validOptions.found("zeroTime"))
             {
                 // with -zeroTime enabled, drop 0/ unless specifically requested
-                selectTimes[zeroIdx] = args.options().found("zeroTime");
+                selectTimes[zeroIdx] = args.optionFound("zeroTime");
             }
         }
 
diff --git a/src/OpenFOAM/db/Time/timeSelector.H b/src/OpenFOAM/db/Time/timeSelector.H
index 1138f1b0e5..ecdb92bb33 100644
--- a/src/OpenFOAM/db/Time/timeSelector.H
+++ b/src/OpenFOAM/db/Time/timeSelector.H
@@ -85,7 +85,7 @@ class argList;
 class Time;
 
 /*---------------------------------------------------------------------------*\
-                       Class timeSelector Declaration
+                        Class timeSelector Declaration
 \*---------------------------------------------------------------------------*/
 
 class timeSelector
@@ -136,7 +136,7 @@ public:
         );
 
         //- Return the set of times selected based on the argList options
-        static List<Foam::instant> select
+        static List<instant> select
         (
             const List<instant>&,
             const argList& args
@@ -144,7 +144,7 @@ public:
 
         //- Return the set of times selected based on the argList options
         //  also set the runTime to the first instance
-        static List<Foam::instant> select0
+        static List<instant> select0
         (
             Time& runTime,
             const argList& args
diff --git a/src/OpenFOAM/include/CintDefs.H b/src/OpenFOAM/include/CintDefs.H
index 7dcb75b6d4..90e1f62a2f 100644
--- a/src/OpenFOAM/include/CintDefs.H
+++ b/src/OpenFOAM/include/CintDefs.H
@@ -1,6 +1,6 @@
 #ifdef __CINT__
-#define tmp Foam::tmp
-#define UList Foam::UList
-#define List Foam::List
-#define InfoProxy Foam::InfoProxy
+# define tmp Foam::tmp
+# define UList Foam::UList
+# define List Foam::List
+# define InfoProxy Foam::InfoProxy
 #endif
diff --git a/src/OpenFOAM/include/CintUndefs.H b/src/OpenFOAM/include/CintUndefs.H
index 20a47aea2a..6b0b69e99c 100644
--- a/src/OpenFOAM/include/CintUndefs.H
+++ b/src/OpenFOAM/include/CintUndefs.H
@@ -1,6 +1,6 @@
 #ifdef __CINT__
-#undef tmp
-#undef UList
-#undef List
-#undef InfoProxy
+# undef tmp
+# undef UList
+# undef List
+# undef InfoProxy
 #endif
diff --git a/src/OpenFOAM/include/addRegionOption.H b/src/OpenFOAM/include/addRegionOption.H
index 382836d329..4ece251a17 100644
--- a/src/OpenFOAM/include/addRegionOption.H
+++ b/src/OpenFOAM/include/addRegionOption.H
@@ -1 +1,5 @@
-    argList::validOptions.insert("region", "name");
+//
+// addRegionOption.H
+// ~~~~~~~~~~~~~~~~~
+
+    Foam::argList::validOptions.insert("region", "name");
diff --git a/src/OpenFOAM/include/addTimeOptions.H b/src/OpenFOAM/include/addTimeOptions.H
index d55374486b..ec57beec07 100644
--- a/src/OpenFOAM/include/addTimeOptions.H
+++ b/src/OpenFOAM/include/addTimeOptions.H
@@ -2,7 +2,7 @@
 // addTimeOptions.H
 // ~~~~~~~~~~~~~~~~
 
-    argList::validOptions.insert("constant", "");
-    argList::validOptions.insert("latestTime", "");
-    argList::validOptions.insert("noZero", "");
-    argList::validOptions.insert("time", "time");
+    Foam::argList::validOptions.insert("constant", "");
+    Foam::argList::validOptions.insert("latestTime", "");
+    Foam::argList::validOptions.insert("noZero", "");
+    Foam::argList::validOptions.insert("time", "time");
diff --git a/src/OpenFOAM/include/checkConstantOption.H b/src/OpenFOAM/include/checkConstantOption.H
index be3aa5b9f7..9f39ac6541 100644
--- a/src/OpenFOAM/include/checkConstantOption.H
+++ b/src/OpenFOAM/include/checkConstantOption.H
@@ -1,4 +1,14 @@
-    if (Times.size() > 1 && !args.optionFound("constant"))
+//
+// checkConstantOption.H
+// ~~~~~~~~~~~~~~~~~~~~~
+// unless -constant is present, skip startTime if it is "constant"
+
+    if
+    (
+        !args.optionFound("constant")
+     && (startTime < Times.size()-1)
+     && (Times[startTime].name() == "constant")
+    )
     {
-        startTime = 1;
+        startTime++;
     }
diff --git a/src/OpenFOAM/include/checkLatestTimeOption.H b/src/OpenFOAM/include/checkLatestTimeOption.H
deleted file mode 100644
index 38d24a34d5..0000000000
--- a/src/OpenFOAM/include/checkLatestTimeOption.H
+++ /dev/null
@@ -1,4 +0,0 @@
-    if (args.optionFound("latestTime"))
-    {
-        startTime = Times.size() - 1;
-    }
diff --git a/src/OpenFOAM/include/checkTimeOption.H b/src/OpenFOAM/include/checkTimeOption.H
index a3a43141fc..64ef62440f 100644
--- a/src/OpenFOAM/include/checkTimeOption.H
+++ b/src/OpenFOAM/include/checkTimeOption.H
@@ -1,7 +1,17 @@
+//
+// checkTimeOption.H
+// ~~~~~~~~~~~~~~~~~
+// check -time and -latestTime options
+
     if (args.optionFound("time"))
     {
-        scalar timeValue = args.optionRead<scalar>("time");
+        Foam::scalar timeValue = args.optionRead<scalar>("time");
 
-        startTime = Time::findClosestTimeIndex(Times, timeValue);
+        startTime = Foam::Time::findClosestTimeIndex(Times, timeValue);
         endTime = startTime + 1;
     }
+
+    if (args.optionFound("latestTime"))
+    {
+        startTime = Times.size() - 1;
+    }
diff --git a/src/OpenFOAM/include/checkTimeOptions.H b/src/OpenFOAM/include/checkTimeOptions.H
index 121b17797e..7b2b15b329 100644
--- a/src/OpenFOAM/include/checkTimeOptions.H
+++ b/src/OpenFOAM/include/checkTimeOptions.H
@@ -1,6 +1,12 @@
-    label startTime = 0;
-    label endTime = Times.size();
+//
+// checkTimeOptions.H
+// ~~~~~~~~~~~~~~~~~~
 
+    Foam::label startTime = 0;
+    Foam::label endTime = Times.size();
+
+// unless -constant is present, skip startTime if it is "constant"
 #   include "checkConstantOption.H"
+    
+// check -time and -latestTime options
 #   include "checkTimeOption.H"
-#   include "checkLatestTimeOption.H"
diff --git a/src/OpenFOAM/include/checkTimeOptionsNoConstant.H b/src/OpenFOAM/include/checkTimeOptionsNoConstant.H
index 4d5bfced69..407903ddc1 100644
--- a/src/OpenFOAM/include/checkTimeOptionsNoConstant.H
+++ b/src/OpenFOAM/include/checkTimeOptionsNoConstant.H
@@ -1,5 +1,9 @@
-    label startTime = 0;
-    label endTime = Times.size();
+//
+// checkTimeOptionsNoConstant.H
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+    Foam::label startTime = 0;
+    Foam::label endTime = Times.size();
+
+// check -time and -latestTime options
 #   include "checkTimeOption.H"
-#   include "checkLatestTimeOption.H"
diff --git a/src/OpenFOAM/include/createMesh.H b/src/OpenFOAM/include/createMesh.H
index a85c239f41..630494649d 100644
--- a/src/OpenFOAM/include/createMesh.H
+++ b/src/OpenFOAM/include/createMesh.H
@@ -1,4 +1,9 @@
-    Foam::Info<< "Create mesh for time = "
+//
+// createMesh.H
+// ~~~~~~~~~~~~
+
+    Foam::Info
+        << "Create mesh for time = "
         << runTime.timeName() << Foam::nl << Foam::endl;
 
     Foam::fvMesh mesh
diff --git a/src/OpenFOAM/include/createMeshNoClear.H b/src/OpenFOAM/include/createMeshNoClear.H
index d0e61ab7f8..8526a37be6 100644
--- a/src/OpenFOAM/include/createMeshNoClear.H
+++ b/src/OpenFOAM/include/createMeshNoClear.H
@@ -1,13 +1,19 @@
-    Info<< "Create mesh, no clear-out for time = "
-        << runTime.timeName() << nl << endl;
+//
+// createMeshNoClear.H
+// ~~~~~~~~~~~~~~~~~~~
+// currently identical to createMesh.H
 
-    fvMesh mesh
+    Foam::Info
+        << "Create mesh, no clear-out for time = "
+        << runTime.timeName() << Foam::nl << Foam::endl;
+
+    Foam::fvMesh mesh
     (
-        IOobject
+        Foam::IOobject
         (
-            fvMesh::defaultRegion,
+            Foam::fvMesh::defaultRegion,
             runTime.timeName(),
             runTime,
-            IOobject::MUST_READ
+            Foam::IOobject::MUST_READ
         )
     );
diff --git a/src/OpenFOAM/include/createNamedMesh.H b/src/OpenFOAM/include/createNamedMesh.H
index fe61435e47..f61ec2bd6e 100644
--- a/src/OpenFOAM/include/createNamedMesh.H
+++ b/src/OpenFOAM/include/createNamedMesh.H
@@ -1,24 +1,30 @@
-    word regionName;
+//
+// createNamedMesh.H
+// ~~~~~~~~~~~~~~~~~
+
+    Foam::word regionName;
 
     if (args.optionReadIfPresent("region", regionName))
     {
-        Info<< "Create mesh " << regionName << " for time = "
-            << runTime.timeName() << nl << endl;
+        Foam::Info
+            << "Create mesh " << regionName << " for time = "
+            << runTime.timeName() << Foam::nl << Foam::endl;
     }
     else
     {
-        regionName = fvMesh::defaultRegion;
-        Info<< "Create mesh for time = "
-            << runTime.timeName() << nl << endl;
+        regionName = Foam::fvMesh::defaultRegion;
+        Foam::Info
+            << "Create mesh for time = "
+            << runTime.timeName() << Foam::nl << Foam::endl;
     }
 
-    fvMesh mesh
+    Foam::fvMesh mesh
     (
-        IOobject
+        Foam::IOobject
         (
             regionName,
             runTime.timeName(),
             runTime,
-            IOobject::MUST_READ
+            Foam::IOobject::MUST_READ
         )
     );
diff --git a/src/OpenFOAM/include/createNamedPolyMesh.H b/src/OpenFOAM/include/createNamedPolyMesh.H
index a1670fb8ed..bee8601c74 100644
--- a/src/OpenFOAM/include/createNamedPolyMesh.H
+++ b/src/OpenFOAM/include/createNamedPolyMesh.H
@@ -1,24 +1,30 @@
-    word regionName;
+//
+// createNamedPolyMesh.H
+// ~~~~~~~~~~~~~~~~~~~~~
+
+    Foam::word regionName;
 
     if (args.optionReadIfPresent("region", regionName))
     {
-        Info<< "Create polyMesh " << regionName << " for time = "
-            << runTime.timeName() << nl << endl;
+        Foam::Info
+            << "Create polyMesh " << regionName << " for time = "
+            << runTime.timeName() << Foam::nl << Foam::endl;
     }
     else
     {
-        regionName = polyMesh::defaultRegion;
-        Info<< "Create polyMesh for time = "
-            << runTime.timeName() << nl << endl;
+        regionName = Foam::polyMesh::defaultRegion;
+        Foam::Info
+            << "Create polyMesh for time = "
+            << runTime.timeName() << Foam::nl << Foam::endl;
     }
 
-    polyMesh mesh
+    Foam::polyMesh mesh
     (
-        IOobject
+        Foam::IOobject
         (
             regionName,
             runTime.timeName(),
             runTime,
-            IOobject::MUST_READ
+            Foam::IOobject::MUST_READ
         )
     );
diff --git a/src/OpenFOAM/include/createPolyMesh.H b/src/OpenFOAM/include/createPolyMesh.H
index 3249a6c02a..02e25d1c51 100644
--- a/src/OpenFOAM/include/createPolyMesh.H
+++ b/src/OpenFOAM/include/createPolyMesh.H
@@ -1,13 +1,18 @@
-    Info<< "Create polyMesh for time = "
-        << runTime.timeName() << nl << endl;
+//
+// createPolyMesh.H
+// ~~~~~~~~~~~~~~~~
 
-    polyMesh mesh
+    Foam::Info
+        << "Create polyMesh for time = "
+        << runTime.timeName() << Foam::nl << Foam::endl;
+
+    Foam::polyMesh mesh
     (
-        IOobject
+        Foam::IOobject
         (
-            polyMesh::defaultRegion,
+            Foam::polyMesh::defaultRegion,
             runTime.timeName(),
             runTime,
-            IOobject::MUST_READ
+            Foam::IOobject::MUST_READ
         )
     );
diff --git a/src/OpenFOAM/include/createTime.H b/src/OpenFOAM/include/createTime.H
index 7c600100fe..057814a870 100644
--- a/src/OpenFOAM/include/createTime.H
+++ b/src/OpenFOAM/include/createTime.H
@@ -1,3 +1,7 @@
+//
+// createTime.H
+// ~~~~~~~~~~~~
+
     Foam::Info<< "Create time\n" << Foam::endl;
 
     Foam::Time runTime
diff --git a/src/OpenFOAM/include/setRootCase.H b/src/OpenFOAM/include/setRootCase.H
index 09d961ea8a..587374d067 100644
--- a/src/OpenFOAM/include/setRootCase.H
+++ b/src/OpenFOAM/include/setRootCase.H
@@ -1,6 +1,9 @@
-Foam::argList args(argc, argv);
+//
+// setRootCase.H
+// ~~~~~~~~~~~~~
 
-if (!args.checkRootCase())
-{
-    Foam::FatalError.exit();
-}
+    Foam::argList args(argc, argv);
+    if (!args.checkRootCase())
+    {
+        Foam::FatalError.exit();
+    }
diff --git a/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.C b/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.C
index b64f5f8adb..080f027658 100644
--- a/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.C
+++ b/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.C
@@ -232,14 +232,14 @@ void Foam::calcTypes::addSubtract::preCalc
             << exit(FatalError);
     }
 
-    if (args.options().found("field"))
+    if (args.optionFound("field"))
     {
-        addSubtractFieldName_ = args.options()["field"];
+        addSubtractFieldName_ = args.option("field");
         calcType_ = FIELD;
     }
-    else if (args.options().found("value"))
+    else if (args.optionFound("value"))
     {
-        addSubtractValueStr_ = args.options()["value"];
+        addSubtractValueStr_ = args.option("value");
         calcType_ = VALUE;
     }
     else
@@ -249,9 +249,9 @@ void Foam::calcTypes::addSubtract::preCalc
             << nl << exit(FatalError);
     }
 
-    if (args.options().found("resultName"))
+    if (args.optionFound("resultName"))
     {
-        resultName_ = args.options()["resultName"];
+        resultName_ = args.option("resultName");
     }
 }
 

From 0696e9aa441f29defef1a9ec5a8354c4d22b0b9c Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 20 May 2009 14:50:08 +0100
Subject: [PATCH 165/175] corrections to chemical enthalpy transfer

---
 .../ReactingMultiphaseParcel.C                     |  7 +++++--
 .../ReactingMultiphaseParcelI.H                    | 14 +++++++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 7c2fd37583..e5d8e25d5f 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -174,9 +174,12 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::cellValueSourceCorrection
     const scalar cpc = td.cpInterp().psi()[cellI];
     this->cpc_ = (massCell*cpc + addedMass*cpEff)/massCellNew;
 
-    const scalar fCarrier = -1.0/td.constProps().hRetentionCoeff();
+    const scalar fCarrier =
+        (1.0 - td.cloud().constProps().hRetentionCoeff())
+       /td.cloud().constProps().hRetentionCoeff();
+
     const scalar dh =
-        td.cloud().hsTrans()[cellI] + fCarrier*td.cloud().hcTrans()[cellI];
+        td.cloud().hsTrans()[cellI] - fCarrier*td.cloud().hcTrans()[cellI];
 
     this->Tc_ += dh/(this->cpc_*massCellNew);
 }
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
index ef40cdc994..e70b922ae2 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
@@ -39,7 +39,19 @@ constantProperties
     (
         dimensionedScalar(this->dict().lookup("hRetentionCoeff")).value()
     )
-{}
+{
+    if ((hRetentionCoeff_ < 0) || (hRetentionCoeff_ > 1))
+    {
+        FatalErrorIn
+        (
+            "ReactingMultiphaseParcel<ParcelType>::constantProperties::"
+            "constantProperties"
+        )   << "hRetentionCoeff must be in the range 0 to 1" << nl
+            << exit(FatalError) << endl;
+    }
+
+    hRetentionCoeff_ = max(1e-06, hRetentionCoeff_);
+}
 
 
 template<class ParcelType>

From 5866b3a114788e8fd3c0dc992fde5895f63d46fd Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 20 May 2009 14:54:12 +0100
Subject: [PATCH 166/175] correcting signs for return heat of reaction

---
 .../COxidationDiffusionLimitedRate.C                            | 2 +-
 .../COxidationKineticDiffusionLimitedRate.C                     | 2 +-
 .../COxidationMurphyShaddix/COxidationMurphyShaddix.C           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
index e86391182f..7e8f2a0e2b 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
@@ -143,7 +143,7 @@ Foam::scalar Foam::COxidationDiffusionLimitedRate::calculate
     dMassSRCarrier[CO2GlobalId_] += dmCO2;
 
     // Heat of reaction [J]
-    return HcCO2_*dmCO2;
+    return -HcCO2_*dmCO2;
 }
 
 
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
index bb3e28ae56..078cd100d7 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
@@ -155,7 +155,7 @@ Foam::scalar Foam::COxidationKineticDiffusionLimitedRate::calculate
     dMassSRCarrier[CO2GlobalId_] += dmCO2;
 
     // Heat of reaction [J]
-    return HcCO2_*dmCO2;
+    return -HcCO2_*dmCO2;
 }
 
 
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
index 128c5d64e9..265b4b6643 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
@@ -201,7 +201,7 @@ Foam::scalar Foam::COxidationMurphyShaddix::calculate
     dMassSolid[CsLocalId_] += dOmega*WC_;
 
     // Heat of reaction
-    return HcCO2_*dOmega*WC_;
+    return -HcCO2_*dOmega*WC_;
 }
 
 

From a9e1faf9c362f2c993dcb7deb0c059f7570fbdf9 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 20 May 2009 14:58:27 +0100
Subject: [PATCH 167/175] removing const-ness

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

diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
index 9bf8a5294d..c3ce7e0073 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -87,7 +87,7 @@ public:
 
             //- Fraction of enthalpy retained by parcel due to surface
             //  reactions
-            const scalar hRetentionCoeff_;
+            scalar hRetentionCoeff_;
 
 
     public:

From c7ab2fcc4c5472b3e0cde9d252b3e19e17c3b086 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 20 May 2009 16:05:10 +0100
Subject: [PATCH 168/175] changed field name

---
 .../solvers/combustion/coalChemistryFoam/createFields.H         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/solvers/combustion/coalChemistryFoam/createFields.H b/applications/solvers/combustion/coalChemistryFoam/createFields.H
index 9c10e89164..ebd8a44ab6 100644
--- a/applications/solvers/combustion/coalChemistryFoam/createFields.H
+++ b/applications/solvers/combustion/coalChemistryFoam/createFields.H
@@ -48,7 +48,7 @@
     (
         IOobject
         (
-            "injectionIndicator",
+            "pDyn",
             runTime.timeName(),
             mesh,
             IOobject::NO_READ,

From 69e2eefdb0849d4cc712d7624651dba67b696b7b Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 20 May 2009 17:30:21 +0100
Subject: [PATCH 169/175] added new coalChemisryFoam tutorial

---
 .../coalChemistryFoam/simplifiedSiwek/0/CH4   |   51 +
 .../coalChemistryFoam/simplifiedSiwek/0/CO    |   51 +
 .../coalChemistryFoam/simplifiedSiwek/0/CO2   |   51 +
 .../coalChemistryFoam/simplifiedSiwek/0/G     |   56 +
 .../coalChemistryFoam/simplifiedSiwek/0/H2    |   51 +
 .../coalChemistryFoam/simplifiedSiwek/0/H2O   |   51 +
 .../coalChemistryFoam/simplifiedSiwek/0/N2    |   51 +
 .../coalChemistryFoam/simplifiedSiwek/0/O2    |   51 +
 .../coalChemistryFoam/simplifiedSiwek/0/T     |   52 +
 .../coalChemistryFoam/simplifiedSiwek/0/U     |   50 +
 .../simplifiedSiwek/0/epsilon                 |   50 +
 .../coalChemistryFoam/simplifiedSiwek/0/k     |   50 +
 .../coalChemistryFoam/simplifiedSiwek/0/p     | 2551 +++++++++++++
 .../simplifiedSiwek/chemkin/chem.inp          |   11 +
 .../simplifiedSiwek/chemkin/foam.dat          |   32 +
 .../simplifiedSiwek/chemkin/foam.inp          |   22 +
 .../simplifiedSiwek/chemkin/therm.dat         | 3283 +++++++++++++++++
 .../simplifiedSiwek/constant/RASProperties    |   60 +
 .../constant/chemistryProperties              |   47 +
 .../constant/coalCloud1Positions              |   48 +
 .../constant/coalCloud1Properties             |  164 +
 .../constant/enthalpySourceProperties         |   37 +
 .../constant/environmentalProperties          |   21 +
 .../constant/limestoneCloud1Properties        |  104 +
 .../constant/limestonePositions               |   37 +
 .../constant/polyMesh/blockMeshDict           |   88 +
 .../constant/radiationProperties              |   73 +
 .../constant/thermophysicalProperties         |   46 +
 .../constant/turbulenceProperties             |   21 +
 .../simplifiedSiwek/system/controlDict        |   55 +
 .../simplifiedSiwek/system/decomposeParDict   |   50 +
 .../simplifiedSiwek/system/fvSchemes          |   72 +
 .../simplifiedSiwek/system/fvSolution         |  143 +
 33 files changed, 7580 insertions(+)
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/CH4
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/CO
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/CO2
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/G
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/H2
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/H2O
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/N2
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/O2
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/T
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/U
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/epsilon
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/k
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/p
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/chem.inp
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/foam.dat
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/foam.inp
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/therm.dat
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/RASProperties
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/enthalpySourceProperties
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/environmentalProperties
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestonePositions
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/polyMesh/blockMeshDict
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/system/decomposeParDict
 create mode 100755 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes
 create mode 100755 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution

diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/CH4 b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/CH4
new file mode 100644
index 0000000000..5b0f18db0c
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/CH4
@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      CH4;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.0;
+
+boundaryField
+{
+    top
+    {
+        type            zeroGradient;
+    }
+
+    bottom
+    {
+        type            zeroGradient;
+    }
+
+    walls
+    {
+        type            zeroGradient;
+    }
+
+    symmetry
+    {
+        type            symmetryPlane;
+    }
+
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/CO b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/CO
new file mode 100644
index 0000000000..40eed00221
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/CO
@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      CO;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.0;
+
+boundaryField
+{
+    top
+    {
+        type            zeroGradient;
+    }
+
+    bottom
+    {
+        type            zeroGradient;
+    }
+
+    walls
+    {
+        type            zeroGradient;
+    }
+
+    symmetry
+    {
+        type            symmetryPlane;
+    }
+
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/CO2 b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/CO2
new file mode 100644
index 0000000000..6afb84af40
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/CO2
@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      CO2;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.0;
+
+boundaryField
+{
+    top
+    {
+        type            zeroGradient;
+    }
+
+    bottom
+    {
+        type            zeroGradient;
+    }
+
+    walls
+    {
+        type            zeroGradient;
+    }
+
+    symmetry
+    {
+        type            symmetryPlane;
+    }
+
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/G b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/G
new file mode 100644
index 0000000000..1fbaf23d4d
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/G
@@ -0,0 +1,56 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      G;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 0 -3 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    top
+    {
+        type            MarshakRadiation;
+        T               T;
+        emissivity      1.0;
+        value           uniform 0;
+    }
+    bottom
+    {
+        type            MarshakRadiation;
+        T               T;
+        emissivity      1.0;
+        value           uniform 0;
+    }
+    walls
+    {
+        type            MarshakRadiation;
+        T               T;
+        emissivity      1.0;
+        value           uniform 0;
+    }
+    symmetry
+    {
+        type            symmetryPlane;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/H2 b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/H2
new file mode 100644
index 0000000000..c0632b8637
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/H2
@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      H2;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.0;
+
+boundaryField
+{
+    top
+    {
+        type            zeroGradient;
+    }
+
+    bottom
+    {
+        type            zeroGradient;
+    }
+
+    walls
+    {
+        type            zeroGradient;
+    }
+
+    symmetry
+    {
+        type            symmetryPlane;
+    }
+
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/H2O b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/H2O
new file mode 100644
index 0000000000..39a64df509
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/H2O
@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      H2O;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.0;
+
+boundaryField
+{
+    top
+    {
+        type            zeroGradient;
+    }
+
+    bottom
+    {
+        type            zeroGradient;
+    }
+
+    walls
+    {
+        type            zeroGradient;
+    }
+
+    symmetry
+    {
+        type            symmetryPlane;
+    }
+
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/N2 b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/N2
new file mode 100644
index 0000000000..8d98a27778
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/N2
@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      N2;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.79;
+
+boundaryField
+{
+    top
+    {
+        type            zeroGradient;
+    }
+
+    bottom
+    {
+        type            zeroGradient;
+    }
+
+    walls
+    {
+        type            zeroGradient;
+    }
+
+    symmetry
+    {
+        type            symmetryPlane;
+    }
+
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/O2 b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/O2
new file mode 100644
index 0000000000..2715a76686
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/O2
@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      O2;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0.21;
+
+boundaryField
+{
+    top
+    {
+        type            zeroGradient;
+    }
+
+    bottom
+    {
+        type            zeroGradient;
+    }
+
+    walls
+    {
+        type            zeroGradient;
+    }
+
+    symmetry
+    {
+        type            symmetryPlane;
+    }
+
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/T b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/T
new file mode 100644
index 0000000000..9cfa5c9c23
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/T
@@ -0,0 +1,52 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      T;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 1 0 0 0];
+
+internalField   uniform 400;
+
+boundaryField
+{
+    top
+    {
+        type            zeroGradient;
+    }
+
+    bottom
+    {
+        type            zeroGradient;
+    }
+
+    walls
+    {
+        type            fixedValue;
+        value           uniform 400;
+    }
+
+    symmetry
+    {
+        type            symmetryPlane;
+    }
+
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/U b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/U
new file mode 100644
index 0000000000..b6c4c172b8
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/U
@@ -0,0 +1,50 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    location    "0";
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    top
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    bottom
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    walls
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    symmetry
+    {
+        type            symmetryPlane;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/epsilon b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/epsilon
new file mode 100644
index 0000000000..e5ed472a8b
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/epsilon
@@ -0,0 +1,50 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      epsilon;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -3 0 0 0 0];
+
+internalField   uniform 5390.5;
+
+boundaryField
+{
+    top
+    {
+        type            compressible::epsilonWallFunction;
+        value           uniform 5390.5;
+    }
+    bottom
+    {
+        type            compressible::epsilonWallFunction;
+        value           uniform 5390.5;
+    }
+    walls
+    {
+        type            compressible::epsilonWallFunction;
+        value           uniform 5390.5;
+    }
+    symmetry
+    {
+        type            symmetryPlane;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/k b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/k
new file mode 100644
index 0000000000..1d9c0d007f
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/k
@@ -0,0 +1,50 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      k;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -2 0 0 0 0];
+
+internalField   uniform 37.5;
+
+boundaryField
+{
+    top
+    {
+        type            compressible::kQRWallFunction;
+        value           uniform 37.5;
+    }
+    bottom
+    {
+        type            compressible::kQRWallFunction;
+        value           uniform 37.5;
+    }
+    walls
+    {
+        type            compressible::kQRWallFunction;
+        value           uniform 37.5;
+    }
+    symmetry
+    {
+        type            symmetryPlane;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/p b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/p
new file mode 100644
index 0000000000..55edbea3d6
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/p
@@ -0,0 +1,2551 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   nonuniform List<scalar>
+2500
+(
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+5e+05
+)
+;
+
+boundaryField
+{
+    top
+    {
+        type            zeroGradient;
+    }
+    bottom
+    {
+        type            zeroGradient;
+    }
+    walls
+    {
+        type            zeroGradient;
+    }
+    symmetry
+    {
+        type            symmetryPlane;
+    }
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/chem.inp b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/chem.inp
new file mode 100644
index 0000000000..0e2a2580ca
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/chem.inp
@@ -0,0 +1,11 @@
+ELEMENTS
+O  H  C  N
+END
+SPECIES
+N2  O2 CH4  H2  CO2 H2O
+END
+REACTIONS
+ CH4  + 2   O2 => CO2 + 2 H2O 7.000E+12  0.00  20000
+ H2   + 0.5 O2 => H2O         1.500E+14  0.00  20000
+
+END
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/foam.dat b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/foam.dat
new file mode 100644
index 0000000000..b3a1716ea5
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/foam.dat
@@ -0,0 +1,32 @@
+(
+CO2 CO2	1	44.01
+    0	5000	1000
+    3.85746 0.00441437 -2.21481e-06 5.2349e-10 -4.72084e-14 -48759.2 2.27164
+    2.35677 0.0089846 -7.12356e-06 2.45919e-09 -1.437e-13 -48372 9.90105
+	1.67212e-06	170.672
+CH4 CH4	1	16.043
+    0	5000	1000
+    0.0748515 0.0133909 -5.73286e-06 1.22293e-09 -1.01815e-13 -9468.34 18.4373
+    5.14988 -0.013671 4.91801e-05 -4.84743e-08 1.66694e-11 -10246.6 -4.6413
+	1.67212e-06	170.672
+H2 H2	1	2.01594
+    0	5000	1000
+    3.33728 -4.94025e-05 4.99457e-07 -1.79566e-10 2.00255e-14 -950.159 -3.20502
+    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
+	1.67212e-06	170.672
+H2O H2O	1	18.0153
+    0	5000	1000
+    3.03399 0.00217692 -1.64073e-07 -9.7042e-11 1.68201e-14 -30004.3 4.96677
+    4.19864 -0.00203643 6.5204e-06 -5.48797e-09 1.77198e-12 -30293.7 -0.849032
+	1.67212e-06	170.672
+O2 O2	1	31.9988
+    0	5000	1000
+    3.28254 0.00148309 -7.57967e-07 2.09471e-10 -2.16718e-14 -1088.46 5.45323
+    3.78246 -0.00299673 9.8473e-06 -9.6813e-09 3.24373e-12 -1063.94 3.65768
+	1.67212e-06	170.672
+N2 N2	1	28.0134
+    0	5000	1000
+    2.92664 0.00148798 -5.68476e-07 1.0097e-10 -6.75335e-15 -922.798 5.98053
+    3.29868 0.00140824 -3.96322e-06 5.64152e-09 -2.44485e-12 -1020.9 3.95037
+	1.67212e-06	170.672
+)
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/foam.inp b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/foam.inp
new file mode 100644
index 0000000000..9473b7e8fa
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/foam.inp
@@ -0,0 +1,22 @@
+species
+6
+(
+N2
+O2
+CH4
+H2
+CO2
+H2O
+)
+;
+
+reactions
+2
+(
+irreversibleArrheniusReaction
+    CH4 + 2O2^1.0 = CO2 + 2H2O^1.0
+    (7e+06 0 10063.8)
+irreversibleArrheniusReaction
+    H2 + 0.5O2^1.0 = H2O
+    (4.74342e+12 0 10063.8)
+);
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/therm.dat b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/therm.dat
new file mode 100644
index 0000000000..20792659cf
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/chemkin/therm.dat
@@ -0,0 +1,3283 @@
+THERMO ALL
+   200.000  1000.000  5000.000
+(CH2O)3            70590C   3H   6O   3     G  0200.00   4000.00  1500.00      1
+ 0.01913678E+03 0.08578044E-01-0.08882060E-05-0.03574819E-08 0.06605143E-12    2
+-0.06560876E+06-0.08432507E+03-0.04662286E+02 0.06091547E+00-0.04710536E-03    3
+ 0.01968843E-06-0.03563271E-10-0.05665404E+06 0.04525265E+03                   4
+(CH3)2SICH2        61991H   8C   3SI  1     G  0200.00   2500.00  1500.00      1
+ 0.01547852E+03 0.01065700E+00-0.01234345E-05-0.01293352E-07 0.02528715E-11    2
+-0.06693076E+04-0.05358884E+03 0.02027522E+02 0.04408673E+00-0.03370024E-03    3
+ 0.01484466E-06-0.02830898E-10 0.03931454E+05 0.01815821E+03                   4
+AL                 62987AL  1               G  0200.00   5000.00  0600.00      1
+ 0.02559589E+02-0.01063224E-02 0.07202828E-06-0.02121105E-09 0.02289429E-13    2
+ 0.03890214E+06 0.05234522E+02 0.02736825E+02-0.05912374E-02-0.04033938E-05    3
+ 0.02322343E-07-0.01705599E-10 0.03886795E+06 0.04363880E+02                   4
+AL2H6              62987AL  2H   6          G  0200.00   1500.00  0600.00      1
+ 0.02634884E+02 0.02135952E+00 0.03154151E-05-0.07684674E-07 0.02335832E-10    2
+ 0.08871346E+05 0.09827515E+02-0.06800681E+02 0.05080744E+00 0.01039747E-03    3
+-0.01119582E-05 0.08459155E-09 0.01060537E+06 0.05554526E+03                   4
+AL2ME6             62987AL  2C   6H  18     G  0200.00   1500.00  0600.00      1
+ 0.01773147E+03 0.04935747E+00 0.01196854E-04-0.01639826E-06 0.04890867E-10    2
+-0.03855560E+06-0.05053298E+03-0.07159750E+01 0.01067109E+01 0.02117605E-03    3
+-0.02193212E-05 0.01644144E-08-0.03515546E+06 0.03890763E+03                   4
+ALAS               62987AL  1AS  1          G  0200.00   1500.00  0600.00      1
+ 0.04790027E+02-0.01908226E-03-0.01983390E-05 0.02239358E-08-0.06904706E-12    2
+ 0.05259290E+06 0.03259703E+02 0.05047764E+02-0.06419947E-02-0.01432071E-04    3
+ 0.04754391E-07-0.03297621E-10 0.05254264E+06 0.01985206E+02                   4
+ALH                62987AL  1H   1          G  0200.00   5000.00  1000.00      1
+ 0.03392644E+02 0.01215399E-01-0.04676595E-05 0.08691625E-09-0.06022669E-13    2
+ 0.03006845E+06 0.02758899E+02 0.03071503E+02 0.02165549E-01-0.03275638E-04    3
+ 0.04136984E-07-0.01877121E-10 0.03021221E+06 0.04548855E+02                   4
+ALH2               62987AL  1H   2          G  0200.00   1500.00  0600.00      1
+ 0.04486543E+02 0.03128832E-01-0.01969438E-05-0.01016030E-07 0.03497468E-11    2
+ 0.01960959E+06 0.08167897E+01 0.02442137E+02 0.09915913E-01 0.02471083E-05    3
+-0.02119583E-06 0.01710234E-09 0.01997588E+06 0.01065270E+03                   4
+ALH3               62987AL  1H   3          G  0200.00   1500.00  0600.00      1
+ 0.04186838E+02 0.06159249E-01-0.03877593E-06-0.02061928E-07 0.06600276E-11    2
+ 0.07908079E+05 0.05134396E+01 0.01008323E+02 0.01640324E+00 0.01976746E-04    3
+-0.03528558E-06 0.02753378E-09 0.08484656E+05 0.01585838E+03                   4
+ALME               62987AL  1C   1H   3     G  0200.00   1500.00  0600.00      1
+ 0.04662737E+02 0.07097939E-01 0.02520013E-05-0.02114863E-07 0.06097489E-11    2
+ 0.08203228E+05 0.01769245E+02 0.02664176E+02 0.01324914E+00 0.02525848E-04    3
+-0.02394396E-06 0.01761855E-09 0.08574173E+05 0.01147449E+03                   4
+ALME2              62987AL  1C   2H   6     G  0200.00   1500.00  0600.00      1
+ 0.06481282E+02 0.01474605E+00 0.05816529E-05-0.04621347E-07 0.01396041E-10    2
+ 0.03745072E+05-0.02603326E+02 0.09494573E+01 0.03206354E+00 0.06134021E-04    3
+-0.06500042E-06 0.04911485E-09 0.04761408E+05 0.02419465E+03                   4
+ALME3              62987AL  1C   3H   9     G  0200.00   1500.00  0600.00      1
+ 0.06654948E+02 0.02455144E+00 0.01176575E-04-0.07815023E-07 0.02255622E-10    2
+-0.01340952E+06-0.03454481E+02-0.07027567E+01 0.04682764E+00 0.01149903E-03    3
+-0.09160441E-06 0.06687294E-09-0.01203799E+06 0.03232771E+03                   4
+AR                120186AR  1               G  0200.00   5000.00  1000.00      1
+ 0.02500000E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+-0.07453750E+04 0.04366001E+02 0.02500000E+02 0.00000000E+00 0.00000000E+00    3
+ 0.00000000E+00 0.00000000E+00-0.07453750E+04 0.04366001E+02                   4
+AR+               121286AR  1E  -1          G  0200.00   5000.00  1000.00      1
+ 0.02864864E+02-0.01203573E-02-0.01065199E-06 0.09074839E-10-0.09623876E-14    2
+ 0.01827230E+07 0.03543585E+02 0.02301341E+02 0.08035529E-02-0.01758806E-05    3
+-0.01781093E-08-0.08937268E-13 0.01829281E+07 0.06659358E+02                   4
+AS                 62987AS  1               G  0200.00   1500.00  0600.00      1
+ 0.02617011E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+ 0.03720455E+06 0.06995524E+02 0.02617011E+02 0.00000000E+00 0.00000000E+00    3
+ 0.00000000E+00 0.00000000E+00 0.03720455E+06 0.06995524E+02                   4
+AS2                62987AS  2               G  0200.00   1500.00  0600.00      1
+ 0.04394201E+02 0.05389968E-02-0.02379401E-05-0.06541924E-09 0.05184186E-12    2
+ 0.02235094E+06 0.04897919E+02 0.03682892E+02 0.03121811E-01-0.01074052E-04    3
+-0.05629472E-07 0.05178811E-10 0.02247356E+06 0.08283423E+02                   4
+AS3                62987AS  3               G  0200.00   1500.00  0600.00      1
+ 0.07404036E+02 0.07818426E-02-0.03918297E-05-0.05203629E-09 0.06291907E-12    2
+ 0.03063825E+06-0.03417324E+02 0.06403142E+02 0.04477099E-01-0.01866642E-04    3
+-0.07394750E-07 0.07012753E-10 0.03080965E+06 0.01337136E+02                   4
+AS4                62987AS  4               G  0200.00   1500.00  0600.00      1
+ 0.09695766E+02 0.01306258E-01-0.05519564E-05-0.02150874E-08 0.01457935E-11    2
+ 0.01571732E+06-0.01618870E+03 0.07853761E+02 0.07916509E-01-0.02329820E-04    3
+-0.01526312E-06 0.01377435E-09 0.01603629E+06-0.07409755E+02                   4
+ASALME             62987AS  1AL  1C   1H   3G  0200.00   1500.00  0600.00      1
+ 0.07127107E+02 0.07357864E-01 0.02300796E-06-0.02226399E-07 0.06927227E-11    2
+ 0.03273438E+06-0.01847179E+02 0.04053423E+02 0.01726125E+00 0.01833498E-04    3
+-0.03386953E-06 0.02626981E-09 0.03329309E+06 0.01299665E+03                   4
+ASALME2            62987AS  1AL  1C   2H   6G  0200.00   1500.00  0600.00      1
+ 0.09909938E+02 0.01463850E+00 0.04118731E-05-0.04444658E-07 0.01329501E-10    2
+ 0.02815111E+06-0.01523531E+03 0.04808530E+02 0.03067687E+00 0.05048001E-04    3
+-0.05908099E-06 0.04462290E-09 0.02908817E+06 0.09471621E+02                   4
+ASGAET             62987AS  1GA  1C   2H   5G  0200.00   1500.00  0600.00      1
+ 0.09081073E+02 0.01674632E+00 0.01283130E-05-0.05590436E-07 0.01781315E-10    2
+ 0.03807443E+06-0.09142782E+02 0.06364698E+01 0.04382467E+00 0.06144686E-04    3
+-0.09491641E-06 0.07374198E-09 0.03960893E+06 0.03164673E+03                   4
+ASGAET2            62987AS  1GA  1C   4H  10G  0200.00   1500.00  0600.00      1
+ 0.01032429E+03 0.03073571E+00 0.01086335E-04-0.09971949E-07 0.02945979E-10    2
+ 0.03039490E+06-0.01316402E+03-0.03539248E+01 0.06369772E+00 0.01359742E-03    3
+-0.01286142E-05 0.09572181E-09 0.03236903E+06 0.03865086E+03                   4
+ASGAME             62987AS  1GA  1C   1H   3G  0200.00   1500.00  0600.00      1
+ 0.07322183E+02 0.06995479E-01 0.01069351E-05-0.01995283E-07 0.06040446E-11    2
+ 0.03949449E+06-0.07416680E+01 0.04877266E+02 0.01482559E+00 0.01652124E-04    3
+-0.02712058E-06 0.02080196E-09 0.03994071E+06 0.01107670E+03                   4
+ASGAME2            62987AS  1GA  1C   2H   6G  0200.00   1500.00  0600.00      1
+ 0.09352436E+02 0.01504820E+00 0.05157975E-05-0.04553518E-07 0.01348763E-10    2
+ 0.03735856E+06-0.01218114E+03 0.04382076E+02 0.03056345E+00 0.05477067E-04    3
+-0.05834108E-06 0.04373509E-09 0.03827434E+06 0.01191111E+03                   4
+ASGAMEH            62987AS  1GA  1C   1H   4G  0200.00   1500.00  0600.00      1
+ 0.07842794E+02 0.09682097E-01 0.01060306E-05-0.02991402E-07 0.09382673E-11    2
+ 0.04435297E+06-0.05093455E+02 0.03585119E+02 0.02336317E+00 0.02873356E-04    3
+-0.04737895E-06 0.03674461E-09 0.04512703E+06 0.01547160E+03                   4
+ASH                62987AS  1H   1          G  0200.00   1500.00  0600.00      1
+ 0.03219848E+02 0.01001250E-01-0.04874997E-08-0.01107653E-08-0.09254321E-13    2
+ 0.03008176E+06 0.06647311E+02 0.03865843E+02-0.01157571E-01-0.03494372E-05    3
+ 0.07079686E-07-0.06014028E-10 0.02996829E+06 0.03549869E+02                   4
+ASH2               62987AS  1H   2          G  0200.00   1500.00  0600.00      1
+ 0.03428307E+02 0.03181140E-01 0.01460484E-05-0.07937145E-08 0.01694414E-11    2
+ 0.02010282E+06 0.02904703E+02 0.03778945E+02 0.01759233E-01 0.08070807E-05    3
+ 0.02358763E-07-0.03043521E-10 0.02004862E+06 0.01272974E+02                   4
+ASH3               62987AS  1H   3          G  0200.00   1500.00  0600.00      1
+ 0.04172022E+02 0.04371323E-01 0.02177574E-05-0.01183264E-07 0.04536374E-11    2
+ 0.06882916E+05 0.02803477E+02 0.09446356E+01 0.01508469E+00 0.01201696E-04    3
+-0.03397465E-06 0.02767656E-09 0.07459168E+05 0.01832268E+03                   4
+ASME               62987AS  1C   1H   3     G  0200.00   1500.00  0600.00      1
+ 0.04657260E+02 0.06976298E-01 0.02147557E-05-0.02101159E-07 0.06082150E-11    2
+ 0.02806423E+06 0.03409835E+02 0.02625270E+02 0.01325242E+00 0.02441628E-04    3
+-0.02419567E-06 0.01786944E-09 0.02844080E+06 0.01327336E+03                   4
+ASME2              62987AS  1C   2H   6     G  0200.00   1500.00  0600.00      1
+ 0.05981395E+02 0.01521284E+00 0.06993355E-05-0.04721619E-07 0.01369912E-10    2
+ 0.01467985E+06 0.01192741E+02 0.01390400E+02 0.02923331E+00 0.06598871E-04    3
+-0.05620560E-06 0.04130368E-09 0.01553302E+06 0.02349981E+03                   4
+ASME3              62987AS  1C   3H   9     G  0200.00   1500.00  0600.00      1
+ 0.06347764E+02 0.02466454E+00 0.01154629E-04-0.07877436E-07 0.02202225E-10    2
+-0.01617323E+05-0.06316786E+01 0.02667388E+01 0.04253171E+00 0.01165106E-03    3
+-0.07914706E-06 0.05603127E-09-0.04685540E+04 0.02904591E+03                   4
+BE                 81392BE  1               G  0200.00   5000.00  1000.00      1
+ 0.02380618E+02 0.02339856E-02-0.01453949E-05 0.03111727E-09-0.01072959E-13    2
+ 0.03868083E+06 0.02787792E+02 0.02403493E+02 0.06166087E-02-0.01321925E-04    3
+ 0.01144806E-07-0.03437304E-11 0.03864894E+06 0.02549853E+02                   4
+BE(S)              81392BE  1               S  0200.00   3000.00  1000.00      1
+ 0.01898768E+02 0.01629382E-01-0.03547406E-05 0.01247349E-08-0.01578507E-12    2
+-0.06527011E+04-0.01020412E+03-0.09092963E+01 0.01585668E+00-0.02624182E-03    3
+ 0.02044924E-06-0.05872448E-10-0.02390556E+04 0.02598871E+02                   4
+BE2SIO4(S)         81392BE  2O   4SI  1     S  0200.00   3000.00  1000.00      1
+ 0.01695617E+03 0.06266472E-01-0.02841325E-04 0.06379149E-08-0.04780890E-12    2
+-0.02614324E+07-0.09398438E+03-0.06380159E+02 0.09333352E+00-0.01415477E-02    3
+ 0.01101948E-05-0.03462902E-09-0.02558671E+07 0.02162977E+03                   4
+BE3B2O6(S)         81392B   2BE  3O   6     S  0200.00   3000.00  1000.00      1
+ 0.02640267E+03 0.01142674E+00-0.03773479E-04 0.04332047E-08 0.02356543E-12    2
+-0.03849576E+07-0.01487137E+04-0.05230657E+02 0.01105769E+01-0.01614054E-02    3
+ 0.01447797E-05-0.05420786E-09-0.03755957E+07 0.01490974E+03                   4
+BE3N2(A)           81392BE  3N   2          S  0200.00   3000.00  1000.00      1
+ 0.01097008E+03 0.06416846E-01-0.02938928E-04 0.04564651E-08-0.05509703E-13    2
+-0.07519767E+06-0.06231286E+03-0.08167547E+02 0.08515091E+00-0.01355569E-02    3
+ 0.01060406E-05-0.03256815E-09-0.07110460E+06 0.03040606E+03                   4
+BE3N2(L)           81392BE  3N   2          L  0200.00   4000.00  1000.00      1
+ 0.01610468E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+-0.06338252E+06-0.08701469E+03 0.01610468E+03 0.00000000E+00 0.00000000E+00    3
+ 0.00000000E+00 0.00000000E+00-0.06338252E+06-0.08701468E+03                   4
+BEAL2O4(S)         81392AL  2BE  1O   4     S  0200.00   2400.00  1000.00      1
+ 0.01118219E+03 0.01677777E+00-0.06692989E-04-0.01497360E-07 0.01203700E-10    2
+-0.02810337E+07-0.06116527E+03-0.07257604E+02 0.01074554E+01-0.01713422E-02    3
+ 0.01295274E-05-0.03740965E-09-0.02780832E+07 0.02383770E+03                   4
+BEB2O4             81392B   2BE  1O   4     G  0200.00   5000.00  1000.00      1
+ 0.01266018E+03 0.06883210E-01-0.02963169E-04 0.05694789E-08-0.04050458E-12    2
+-0.01672990E+07-0.03636876E+03 0.04012008E+02 0.03052847E+00-0.02571938E-03    3
+ 0.09738810E-07-0.01450712E-10-0.01648983E+07 0.08399628E+02                   4
+BEBO2              81392B   1BE  1O   2     G  0200.00   5000.00  1000.00      1
+ 0.06831273E+02 0.03424464E-01-0.01471236E-04 0.02825118E-08-0.02008790E-12    2
+-0.06047559E+06-0.08730609E+02 0.02426203E+02 0.01572415E+00-0.01309160E-03    3
+ 0.04244447E-07-0.02562806E-11-0.05929016E+06 0.01394744E+03                   4
+BEBR               81392BE  1BR  1          G  0200.00   5000.00  1000.00      1
+ 0.04166357E+02 0.04424462E-02-0.01713095E-05 0.03185381E-09-0.01964221E-13    2
+ 0.01313080E+06 0.03473875E+02 0.03178756E+02 0.03144181E-01-0.01989189E-04    3
+-0.04871910E-08 0.06208255E-11 0.01337870E+06 0.08520506E+02                   4
+BEBR2              81392BE  1BR  2          G  0200.00   5000.00  1000.00      1
+ 0.06814040E+02 0.07848450E-02-0.03497501E-05 0.06885841E-09-0.04984129E-13    2
+-0.02974764E+06-0.06362110E+02 0.05216331E+02 0.05128972E-01-0.03678726E-04    3
+ 0.08525872E-09 0.05611721E-11-0.02932967E+06 0.01847829E+02                   4
+BEBR2(S)           81392BE  1BR  2          S  0200.00   1500.00  1000.00      1
+ 0.07680161E+02 0.03193456E-01-0.02439097E-05-0.09487536E-08 0.03902210E-11    2
+-0.04528092E+06-0.03282152E+03 0.05659917E+02 0.08805599E-01-0.02790316E-04    3
+-0.04611400E-07 0.03007373E-10-0.04482571E+06-0.02263852E+03                   4
+BECL               81392BE  1CL  1          G  0200.00   5000.00  1000.00      1
+ 0.04072243E+02 0.05328307E-02-0.02146892E-05 0.04097687E-09-0.02774848E-13    2
+ 0.05990792E+05 0.02639872E+02 0.03006275E+02 0.03385550E-01-0.02274674E-04    3
+-0.01333438E-08 0.04447782E-11 0.06271131E+05 0.08126810E+02                   4
+BECL2              81392BE  1CL  2          G  0200.00   5000.00  1000.00      1
+ 0.06656109E+02 0.09583935E-02-0.04248637E-05 0.08333911E-09-0.06016211E-13    2
+-0.04547842E+06-0.08159565E+02 0.04835084E+02 0.05899051E-01-0.04307799E-04    3
+ 0.03113267E-08 0.05292957E-11-0.04499748E+06 0.01210616E+02                   4
+BECL2(A)           81392BE  1CL  2          S  0200.00   1500.00  1000.00      1
+ 0.08380054E+02 0.02572312E-01-0.07554892E-05-0.02368242E-08 0.01042547E-11    2
+-0.06177281E+06-0.03886076E+03 0.08074927E+01 0.03830225E+00-0.06255340E-03    3
+ 0.04645940E-06-0.01295143E-09-0.06052883E+06-0.03683825E+02                   4
+BECL2(B)           81392BE  1CL  2          S  0200.00   1500.00  1000.00      1
+ 0.07791771E+02 0.02945389E-01-0.04237093E-05-0.05339604E-08 0.01505044E-11    2
+-0.06231958E+06-0.03656698E+03 0.03004424E+02 0.02353211E+00-0.03553037E-03    3
+ 0.02706855E-06-0.08144728E-10-0.06136495E+06-0.01365758E+03                   4
+BECLF              81392BE  1CL  1F   1     G  0200.00   5000.00  1000.00      1
+ 0.06393787E+02 0.01234948E-01-0.05412476E-05 0.01053150E-08-0.07557553E-13    2
+-0.07104831E+06-0.07478512E+02 0.04405415E+02 0.06642228E-01-0.05154354E-04    3
+ 0.01063175E-07 0.02287810E-11-0.07051262E+06 0.02777586E+02                   4
+BEF                81392BE  1F   1          G  0200.00   5000.00  1000.00      1
+ 0.03741370E+02 0.08524818E-02-0.03436428E-05 0.06466099E-09-0.04475089E-13    2
+-0.02167667E+06 0.02968223E+02 0.02905108E+02 0.02952099E-01-0.02747617E-04    3
+ 0.01918800E-07-0.07179964E-11-0.02140972E+06 0.07407617E+02                   4
+BEF2               81392BE  1F   2          G  0200.00   5000.00  1000.00      1
+ 0.06008875E+02 0.01636431E-01-0.07094651E-05 0.01370220E-08-0.09780462E-13    2
+-0.09777056E+06-0.07723693E+02 0.03801759E+02 0.07737988E-01-0.06427724E-04    3
+ 0.02097328E-07-0.01462695E-11-0.09717092E+06 0.03660784E+02                   4
+BEF2(L)            81392BE  1F   2          L  0200.00   2000.00  1000.00      1
+ 0.05976585E+02 0.04777009E-01-0.05064131E-05 0.05012404E-09 0.08570416E-13    2
+-0.01251277E+07-0.02873833E+03-0.05587355E+01 0.03423905E+00-0.05210078E-03    3
+ 0.04099400E-06-0.01226767E-09-0.01239060E+07 0.02162308E+02                   4
+BEH                81392BE  1H   1          G  0200.00   5000.00  1000.00      1
+ 0.03103757E+02 0.01443026E-01-0.05486383E-05 0.09992518E-09-0.06823073E-13    2
+ 0.03762032E+06 0.03113887E+02 0.03220220E+02 0.01660638E-01-0.03759811E-04    3
+ 0.05403578E-07-0.02433378E-10 0.03762484E+06 0.02536116E+02                   4
+BEH+               81392BE  1H   1E  -1     G  0200.00   5000.00  1000.00      1
+ 0.02935026E+02 0.01642881E-01-0.06606950E-05 0.01253854E-08-0.08322438E-13    2
+ 0.01381605E+07 0.03342443E+02 0.03203174E+02 0.01918095E-01-0.04743515E-04    3
+ 0.06392785E-07-0.02736265E-10 0.01380944E+07 0.01849186E+02                   4
+BEH2               81392BE  1H   2          G  0200.00   5000.00  1000.00      1
+ 0.03274395E+02 0.04312822E-01-0.01774785E-04 0.03298131E-08-0.02286391E-12    2
+ 0.01367913E+06 0.03758700E+01 0.01761472E+02 0.08827701E-01-0.01241923E-03    3
+ 0.01412574E-06-0.06176309E-10 0.01426447E+06 0.08573833E+02                   4
+BEH2O2             81392BE  1H   2O   2     G  0200.00   5000.00  1000.00      1
+ 0.07694718E+02 0.04893975E-01-0.01780895E-04 0.03055611E-08-0.02009121E-12    2
+-0.08403520E+06-0.01751820E+03 0.03118833E+02 0.01997183E+00-0.01673101E-03    3
+ 0.03275766E-07 0.01457848E-10-0.08305301E+06 0.05128545E+02                   4
+BEH2O2(A)          81392BE  1H   2O   2     S  0200.00   1000.00  1000.00      1
+ 0.01357669E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+-0.01138925E+07-0.07369071E+03-0.07121292E+02 0.08378375E+00-0.01435144E-02    3
+ 0.01164084E-05-0.03597983E-09-0.01091544E+07 0.02745148E+03                   4
+BEH2O2(B)          81392BE  1H   2O   2     S  0200.00   1000.00  1000.00      1
+ 0.01357669E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+-0.01142447E+07-0.07409333E+03-0.07121292E+02 0.08378375E+00-0.01435144E-02    3
+ 0.01164084E-05-0.03597983E-09-0.01095066E+07 0.02704887E+03                   4
+BEI                81392BE  1I   1          G  0200.00   5000.00  1000.00      1
+ 0.04226574E+02 0.03948427E-02-0.01549696E-05 0.03023851E-09-0.01932301E-13    2
+ 0.01912832E+06 0.04229493E+02 0.03358791E+02 0.02864276E-01-0.01889889E-04    3
+-0.04370942E-08 0.05986692E-11 0.01933641E+06 0.08627578E+02                   4
+BEI2               81392BE  1I   2          G  0200.00   5000.00  1000.00      1
+ 0.06974217E+02 0.06094573E-02-0.02739783E-05 0.05428767E-09-0.03948833E-13    2
+-0.09890086E+05-0.05063732E+02 0.05564008E+02 0.04472664E-01-0.03090745E-04    3
+-0.02609722E-08 0.06750777E-11-0.09529549E+05 0.02158152E+02                   4
+BEI2(S)            81392BE  1I   2          S  0200.00   1500.00  1000.00      1
+ 0.08868316E+02 0.02591978E-01-0.07796846E-05-0.02236952E-08 0.01016032E-11    2
+-0.02556556E+06-0.03709859E+03 0.01301872E+02 0.03830115E+00-0.06255080E-03    3
+ 0.04645675E-06-0.01295046E-09-0.02432303E+06-0.01952190E+02                   4
+BEN                81392BE  1N   1          G  0200.00   5000.00  1000.00      1
+ 0.03799137E+02 0.08135072E-02-0.03271826E-05 0.06267597E-09-0.04443547E-13    2
+ 0.05006582E+06 0.03013958E+02 0.02880282E+02 0.03157848E-01-0.02749300E-04    3
+ 0.01549304E-07-0.04944407E-11 0.05034622E+06 0.07854857E+02                   4
+BEO(A)             81392BE  1O   1          S  0200.00   3500.00  1000.00      1
+ 0.04606101E+02 0.01465013E-01-0.09316989E-06-0.08839902E-09 0.01840163E-12    2
+-0.07492927E+06-0.02579358E+03-0.01187545E+01 0.01231168E+00-0.02298405E-04    3
+-0.09318502E-07 0.05331928E-10-0.07364786E+06-0.01151163E+02                   4
+BEO(B)             81392BE  1O   1          S  0200.00   3500.00  1000.00      1
+ 0.04606101E+02 0.01465013E-01-0.09316989E-06-0.08839902E-09 0.01840163E-12    2
+-0.07412403E+06-0.02545418E+03-0.01187545E+01 0.01231168E+00-0.02298405E-04    3
+-0.09318502E-07 0.05331928E-10-0.07284262E+06-0.08117651E+01                   4
+BEOH               81392BE  1H   1O   1     G  0200.00   5000.00  1000.00      1
+ 0.04580703E+02 0.02444079E-01-0.08794693E-05 0.01484750E-08-0.09530468E-13    2
+-0.01534682E+06-0.01819725E+02 0.02577868E+02 0.08977628E-01-0.07867956E-04    3
+ 0.02536139E-07 0.06057864E-12-0.01489220E+06 0.08162645E+02                   4
+BES(S)             81392BE  1S   1          S  0200.00   3000.00  1000.00      1
+ 0.04944107E+02 0.03098929E-01-0.01308985E-04 0.02564670E-08-0.01377673E-12    2
+-0.03004408E+06-0.02521191E+03-0.03045166E+02 0.03934537E+00-0.06572406E-03    3
+ 0.05230436E-06-0.01590377E-09-0.02854032E+06 0.01256033E+03                   4
+BESO4(A)           81392BE  1O   4S   1     S  0200.00   2200.00  1000.00      1
+ 0.02081235E+01 0.03035540E+00-0.07769396E-04-0.02942517E-07 0.01112249E-10    2
+-0.01455278E+07 0.02609183E+01-0.08960041E+02 0.01179726E+01-0.02438390E-02    3
+ 0.02430177E-05-0.08722741E-09-0.01453005E+07 0.03410812E+03                   4
+BESO4(B)           81392BE  1O   4S   1     S  0200.00   2200.00  1000.00      1
+ 0.02081235E+01 0.03035540E+00-0.07769396E-04-0.02942517E-07 0.01112249E-10    2
+-0.01453939E+07 0.04157230E+01-0.08960041E+02 0.01179726E+01-0.02438390E-02    3
+ 0.02430177E-05-0.08722741E-09-0.01451667E+07 0.03426292E+03                   4
+BESO4(GAM)         81392BE  1O   4S   1     S  0200.00   2200.00  1000.00      1
+ 0.02081235E+01 0.03035540E+00-0.07769396E-04-0.02942517E-07 0.01112249E-10    2
+-0.01430422E+07 0.03005051E+02-0.08960041E+02 0.01179726E+01-0.02438390E-02    3
+ 0.02430177E-05-0.08722741E-09-0.01428148E+07 0.03685225E+03                   4
+C                 121086C   1               G  0200.00   5000.00  1000.00      1
+ 0.02602087E+02-0.01787081E-02 0.09087041E-06-0.01149933E-09 0.03310844E-14    2
+ 0.08542154E+06 0.04195177E+02 0.02498585E+02 0.08085777E-03-0.02697697E-05    3
+ 0.03040729E-08-0.01106652E-11 0.08545878E+06 0.04753459E+02                   4
+C(S)              121286C   1               S  0200.00   5000.00  1000.00      1
+ 0.01490166E+02 0.01662126E-01-0.06687204E-05 0.01290880E-08-0.09205334E-13    2
+-0.07074019E+04-0.08717785E+02-0.06705661E+01 0.07181500E-01-0.05632921E-04    3
+ 0.02142299E-07-0.04168562E-11-0.07339498E+03 0.02601596E+02                   4
+C+                120186C   1E  -1          G  0200.00   5000.00  1000.00      1
+ 0.02511827E+02-0.01735978E-03 0.09504268E-07-0.02218852E-10 0.01862189E-14    2
+ 0.02166772E+07 0.04286130E+02 0.02595384E+02-0.04068665E-02 0.06892367E-05    3
+-0.05266488E-08 0.01508338E-11 0.02166628E+07 0.03895730E+02                   4
+C-                121686C   1E   1          G  0200.00   5000.00  1000.00      1
+ 0.02990221E+02-0.09184596E-02 0.05055560E-05-0.07703410E-09 0.03163271E-13    2
+ 0.06983931E+06 0.01259453E+02 0.02783903E+02-0.01774288E-01 0.03696761E-04    3
+-0.03066693E-07 0.08637622E-11 0.06998511E+06 0.02726281E+02                   4
+C2                121286C   2               G  0200.00   5000.00  1000.00      1
+ 0.04135979E+02 0.06531618E-03 0.01837099E-05-0.05295085E-09 0.04712137E-13    2
+ 0.09967272E+06 0.07472923E+01 0.06996045E+02-0.07400602E-01 0.03234704E-04    3
+ 0.04802535E-07-0.03295918E-10 0.09897487E+06-0.01386227E+03                   4
+C2-               121286C   2E   1          G  0200.00   5000.00  1000.00      1
+ 0.03796891E+02 0.02530050E-02 0.09709118E-06-0.01614804E-09-0.03212893E-15    2
+ 0.05207981E+06 0.01658147E+02 0.03468012E+02-0.02352875E-02 0.01243912E-04    3
+ 0.04705961E-08-0.08164274E-11 0.05231215E+06 0.03886699E+02                   4
+C2CL3              40992C   2CL  3          G  0200.00   4000.00  1500.00      1
+ 0.01183853E+03 0.09460851E-02-0.02920870E-05 0.03847024E-09-0.01539560E-13    2
+ 0.02313143E+06-0.02891445E+03 0.04808647E+02 0.02212948E+00-0.02548847E-03    3
+ 0.01372083E-06-0.02812663E-10 0.02514353E+06 0.07232629E+02                   4
+C2CL5              40992C   2CL  5          G  0200.00   4000.00  1500.00      1
+ 0.01775107E+03 0.09220800E-02-0.04852694E-05 0.01190373E-08-0.01100446E-12    2
+-0.02402768E+05-0.05545676E+03 0.06414346E+02 0.03867367E+00-0.04857935E-03    3
+ 0.02734513E-06-0.05732891E-10 0.04697039E+04 0.01542036E+02                   4
+C2CL6              40992C   2CL  6          G  0200.00   4000.00  1500.00      1
+ 0.02021422E+03 0.01757648E-01-0.05881040E-05 0.08029739E-09-0.03958238E-13    2
+-0.02340156E+06-0.07096011E+03 0.07492710E+02 0.04318468E+00-0.05275048E-03    3
+ 0.02947143E-06-0.06176554E-10-0.02006555E+06-0.06635582E+02                   4
+C2F6               82489C   2F   6          G  0200.00   5000.00  1000.00      1
+ 0.01602057E+03 0.06273007E-01-0.02797778E-04 0.05517547E-08-0.04004651E-12    2
+-0.01675654E+07-0.05519459E+03 0.03577448E+02 0.03913670E+00-0.02714862E-03    3
+ 0.04348459E-08 0.04007135E-10-0.01642174E+07 0.09098384E+02                   4
+C2H                81193C   2H   1          G  0200.00   4000.00  1000.00      1
+ 0.03986367E+02 0.03143123E-01-0.01267243E-04 0.02924363E-08-0.02716320E-12    2
+ 0.06655884E+06 0.01191063E+02 0.02737704E+02 0.08048446E-01-0.09244310E-04    3
+ 0.06525259E-07-0.01939580E-10 0.06683813E+06 0.07300220E+02                   4
+C2H2              121386C   2H   2          G  0200.00   5000.00  1000.00      1
+ 0.04436770E+02 0.05376039E-01-0.01912817E-04 0.03286379E-08-0.02156710E-12    2
+ 0.02566766E+06-0.02800338E+02 0.02013562E+02 0.01519045E+00-0.01616319E-03    3
+ 0.09078992E-07-0.01912746E-10 0.02612444E+06 0.08805378E+02                   4
+C2H3               12787C   2H   3          G  0200.00   5000.00  1000.00      1
+ 0.05933468E+02 0.04017746E-01-0.03966740E-05-0.01441267E-08 0.02378644E-12    2
+ 0.03185435E+06-0.08530313E+02 0.02459276E+02 0.07371476E-01 0.02109873E-04    3
+-0.01321642E-07-0.01184784E-10 0.03335225E+06 0.01155620E+03                   4
+C2H4              121286C   2H   4          G  0200.00   5000.00  1000.00      1
+ 0.03528419E+02 0.01148518E+00-0.04418385E-04 0.07844601E-08-0.05266848E-12    2
+ 0.04428289E+05 0.02230389E+02-0.08614880E+01 0.02796163E+00-0.03388677E-03    3
+ 0.02785152E-06-0.09737879E-10 0.05573046E+05 0.02421149E+03                   4
+C2H5               12387C   2H   5          G  0200.00   5000.00  1000.00      1
+ 0.07190480E+02 0.06484077E-01-0.06428065E-05-0.02347879E-08 0.03880877E-12    2
+ 0.01067455E+06-0.01478089E+03 0.02690702E+02 0.08719133E-01 0.04419839E-04    3
+ 0.09338703E-08-0.03927773E-10 0.01287040E+06 0.01213820E+03                   4
+C2H6              121686C   2H   6          G  0200.00   4000.00  1000.00      1
+ 0.04825938E+02 0.01384043E+00-0.04557259E-04 0.06724967E-08-0.03598161E-12    2
+-0.01271779E+06-0.05239507E+02 0.01462539E+02 0.01549467E+00 0.05780507E-04    3
+-0.01257832E-06 0.04586267E-10-0.01123918E+06 0.01443229E+03                   4
+C2HCL             112989C   2H   1CL  1     G  0200.00   5000.00  1000.00      1
+ 0.06295372E+02 0.03883113E-01-0.01506049E-04 0.02700003E-08-0.01830213E-12    2
+ 0.02357279E+06-0.08137063E+02 0.03618443E+02 0.01331979E+00-0.01321822E-03    3
+ 0.06092024E-07-0.08879026E-11 0.02415385E+06 0.05050645E+02                   4
+C2HCL5             40992H   1C   2CL  5     G  0200.00   4000.00  1500.00      1
+ 0.01897802E+03 0.02244275E-01-0.05864788E-05 0.02733950E-09 0.04934135E-13    2
+-0.02494887E+06-0.06578714E+03 0.05356044E+02 0.04176390E+00-0.04710787E-03    3
+ 0.02550758E-06-0.05324478E-10-0.02079330E+06 0.04970258E+02                   4
+C2N               121286C   2N   1          G  0200.00   5000.00  1000.00      1
+ 0.06151561E+02 0.01511650E-01-0.06629362E-05 0.01286148E-08-0.09160830E-13    2
+ 0.06484318E+06-0.08177850E+02 0.03498544E+02 0.08554433E-01-0.06288697E-04    3
+ 0.08638478E-08 0.04915996E-11 0.06556611E+06 0.05548374E+02                   4
+C2N2              121286C   2N   2          G  0200.00   5000.00  1000.00      1
+ 0.06548003E+02 0.03984707E-01-0.01634216E-04 0.03038597E-08-0.02111069E-12    2
+ 0.03490716E+06-0.09735790E+02 0.04265459E+02 0.01192257E+00-0.01342014E-03    3
+ 0.09192297E-07-0.02778942E-10 0.03547888E+06 0.01713212E+02                   4
+C2O               121286C   2O   1          G  0200.00   5000.00  1000.00      1
+ 0.04849809E+02 0.02947585E-01-0.01090729E-04 0.01792562E-08-0.01115758E-12    2
+ 0.03282055E+06-0.06453226E+01 0.03368851E+02 0.08241803E-01-0.08765145E-04    3
+ 0.05569262E-07-0.01540009E-10 0.03317081E+06 0.06713314E+02                   4
+C3                121286C   3               G  0200.00   5000.00  1000.00      1
+ 0.03803710E+02 0.02253567E-01-0.07704535E-05 0.01316294E-08-0.08694264E-13    2
+ 0.09736135E+06 0.06128063E+02 0.04345528E+02 0.01264466E-01-0.04652557E-04    3
+ 0.08695856E-07-0.04243536E-10 0.09731403E+06 0.03519437E+02                   4
+C3H2              102193H   2C   3          G  0150.00   4000.00  1000.00      1
+ 0.07670981E+02 0.02748749E-01-0.04370943E-05-0.06455599E-09 0.01663887E-12    2
+ 0.06259722E+06-0.01236890E+03 0.03166714E+02 0.02482572E+00-0.04591637E-03    3
+ 0.04268019E-06-0.01482152E-09 0.06350421E+06 0.08869446E+02                   4
+C3H2(S)           101993H   2C   3          G  0200.00   4000.00  1400.00      1
+ 0.08351312E+02 0.02672278E-01-0.02129404E-05-0.01478218E-08 0.02583689E-12    2
+ 0.06800690E+06-0.01950884E+03 0.04749475E+02 0.08520229E-01-0.01160268E-04    3
+-0.02494954E-07 0.09921004E-11 0.06939979E+06 0.05437792E+01                   4
+C3H4              101993H   4C   3          G  0200.00   4000.00  1400.00      1
+ 0.09776256E+02 0.05302138E-01-0.03701118E-05-0.03026386E-08 0.05089581E-12    2
+ 0.01954972E+06-0.03077061E+03 0.02539831E+02 0.01633437E+00-0.01764950E-04    3
+-0.04647365E-07 0.01729131E-10 0.02251243E+06 0.09935702E+02                   4
+C3H4C             101993H   4C   3          G  0200.00   4000.00  1400.00      1
+ 0.09708652E+02 0.05344939E-01-0.03953553E-05-0.03111764E-08 0.05369406E-12    2
+ 0.02967722E+06-0.03073273E+03 0.01056162E+02 0.01905236E+00-0.02317048E-04    3
+-0.05933690E-07 0.02307128E-10 0.03309110E+06 0.01761927E+03                   4
+C3H4P             101993H   4C   3          G  0200.00   4000.00  1400.00      1
+ 0.09768102E+02 0.05219151E-01-0.03753140E-05-0.02992191E-08 0.05107878E-12    2
+ 0.01860277E+06-0.03020678E+03 0.03029730E+02 0.01498961E+00-0.01398500E-04    3
+-0.03969619E-07 0.01388217E-10 0.02148408E+06 0.08004594E+02                   4
+C3H6              120186C   3H   6          G  0200.00   5000.00  1000.00      1
+ 0.06732257E+02 0.01490834E+00-0.04949899E-04 0.07212022E-08-0.03766204E-12    2
+-0.09235703E+04-0.01331335E+03 0.01493307E+02 0.02092518E+00 0.04486794E-04    3
+-0.01668912E-06 0.07158146E-10 0.01074826E+05 0.01614534E+03                   4
+C3H8              120186C   3H   8          G  0200.00   5000.00  1000.00      1
+ 0.07525217E+02 0.01889034E+00-0.06283924E-04 0.09179373E-08-0.04812410E-12    2
+-0.01646455E+06-0.01784390E+03 0.08969208E+01 0.02668986E+00 0.05431425E-04    3
+-0.02126001E-06 0.09243330E-10-0.01395492E+06 0.01935533E+03                   4
+C3O2              121286C   3O   2          G  0200.00   5000.00  1000.00      1
+ 0.08098897E+02 0.05560040E-01-0.02312265E-04 0.04340709E-08-0.03036387E-12    2
+-0.01421435E+06-0.01521974E+03 0.04018127E+02 0.01836661E+00-0.01907148E-03    3
+ 0.01185587E-06-0.03418748E-10-0.01312824E+06 0.05582084E+02                   4
+C4                121286C   4               G  0200.00   5000.00  1000.00      1
+ 0.06500180E+02 0.04228632E-01-0.01790718E-04 0.03404813E-08-0.02403978E-12    2
+ 0.01143401E+07-0.01148889E+03 0.02343028E+02 0.01642981E+00-0.01527986E-03    3
+ 0.07343826E-07-0.01582274E-10 0.01154538E+07 0.09826204E+02                   4
+C4H               121686C   4H   1          G  0200.00   5000.00  1000.00      1
+ 0.06242882E+02 0.06193683E-01-0.02085932E-04 0.03082203E-08-0.01636483E-12    2
+ 0.07568019E+06-0.07210806E+02 0.05023247E+02 0.07092375E-01-0.06073762E-07    3
+-0.02275752E-07 0.08086994E-11 0.07623813E+06-0.06942594E+00                   4
+C4H10              62090C   4H  10          G  0200.00   4000.00  1500.00      1
+ 0.01998785E+03 0.01037281E+00-0.09610818E-05-0.04623018E-08 0.08202828E-12    2
+-0.02625571E+06-0.08837907E+03-0.02256618E+02 0.05881732E+00-0.04525783E-03    3
+ 0.02037115E-06-0.04079458E-10-0.01760233E+06 0.03329595E+03                   4
+C4H2              121686C   4H   2          G  0200.00   5000.00  1000.00      1
+ 0.09031407E+02 0.06047253E-01-0.01948789E-04 0.02754863E-08-0.01385608E-12    2
+ 0.05294736E+06-0.02385068E+03 0.04005192E+02 0.01981000E+00-0.09865877E-04    3
+-0.06635158E-07 0.06077413E-10 0.05424065E+06 0.01845737E+02                   4
+C4H6              120186C   4H   6          G  0200.00   5000.00  1000.00      1
+ 0.08046583E+02 0.01648525E+00-0.05522227E-04 0.08123593E-08-0.04295078E-12    2
+ 0.01370130E+06-0.01800458E+03 0.03197108E+02 0.02025592E+00 0.06510192E-04    3
+-0.01658442E-06 0.06400282E-10 0.01571520E+06 0.09895660E+02                   4
+C4H8              120386C   4H   8          G  0200.00   5000.00  1000.00      1
+ 0.02053584E+02 0.03435051E+00-0.01588320E-03 0.03308966E-07-0.02536104E-11    2
+-0.02139723E+05 0.01554320E+03 0.01181138E+02 0.03085338E+00 0.05086525E-04    3
+-0.02465489E-06 0.01111019E-09-0.01790400E+05 0.02106247E+03                   4
+C5                121286C   5               G  0200.00   5000.00  1000.00      1
+ 0.08078081E+02 0.05743464E-01-0.02436405E-04 0.04638916E-08-0.03278910E-12    2
+ 0.01147022E+07-0.01953024E+03 0.02115274E+02 0.02326332E+00-0.02109499E-03    3
+ 0.09072734E-07-0.01540093E-10 0.01162738E+07 0.01097603E+03                   4
+C5H                20387C   5H   1          G  0200.00   5000.00  1000.00      1
+ 0.08695749E+02 0.06054301E-01-0.02016011E-04 0.02892893E-08-0.01470100E-12    2
+ 0.09031069E+06-0.02101595E+03 0.01634825E+02 0.02509538E+00-0.01206636E-03    3
+-0.01046511E-06 0.08809988E-10 0.09212488E+06 0.01512194E+03                   4
+C5H12              20387C   5H  12          G  0200.00   4000.00  1000.00      1
+ 0.01667798E+03 0.02114483E+00-0.03533321E-04-0.05742202E-08 0.01515948E-11    2
+-0.02553670E+06-0.06372940E+03 0.01877908E+02 0.04121646E+00 0.01253234E-03    3
+-0.03701537E-06 0.01525569E-09-0.02003816E+06 0.01877257E+03                   4
+C5H2               20587C   5H   2          G  0200.00   5000.00  1000.00      1
+ 0.01132917E+03 0.07424057E-01-0.02628189E-04 0.04082541E-08-0.02301333E-12    2
+ 0.07878706E+06-0.03617117E+03 0.03062322E+02 0.02709998E+00-0.01009170E-03    3
+-0.01272745E-06 0.09167219E-10 0.08114969E+06 0.07071078E+02                   4
+C5H5              101993H   5C   5          G  0200.00   4000.00  1400.00      1
+ 0.01531094E+03 0.07473806E-01-0.05837458E-05-0.04386651E-08 0.07696839E-12    2
+ 0.02525890E+06-0.05951593E+03 0.01007316E+02 0.03189880E+00-0.04748189E-04    3
+-0.01102390E-06 0.04584681E-10 0.03047390E+06 0.01934168E+03                   4
+C5H6               20387C   5H   6          G  0200.00   5000.00  1000.00      1
+ 0.09689815E+02 0.01838262E+00-0.06264884E-04 0.09393377E-08-0.05087708E-12    2
+ 0.01102124E+06-0.03122908E+03-0.03196739E+02 0.04081361E+00 0.06816505E-05    3
+-0.03137459E-06 0.01577223E-09 0.01529068E+06 0.03869939E+03                   4
+C6H               121686C   6H   1          G  0200.00   5000.00  1000.00      1
+ 0.01158735E+03 0.07295363E-01-0.02466008E-04 0.03407046E-08-0.01498185E-12    2
+ 0.01031448E+07-0.03172578E+03 0.04769848E+02 0.02457279E+00-0.07561252E-04    3
+-0.01480691E-06 0.09768054E-10 0.01048523E+07 0.03241530E+02                   4
+C6H10              20387C   6H  10          G  0200.00   5000.00  1000.00      1
+ 0.01592777E+03 0.02374413E+00-0.06908672E-04 0.08109777E-08-0.02683123E-12    2
+-0.08642656E+05-0.06525186E+03-0.01394228E+02 0.04720693E+00 0.01196042E-03    3
+-0.04162896E-06 0.01740336E-09-0.02217790E+05 0.03129604E+03                   4
+C6H14              20387C   6H  14          G  0200.00   4000.00  1000.00      1
+ 0.02280472E+03 0.02097989E+00-0.03530674E-04-0.05466245E-08 0.01478950E-11    2
+-0.03073757E+06-0.09583162E+03 0.01836174E+02 0.05098461E+00 0.01259586E-03    3
+-0.04428362E-06 0.01872237E-09-0.02292750E+06 0.02088145E+03                   4
+C6H2              121686C   6H   2          G  0200.00   5000.00  1000.00      1
+ 0.01275652E+03 0.08034381E-01-0.02618215E-04 0.03725060E-08-0.01878851E-12    2
+ 0.08075469E+06-0.04041263E+03 0.05751085E+02 0.02636720E+00-0.01166760E-03    3
+-0.01071450E-06 0.08790297E-10 0.08262013E+06-0.04335532E+02                   4
+C6H3               20387C   6H   3          G  0200.00   5000.00  1000.00      1
+ 0.01276118E+03 0.01038557E+00-0.03479193E-04 0.05109733E-08-0.02690965E-12    2
+ 0.07477706E+06-0.03891745E+03 0.05007090E+02 0.02692852E+00-0.05919866E-04    3
+-0.01527233E-06 0.09408310E-10 0.07713200E+06 0.02225621E+02                   4
+C6H4              111293H   4C   6          G  0200.00   4000.00  1000.00      1
+ 0.01401625E+03 0.08242769E-01-0.08099664E-05-0.04654132E-08 0.08748122E-12    2
+ 0.04410396E+06-0.05139376E+03 0.01520024E+02 0.02876611E+00 0.01417725E-04    3
+-0.01650589E-06 0.05873157E-10 0.04844894E+06 0.01719034E+03                   4
+C6H5               82489C   6H   5          G  0200.00   4000.00  1000.00      1
+ 0.01577589E+03 0.09651109E-01-0.09429416E-05-0.05469111E-08 0.01026522E-11    2
+ 0.03302698E+06-0.06176280E+03 0.01143557E+01 0.03627325E+00 0.01158286E-04    3
+-0.02196965E-06 0.08463556E-10 0.03836054E+06 0.02380117E+03                   4
+C6H5(L)            82489C   6H   5          G  0200.00   4000.00  1000.00      1
+ 0.01721540E+03 0.08621068E-01-0.08221340E-05-0.04752164E-08 0.08844086E-12    2
+ 0.06385819E+06-0.06139128E+03 0.04854269E+02 0.03031659E+00 0.01742893E-05    3
+-0.01811010E-06 0.07392511E-10 0.06798734E+06 0.05854935E+02                   4
+C6H5O              82489C   6H   5O   1     G  0200.00   4000.00  1000.00      1
+ 0.01822639E+03 0.01003985E+00-0.09915668E-05-0.05672804E-08 0.01068372E-11    2
+-0.02620846E+05-0.07361391E+03 0.01107497E+02 0.03956946E+00 0.08497295E-05    3
+-0.02436311E-06 0.09650660E-10 0.03159672E+05 0.01973496E+03                   4
+C6H5OH             82489C   6H   6O   1     G  0200.00   4000.00  1000.00      1
+ 0.01821633E+03 0.01142427E+00-0.01096684E-04-0.06427442E-08 0.01198893E-11    2
+-0.02053664E+06-0.07304234E+03 0.01391456E+02 0.03931958E+00 0.01777096E-04    3
+-0.02277673E-06 0.08309659E-10-0.01472181E+06 0.01917813E+03                   4
+C6H6               20387C   6H   6          G  0200.00   5000.00  1000.00      1
+ 0.01291074E+03 0.01723297E+00-0.05024211E-04 0.05893497E-08-0.01947521E-12    2
+ 0.03664512E+05-0.05002699E+03-0.03138012E+02 0.04723103E+00-0.02962208E-04    3
+-0.03262819E-06 0.01718692E-09 0.08890031E+05 0.03657573E+03                   4
+C6H7               82489C   6H   7          G  0200.00   4000.00  1000.00      1
+ 0.01755221E+03 0.01227080E+00-0.01185742E-04-0.06959661E-08 0.01301326E-11    2
+ 0.01624581E+06-0.07166589E+03 0.04639166E+01 0.03975928E+00 0.02529095E-04    3
+-0.02223792E-06 0.07557053E-10 0.02225169E+06 0.02235387E+03                   4
+C8H               121686C   8H   1          G  0200.00   5000.00  1000.00      1
+ 0.01474991E+03 0.09931501E-01-0.03374841E-04 0.04687593E-08-0.02073536E-12    2
+ 0.01399448E+07-0.04892690E+03 0.04489508E+02 0.03521521E+00-0.01019390E-03    3
+-0.02197025E-06 0.01421416E-09 0.01425992E+07 0.03996225E+02                   4
+C8H2              121686C   8H   2          G  0200.00   5000.00  1000.00      1
+ 0.01568021E+03 0.01115461E+00-0.03724373E-04 0.05197891E-08-0.02375550E-12    2
+ 0.01081123E+07-0.05571437E+03 0.04630427E+02 0.03937080E+00-0.01148035E-03    3
+-0.02562214E-06 0.01670791E-09 0.01108285E+07 0.08077425E+01                   4
+CA                 80792CA  1               G  0200.00   5000.00  1000.00      1
+ 0.01636990E+02 0.01938281E-01-0.01464011E-04 0.04278257E-08-0.03581686E-12    2
+ 0.02109799E+06 0.08990615E+02 0.01563120E+02 0.06228361E-01-0.01415732E-03    3
+ 0.01323968E-06-0.04370569E-10 0.02092191E+06 0.08370537E+02                   4
+CA(A)              81092CA  1               S  0200.00   1500.00  1000.00      1
+ 0.03344424E+02-0.06129555E-04-0.02048549E-05 0.02199575E-08-0.06498067E-12    2
+-0.01020624E+05-0.01410880E+03 0.02492826E+02 0.03921280E-01-0.07242436E-04    3
+ 0.05919276E-07-0.01802531E-10-0.08641901E+04-0.01010018E+03                   4
+CA(B)              81092CA  1               S  0200.00   2000.00  1000.00      1
+ 0.02149662E+02 0.02293734E-01 0.03948384E-05-0.01813978E-08 0.03060995E-12    2
+-0.06970589E+04-0.07862350E+02 0.02013343E+02 0.02718935E-01-0.01374494E-05    3
+ 0.01528553E-08-0.06023681E-12-0.06613041E+04-0.07168449E+02                   4
+CA(L)              81092CA  1               L  0200.00   3000.00  1000.00      1
+ 0.03623553E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+ 0.02310016E+04-0.01455354E+03 0.03623553E+02 0.00000000E+00 0.00000000E+00    3
+ 0.00000000E+00 0.00000000E+00 0.02310016E+04-0.01455354E+03                   4
+CA+                80792CA  1E  -1          G  0200.00   5000.00  1000.00      1
+ 0.02415423E+02 0.03140053E-02-0.03458031E-05 0.01350163E-08-0.01342160E-12    2
+ 0.09252434E+06 0.05468189E+02 0.02276338E+02 0.01581988E-01-0.03878953E-04    3
+ 0.03953701E-07-0.01427856E-10 0.09253536E+06 0.06008258E+02                   4
+CA2                80792CA  2               G  0200.00   5000.00  1000.00      1
+ 0.04174798E+02-0.07401838E-02 0.03131196E-05-0.05885577E-09 0.04296578E-13    2
+ 0.04052221E+06 0.07582380E+02 0.05604867E+02-0.04044408E-01 0.02454638E-04    3
+-0.01495064E-08-0.01724184E-11 0.04008842E+06 0.01167234E+00                   4
+CABR               80792BR  1CA  1          G  0200.00   5000.00  1000.00      1
+ 0.04312008E+02 0.04246804E-02-0.02536360E-05 0.07082421E-09-0.05508239E-13    2
+-0.07242509E+05 0.05721414E+02 0.04004020E+02 0.01927770E-01-0.02749388E-04    3
+ 0.01785012E-07-0.04190442E-11-0.07199987E+05 0.07125700E+02                   4
+CABR2              80792BR  2CA  1          G  0200.00   5000.00  1000.00      1
+ 0.07388434E+02 0.01393017E-02-0.06561619E-06 0.01342748E-09-0.09993272E-14    2
+-0.04852787E+06-0.04337760E+02 0.06902053E+02 0.01599316E-01-0.01154723E-04    3
+-0.02428795E-08 0.03707822E-11-0.04841873E+06-0.01900929E+02                   4
+CABR2(S)           81292BR  2CA  1          S  0200.00   1500.00  1000.00      1
+ 0.01076200E+03-0.02979247E-01 0.06950511E-05 0.03569778E-07-0.01382224E-10    2
+-0.08542235E+06-0.04524895E+03 0.05478536E+02 0.02209325E+00-0.04544460E-03    3
+ 0.04176543E-06-0.01322726E-09-0.08447516E+06-0.02052538E+03                   4
+CACL               80792CA  1CL  1          G  0200.00   5000.00  1000.00      1
+ 0.04272197E+02 0.04612770E-02-0.02684554E-05 0.07233022E-09-0.05565813E-13    2
+-0.01387933E+06 0.04556153E+02 0.03810549E+02 0.02372144E-01-0.02939380E-04    3
+ 0.01528166E-07-0.02396962E-11-0.01379994E+06 0.06742955E+02                   4
+CACL2              80792CA  1CL  2          G  0200.00   5000.00  1000.00      1
+ 0.07322969E+02 0.02201546E-02-0.01035664E-05 0.02117574E-09-0.01575201E-13    2
+-0.05893953E+06-0.06959426E+02 0.06595983E+02 0.02364235E-01-0.01611807E-04    3
+-0.04866457E-08 0.05973912E-11-0.05877467E+06-0.03308009E+02                   4
+CACL2(S)           81092CA  1CL  2          S  0200.00   2000.00  1000.00      1
+ 0.06749013E+02 0.03694542E-01-0.02199980E-05 0.01165549E-08-0.02193898E-12    2
+-0.09759255E+06-0.02629777E+03 0.05722155E+02 0.01836100E+00-0.03597296E-03    3
+ 0.03173054E-06-0.09522563E-10-0.09798464E+06-0.02415730E+03                   4
+CAF                80792CA  1F   1          G  0200.00   5000.00  1000.00      1
+ 0.04150489E+02 0.05746086E-02-0.03081448E-05 0.07585468E-09-0.05641270E-13    2
+-0.03400290E+06 0.03725193E+02 0.03309446E+02 0.03419155E-01-0.03357208E-04    3
+ 0.01004510E-07 0.01112627E-11-0.03382332E+06 0.07876121E+02                   4
+CAF2               80792CA  1F   2          G  0200.00   5000.00  1000.00      1
+ 0.06575083E+02 0.05172194E-02-0.02403804E-05 0.04876347E-09-0.03608526E-13    2
+-0.09641588E+06-0.04868362E+02 0.05023320E+02 0.04921285E-01-0.03129418E-04    3
+-0.01178313E-07 0.01260201E-10-0.09604913E+06 0.02984363E+02                   4
+CAH2O2             81292CA  1H   2O   2     G  0200.00   5000.00  1000.00      1
+ 0.08627170E+02 0.03353668E-01-0.01123553E-04 0.01801642E-08-0.01122696E-12    2
+-0.07617877E+06-0.01582838E+03 0.05634984E+02 0.01431225E+00-0.01160774E-03    3
+ 0.02415328E-08 0.02445194E-10-0.07567777E+06-0.01510141E+02                   4
+CAH2O2(S)          81292CA  1H   2O   2     S  0200.00   1000.00  1000.00      1
+ 0.01418556E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+-0.01237066E+07-0.07268995E+03-0.07906910E+01 0.06795647E+00-0.01329918E-02    3
+ 0.01211862E-05-0.04117456E-09-0.01204396E+07-0.07999789E+01                   4
+CAI                80792CA  1I   1          G  0200.00   5000.00  1000.00      1
+ 0.04316128E+02 0.04138589E-02-0.02776385E-05 0.08074141E-09-0.06592826E-13    2
+-0.01903879E+05 0.06725163E+02 0.04078205E+02 0.01812968E-01-0.02972846E-04    3
+ 0.02225520E-07-0.06173497E-11-0.01881151E+05 0.07754936E+02                   4
+CAI2               80792CA  1I   2          G  0200.00   5000.00  1000.00      1
+ 0.07403366E+02 0.01208762E-02-0.05698306E-06 0.01167152E-09-0.08696049E-14    2
+-0.03328039E+06-0.02870204E+02 0.06975307E+02 0.01413683E-01-0.01046359E-04    3
+-0.01757655E-08 0.03111958E-11-0.03318450E+06-0.07269292E+01                   4
+CAO                80792CA  1O   1          G  0200.00   5000.00  1000.00      1
+ 0.08665723E+02-0.09857255E-01 0.07277137E-04-0.01813874E-07 0.01477538E-11    2
+ 0.02566423E+05-0.02151985E+03 0.07277069E+02-0.02477194E+00 0.06313166E-03    3
+-0.06322423E-06 0.02200693E-09 0.03774998E+05-0.09934620E+02                   4
+CAO(S)             81092CA  1O   1          S  0200.00   3600.00  1000.00      1
+ 0.05184497E+02 0.01938337E-01-0.08932525E-05 0.02410689E-08-0.02389613E-12    2
+-0.07806390E+06-0.02562669E+03 0.02964466E+02 0.09464719E-01-0.07948131E-04    3
+ 0.06517958E-08 0.01313902E-10-0.07762567E+06-0.01476156E+03                   4
+CAOH               80792CA  1H   1O   1     G  0200.00   5000.00  1000.00      1
+ 0.05164977E+02 0.01974644E-01-0.07757403E-05 0.01507385E-08-0.01048831E-12    2
+-0.02493597E+06-0.01690344E+02 0.03596803E+02 0.08182874E-01-0.07863515E-04    3
+ 0.01974293E-07 0.06136755E-11-0.02469004E+06 0.05713983E+02                   4
+CAOH+              80792CA  1H   1O   1E  -1G  0200.00   5000.00  1000.00      1
+ 0.05293390E+02 0.01697953E-01-0.05704847E-05 0.09169199E-09-0.05724155E-13    2
+ 0.04274157E+06-0.03041255E+02 0.03766022E+02 0.07251869E-01-0.05903957E-04    3
+ 0.02063514E-08 0.01186538E-10 0.04300269E+06 0.04285959E+02                   4
+CAS                80792CA  1S   1          G  0200.00   5000.00  1000.00      1
+ 0.04077726E+02-0.02148896E-01 0.03595164E-04-0.01167272E-07 0.01101218E-11    2
+ 0.01401038E+06 0.05797750E+02 0.05045918E+02-0.09248234E-01 0.03176027E-03    3
+-0.04007223E-06 0.01698112E-09 0.01355553E+06 0.08770679E+01                   4
+CCL                40992C   1CL  1          G  0200.00   4000.00  1500.00      1
+ 0.04306010E+02 0.01816861E-02-0.07184326E-06 0.01354479E-09-0.01002479E-13    2
+ 0.05198808E+06 0.01558593E+02 0.02871441E+02 0.04709268E-01-0.05629052E-04    3
+ 0.03086609E-07-0.06379756E-11 0.05237631E+06 0.08859373E+02                   4
+CCL2               40992C   1CL  2          G  0200.00   4000.00  1500.00      1
+ 0.06632435E+02 0.03558831E-02-0.01507592E-05 0.03116243E-09-0.02546496E-13    2
+ 0.02443636E+06-0.06590137E+02 0.03329579E+02 0.01112853E+00-0.01375891E-03    3
+ 0.07726329E-07-0.01624070E-10 0.02530408E+06 0.01010975E+03                   4
+CCL2CCLO           40992C   2 O  1CL  3     G  0200.00   4000.00  1500.00      1
+ 0.01497380E+03 0.09004180E-02-0.03714287E-05 0.05602716E-09-0.02392170E-13    2
+-0.01781718E+06-0.04510704E+03 0.05066114E+02 0.02846673E+00-0.03113001E-03    3
+ 0.01605483E-06-0.03208502E-10-0.01474354E+06 0.06663101E+02                   4
+CCL2CCLOH          53090C   2H   1O   1CL  3G  0200.00   5000.00  1500.00      1
+ 0.01567259E+03 0.02218766E-01-0.04425239E-05 0.06261725E-10 0.03673507E-13    2
+-0.02855361E+06-0.05085224E+03 0.04602117E+02 0.03408842E+00-0.03836909E-03    3
+ 0.02120271E-06-0.04527143E-10-0.02507945E+06 0.06859776E+02                   4
+CCL2CH             40992H   1C   2CL  2     G  0200.00   4000.00  1500.00      1
+ 0.01101223E+03 0.01364477E-01-0.03497001E-05 0.01107466E-09 0.03844298E-13    2
+ 0.02706218E+06-0.02886258E+03 0.02961736E+02 0.02429423E+00-0.02731403E-03    3
+ 0.01493184E-06-0.03162966E-10 0.02960233E+06 0.01317486E+03                   4
+CCL2HOO            53090C   1H   1O   2CL  2G  0200.00   5000.00  1500.00      1
+ 0.01273967E+03 0.01671789E-01-0.03280073E-05 0.09239024E-10 0.02183938E-13    2
+-0.05665041E+05-0.03552584E+03 0.03425417E+02 0.02745544E+00-0.02973832E-03    3
+ 0.01588391E-06-0.03309428E-10-0.02675529E+05 0.01333474E+03                   4
+CCL2OHCH2          53090C   2H   3O   1CL  2G  0200.00   5000.00  1500.00      1
+ 0.01606355E+03 0.02856412E-01-0.05564238E-05 0.02056416E-09 0.02871365E-13    2
+-0.01756115E+06-0.05438455E+03 0.02870959E+02 0.04462273E+00-0.05377946E-03    3
+ 0.03093185E-06-0.06719238E-10-0.01379636E+06 0.01305466E+03                   4
+CCL2OHCHCL         53090C   2H   2O   1CL  3G  0200.00   5000.00  1500.00      1
+ 0.01681474E+03 0.02433421E-01-0.04717311E-05 0.01595327E-09 0.02647197E-13    2
+-0.02217115E+06-0.05406904E+03 0.05487264E+02 0.03719540E+00-0.04391386E-03    3
+ 0.02501465E-06-0.05417859E-10-0.01882134E+06 0.04237537E+02                   4
+CCL3               40992C   1CL  3          G  0200.00   4000.00  1500.00      1
+ 0.09375859E+02 0.05723237E-02-0.02242398E-05 0.04238666E-09-0.03174834E-13    2
+ 0.05113147E+05-0.01813304E+03 0.04292822E+02 0.01682379E+00-0.02044420E-03    3
+ 0.01135805E-06-0.02371493E-10 0.06477756E+05 0.07677874E+02                   4
+CCL3CCLH2          53090C   2H   2CL  4     G  0200.00   5000.00  1500.00      1
+ 0.01788619E+03 0.02281235E-01-0.04746598E-05 0.01962667E-09 0.02451768E-13    2
+-0.02496335E+06-0.06312883E+03 0.03463508E+02 0.04144805E+00-0.04421053E-03    3
+ 0.02320525E-06-0.04772525E-10-0.02028144E+06 0.01275956E+03                   4
+CCL3CCLO           40992C   2 O  1CL  4     G  0200.00   4000.00  1500.00      1
+ 0.01687401E+03 0.01341876E-01-0.04555006E-05 0.07178333E-09-0.04348641E-13    2
+-0.03442278E+06-0.05295025E+03 0.06334167E+02 0.03461171E+00-0.04173791E-03    3
+ 0.02324686E-06-0.04882451E-10-0.03152121E+06 0.07697654E+01                   4
+CCL3CH2            53090C   2H   2CL  3     G  0200.00   5000.00  1500.00      1
+ 0.01468243E+03 0.02202649E-01-0.03960690E-05 0.02319280E-10 0.03655521E-13    2
+ 0.03875531E+05-0.04495230E+03 0.05008132E+02 0.03031103E+00-0.03453620E-03    3
+ 0.01951049E-06-0.04245840E-10 0.06936588E+05 0.05474640E+02                   4
+CCL3CHCL           53090C   2H   1CL  4     G  0200.00   5000.00  1500.00      1
+ 0.01610198E+03 0.01597223E-01-0.04069892E-05 0.04158083E-09-0.01105635E-13    2
+-0.02318814E+04-0.04936573E+03 0.05761929E+02 0.03433482E+00-0.04163980E-03    3
+ 0.02362341E-06-0.05054182E-10 0.02663920E+05 0.03399588E+02                   4
+CCL3CHO            53090C   2H   1O   1CL  3G  0200.00   5000.00  1500.00      1
+ 0.01532135E+03 0.01914228E-01-0.03622777E-05 0.05526564E-10 0.03016202E-13    2
+-0.02886499E+06-0.04774516E+03 0.05016867E+02 0.02961902E+00-0.03140321E-03    3
+ 0.01666643E-06-0.03481662E-10-0.02544921E+06 0.06644422E+02                   4
+CCL3OO             53090C   1O   2CL  3     G  0200.00   5000.00  1500.00      1
+ 0.01473249E+03 0.08345102E-02-0.03627944E-05 0.07101159E-09-0.05165897E-13    2
+-0.05526644E+05-0.04381961E+03 0.04317420E+02 0.03486414E+00-0.04287094E-03    3
+ 0.02371950E-06-0.04903871E-10-0.02855912E+05 0.08720693E+02                   4
+CCL4               40992C   1CL  4          G  0200.00   4000.00  1500.00      1
+ 0.01222570E+03 0.07440275E-02-0.03141658E-05 0.06499383E-09-0.05330319E-13    2
+-0.01439931E+06-0.03133566E+03 0.05107111E+02 0.02402469E+00-0.02980593E-03    3
+ 0.01678331E-06-0.03535253E-10-0.01253198E+06 0.04640845E+02                   4
+CCLH2OO            53090C   1H   2O   2CL  1G  0200.00   5000.00  1500.00      1
+ 0.01131351E+03 0.02330645E-01-0.03546376E-05-0.02064087E-09 0.06154082E-13    2
+-0.04225590E+05-0.03183829E+03 0.01583541E+02 0.02745395E+00-0.02803155E-03    3
+ 0.01491598E-06-0.03172720E-10-0.08340802E+04 0.01999023E+03                   4
+CH                121286C   1H   1          G  0200.00   5000.00  1000.00      1
+ 0.02196223E+02 0.02340381E-01-0.07058201E-05 0.09007582E-09-0.03855040E-13    2
+ 0.07086723E+06 0.09178373E+02 0.03200202E+02 0.02072876E-01-0.05134431E-04    3
+ 0.05733890E-07-0.01955533E-10 0.07045259E+06 0.03331588E+02                   4
+CH+               121286C   1H   1E  -1     G  0200.00   5000.00  1000.00      1
+ 0.02753358E+02 0.01552900E-01-0.05368453E-05 0.08921772E-09-0.05416801E-13    2
+ 0.01948467E+07 0.04654892E+02 0.03327207E+02 0.01347051E-01-0.03895861E-04    3
+ 0.05129390E-07-0.02054576E-10 0.01946452E+07 0.01408474E+02                   4
+CH2               120186C   1H   2          G  0250.00   4000.00  1000.00      1
+ 0.03636408E+02 0.01933057E-01-0.01687016E-05-0.01009899E-08 0.01808256E-12    2
+ 0.04534134E+06 0.02156561E+02 0.03762237E+02 0.01159819E-01 0.02489585E-05    3
+ 0.08800836E-08-0.07332435E-11 0.04536791E+06 0.01712578E+02                   4
+CH2(S)             31287C   1H   2          G  0200.00   4000.00  1000.00      1
+ 0.03552889E+02 0.02066788E-01-0.01914116E-05-0.01104673E-08 0.02021350E-12    2
+ 0.04984975E+06 0.01686570E+02 0.03971265E+02-0.01699089E-02 0.01025369E-04    3
+ 0.02492551E-07-0.01981266E-10 0.04989368E+06 0.05753207E+00                   4
+CH2CCL             53090C   2H   2CL  1     G  0200.00   5000.00  1500.00      1
+ 0.09117805E+02 0.02336015E-01-0.03466390E-05-0.03584809E-09 0.08154328E-13    2
+ 0.02697366E+06-0.02251742E+03 0.01553177E+02 0.02243159E+00-0.02366950E-03    3
+ 0.01323270E-06-0.02931823E-10 0.02962339E+06 0.01769303E+03                   4
+CH2CCL2            53090C   2H   2CL  2     G  0200.00   5000.00  1500.00      1
+ 0.01169451E+03 0.02435982E-01-0.03733045E-05-0.01419412E-09 0.05199337E-13    2
+-0.04601975E+05-0.03547415E+03 0.01527166E+02 0.02983780E+00-0.03171097E-03    3
+ 0.01728380E-06-0.03709638E-10-0.01173986E+05 0.01827540E+03                   4
+CH2CCLOH           53090C   2H   3O   1CL  1G  0200.00   5000.00  1500.00      1
+ 0.01267601E+03 0.03201392E-01-0.04788878E-05-0.02136104E-09 0.07030796E-13    2
+-0.02402379E+06-0.04128498E+03 0.06647840E+01 0.03723168E+00-0.04115206E-03    3
+ 0.02307135E-06-0.05021609E-10-0.02012318E+06 0.02165270E+03                   4
+CH2CHCCH           82489C   4H   4          G  0200.00   4000.00  1000.00      1
+ 0.01069777E+03 0.06982014E-01-0.06567747E-05-0.03884517E-08 0.07200946E-12    2
+ 0.03034803E+06-0.03128430E+03 0.03233893E+02 0.01865634E+00 0.01270320E-04    3
+-0.09410096E-07 0.02956111E-10 0.03301097E+06 0.09922676E+02                   4
+CH2CHCCH2          82489C   4H   5          G  0200.00   4000.00  1000.00      1
+ 0.01199776E+03 0.07990580E-01-0.08098173E-05-0.04568733E-08 0.08636910E-12    2
+ 0.03228493E+06-0.03528495E+03 0.03879443E+02 0.01997664E+00 0.01872777E-04    3
+-0.09306953E-07 0.02386116E-10 0.03526859E+06 0.09842152E+02                   4
+CH2CHCH2           82489C   3H   5          G  0200.00   4000.00  1000.00      1
+ 0.09651539E+02 0.08075596E-01-0.07965424E-05-0.04650696E-08 0.08603280E-12    2
+ 0.01530096E+06-0.02686774E+03 0.02276486E+02 0.01985564E+00 0.01123842E-04    3
+-0.01014576E-06 0.03441342E-10 0.01789497E+06 0.01372515E+03                   4
+CH2CHCHCH          82489C   4H   5          G  0200.00   4000.00  1000.00      1
+ 0.01286597E+03 0.07943369E-01-0.08626466E-05-0.04655635E-08 0.08951131E-12    2
+ 0.03783552E+06-0.04182502E+03 0.02995240E+02 0.02288456E+00 0.01975471E-04    3
+-0.01148245E-06 0.03197824E-10 0.04142218E+06 0.01289454E+03                   4
+CH2CHCHCH2        120189C   4H   6          G  0200.00   4000.00  1000.00      1
+ 0.01254437E+03 0.09596525E-01-0.09187012E-05-0.05429640E-08 0.01005364E-11    2
+ 0.08597330E+05-0.04217451E+03 0.01931624E+02 0.02479030E+00 0.03018071E-04    3
+-0.01154686E-06 0.02586623E-10 0.01255468E+06 0.01701999E+03                   4
+CH2CHCL            53090C   2H   3CL  1     G  0200.00   5000.00  1500.00      1
+ 0.01029820E+03 0.03042926E-01-0.03881390E-05-0.04925565E-09 0.01005072E-12    2
+-0.02492899E+05-0.03108614E+03 0.01118026E+01 0.02796358E+00-0.02726559E-03    3
+ 0.01463257E-06-0.03204075E-10 0.01287844E+05 0.02381617E+03                   4
+CH2CL              53090C   1H   2CL  1     G  0200.00   5000.00  1500.00      1
+ 0.06822515E+02 0.01659744E-01-0.02075515E-05-0.02793518E-09 0.05509087E-13    2
+ 0.01080454E+06-0.01090504E+03 0.02419924E+02 0.01303317E+00-0.01356559E-03    3
+ 0.07836108E-07-0.01800535E-10 0.01243112E+06 0.01269845E+03                   4
+CH2CL2            112989C   1H   2CL  2     G  0200.00   5000.00  1000.00      1
+ 0.05917327E+02 0.06762395E-01-0.02676163E-04 0.04856687E-08-0.03316974E-12    2
+-0.01385926E+06-0.03877739E+02 0.01423284E+02 0.02116658E+00-0.02178088E-03    3
+ 0.01345873E-06-0.03811649E-10-0.01268664E+06 0.01893445E+03                   4
+CH2CLCCL2          53090C   2H   2CL  3     G  0200.00   5000.00  1500.00      1
+ 0.01438156E+03 0.02379635E-01-0.04167426E-05-0.02445116E-10 0.04499574E-13    2
+-0.02746720E+05-0.04351762E+03 0.03351194E+02 0.03297633E+00-0.03604139E-03    3
+ 0.01977453E-06-0.04233823E-10 0.08620011E+04 0.01444760E+03                   4
+CH2CLCCLO          53090C   2H   2O   1CL  2G  0200.00   5000.00  1500.00      1
+ 0.01392027E+03 0.02589602E-01-0.04141892E-05-0.01643169E-09 0.06237174E-13    2
+-0.03517257E+06-0.04389503E+03 0.02705995E+02 0.03210128E+00-0.03357727E-03    3
+ 0.01814310E-06-0.03890009E-10-0.03130905E+06 0.01566013E+03                   4
+CH2CLCH2           53090C   2H   4CL  1     G  0200.00   5000.00  1500.00      1
+ 0.01167011E+03 0.03554722E-01-0.04124241E-05-0.07276110E-09 0.01316756E-12    2
+ 0.06201629E+05-0.03604549E+03 0.01635864E+02 0.02680201E+00-0.02491421E-03    3
+ 0.01349235E-06-0.03046571E-10 0.01014294E+06 0.01864248E+03                   4
+CH2CLCH2CL         53090C   2H   4CL  2     G  0200.00   5000.00  1500.00      1
+ 0.01443143E+03 0.03836770E-01-0.05299122E-05-0.05165412E-09 0.01177636E-12    2
+-0.02296285E+06-0.05130124E+03-0.02436500E+01 0.04032574E+00-0.03956993E-03    3
+ 0.02074245E-06-0.04412604E-10-0.01767830E+06 0.02741366E+03                   4
+CH2CLCHCL          53090C   2H   3CL  2     G  0200.00   5000.00  1500.00      1
+ 0.01295593E+03 0.03001689E-01-0.04165162E-05-0.03909055E-09 0.09041090E-13    2
+ 0.09932077E+04-0.03925387E+03 0.02276185E+02 0.03011401E+00-0.03047664E-03    3
+ 0.01654880E-06-0.03613198E-10 0.04836340E+05 0.01792166E+03                   4
+CH2CLCHCL2         53090C   2H   3CL  3     G  0200.00   5000.00  1500.00      1
+ 0.01618739E+03 0.03047681E-01-0.05011496E-05-0.01596701E-09 0.07107547E-13    2
+-0.02474417E+06-0.05695454E+03 0.01239011E+02 0.04148444E+00-0.04188654E-03    3
+ 0.02163214E-06-0.04467364E-10-0.01960717E+06 0.02257856E+03                   4
+CH2CLCHO           53090C   2H   3O   1CL  1G  0200.00   5000.00  1500.00      1
+ 0.01227955E+03 0.03320979E-01-0.04106710E-05-0.06199826E-09 0.01190594E-12    2
+-0.02678416E+06-0.03762356E+03 0.06553003E+01 0.02959046E+00-0.02635056E-03    3
+ 0.01327545E-06-0.02838288E-10-0.02227005E+06 0.02576797E+03                   4
+CH2CO             121686C   2H   2O   1     G  0200.00   5000.00  1000.00      1
+ 0.06038817E+02 0.05804840E-01-0.01920954E-04 0.02794485E-08-0.01458868E-12    2
+-0.08583402E+05-0.07657581E+02 0.02974971E+02 0.01211871E+00-0.02345046E-04    3
+-0.06466685E-07 0.03905649E-10-0.07632637E+05 0.08673553E+02                   4
+CH2F2              82489C   1H   2F   2     G  0200.00   5000.00  1000.00      1
+ 0.04730052E+02 0.07997300E-01-0.03186045E-04 0.05801160E-08-0.03967925E-12    2
+-0.05637288E+06-0.04954843E+01 0.03669434E+01 0.02168917E+00-0.02441913E-03    3
+ 0.01942310E-06-0.06978343E-10-0.05510103E+06 0.02202215E+03                   4
+CH2HCO            110393O   1H   3C   2     G  0200.00   5000.00  1000.00      1
+ 0.05975670E+02 0.08130591E-01-0.02743624E-04 0.04070304E-08-0.02176017E-12    2
+ 0.04903218E+04-0.05045251E+02 0.03409062E+02 0.01073857E+00 0.01891492E-04    3
+-0.07158583E-07 0.02867385E-10 0.01521477E+05 0.09558290E+02                   4
+CH2O              121286C   1H   2O   1     G  0200.00   5000.00  1000.00      1
+ 0.02995606E+02 0.06681321E-01-0.02628955E-04 0.04737153E-08-0.03212517E-12    2
+-0.01532037E+06 0.06912572E+02 0.01652731E+02 0.01263144E+00-0.01888168E-03    3
+ 0.02050031E-06-0.08413237E-10-0.01486540E+06 0.01378482E+03                   4
+CH2OH             120186H   3C   1O   1     G  0250.00   4000.00  1000.00      1
+ 0.06327520E+02 0.03608271E-01-0.03201547E-05-0.01938750E-08 0.03509705E-12    2
+-0.04474509E+05-0.08329366E+02 0.02862628E+02 0.01001527E+00-0.05285436E-05    3
+-0.05138540E-07 0.02246041E-10-0.03349679E+05 0.01039794E+03                   4
+CH2OHCCL2          53090C   2H   3O   1CL  2G  0200.00   5000.00  1500.00      1
+ 0.01602181E+03 0.02846352E-01-0.04974218E-05-0.02167450E-10 0.05246046E-13    2
+-0.01829579E+06-0.05402134E+03 0.01922940E+02 0.04158207E+00-0.04427505E-03    3
+ 0.02343015E-06-0.04851868E-10-0.01375512E+06 0.02001902E+03                   4
+CH2OHCHCL          53090C   2H   4O   1CL  1G  0200.00   5000.00  1500.00      1
+ 0.01446298E+03 0.03569514E-01-0.05419118E-05-0.02862176E-09 0.08920560E-13    2
+-0.01475559E+06-0.04942815E+03 0.03505696E+01 0.04212749E+00-0.04493839E-03    3
+ 0.02448187E-06-0.05236589E-10-0.01007314E+06 0.02495261E+03                   4
+CH2SICL            40992H   2C   1SI  1CL  1G  0200.00   4000.00  1500.00      1
+ 0.09915966E+02 0.01896319E-01-0.03304238E-05-0.03882353E-09 0.01089169E-12    2
+ 0.01906587E+06-0.02389137E+03 0.03514077E+02 0.01959495E+00-0.02147274E-03    3
+ 0.01214017E-06-0.02691323E-10 0.02123280E+06 0.09882836E+02                   4
+CH2SICL3           40992H   2C   1SI  1CL  3G  0200.00   4000.00  1500.00      1
+ 0.01476240E+03 0.02289499E-01-0.04148337E-05-0.01526182E-09 0.07724698E-13    2
+-0.04947703E+06-0.04020475E+03 0.06718170E+02 0.02712662E+00-0.03168529E-03    3
+ 0.01809641E-06-0.03938906E-10-0.04710183E+06 0.01167360E+02                   4
+CH2SIH2CL          40992H   4C   1SI  1CL  1G  0200.00   4000.00  1500.00      1
+ 0.01260561E+03 0.03468476E-01-0.04606434E-05-0.09748147E-09 0.02077681E-12    2
+-0.05748538E+05-0.03743183E+03 0.02426229E+02 0.03028056E+00-0.03039200E-03    3
+ 0.01612599E-06-0.03425629E-10-0.02268891E+05 0.01657736E+03                   4
+CH2SIHCL2          40992H   3C   1SI  1CL  2G  0200.00   4000.00  1500.00      1
+ 0.01365092E+03 0.02909029E-01-0.04521180E-05-0.05274788E-09 0.01389320E-12    2
+-0.02781262E+06-0.03810353E+03 0.04180967E+02 0.03005761E+00-0.03288772E-03    3
+ 0.01822025E-06-0.03925700E-10-0.02480330E+06 0.01134845E+03                   4
+CH3               121286C   1H   3          G  0200.00   5000.00  1000.00      1
+ 0.02844052E+02 0.06137974E-01-0.02230345E-04 0.03785161E-08-0.02452159E-12    2
+ 0.01643781E+06 0.05452697E+02 0.02430443E+02 0.01112410E+00-0.01680220E-03    3
+ 0.01621829E-06-0.05864953E-10 0.01642378E+06 0.06789794E+02                   4
+CH3C(O)CL          53090C   2H   3O   1CL  1G  0200.00   5000.00  1500.00      1
+ 0.01240568E+03 0.03210496E-01-0.03737157E-05-0.06739592E-09 0.01219122E-12    2
+-0.03432420E+06-0.03909195E+03 0.02275117E+02 0.02518533E+00-0.02152420E-03    3
+ 0.01084005E-06-0.02369191E-10-0.03024376E+06 0.01657016E+03                   4
+CH3CC              82489C   3H   3          G  0200.00   4000.00  1000.00      1
+ 0.07640221E+02 0.05233556E-01-0.05053635E-05-0.02919772E-08 0.05445700E-12    2
+ 0.05909763E+06-0.01629573E+03 0.03798751E+02 0.08749062E-01 0.02523014E-04    3
+-0.01529373E-07-0.01410562E-10 0.06077425E+06 0.05989223E+02                   4
+CH3CCCH2           82489C   4H   5          G  0200.00   4000.00  1000.00      1
+ 0.01156506E+03 0.08030297E-01-0.07649450E-05-0.04476534E-08 0.08313260E-12    2
+ 0.03256813E+06-0.03014066E+03 0.05068450E+02 0.01571747E+00 0.02968975E-04    3
+-0.04990587E-07-0.02984224E-11 0.03518855E+06 0.06791893E+02                   4
+CH3CCCH3          120189C   4H   6          G  0200.00   4000.00  1000.00      1
+ 0.01133658E+03 0.01005764E+00-0.09511323E-05-0.05660497E-08 0.01049451E-11    2
+ 0.01547659E+06-0.03350867E+03 0.04077105E+02 0.01703159E+00 0.04707490E-04    3
+-0.03767240E-07-0.02066963E-10 0.01859757E+06 0.08444801E+02                   4
+CH3CCH2            82489C   3H   5          G  0200.00   4000.00  1000.00      1
+ 0.09101018E+02 0.07964168E-01-0.07884945E-05-0.04562036E-08 0.08529212E-12    2
+ 0.02670680E+06-0.02150559E+03 0.03385811E+02 0.01404534E+00 0.03204127E-04    3
+-0.03824120E-07-0.09053742E-11 0.02909066E+06 0.01126649E+03                   4
+CH3CCL             53090C   2H   3CL  1     G  0200.00   5000.00  1500.00      1
+ 0.01023962E+03 0.02767116E-01-0.03228853E-05-0.05752548E-09 0.01043430E-12    2
+ 0.02633607E+06-0.02806184E+03 0.01687397E+02 0.02164347E+00-0.01891466E-03    3
+ 0.09699015E-07-0.02134580E-10 0.02975387E+06 0.01882236E+03                   4
+CH3CCL2            53090C   2H   3CL  2     G  0200.00   5000.00  1500.00      1
+ 0.01300035E+03 0.02940485E-01-0.03746456E-05-0.05040644E-09 0.01006332E-12    2
+-0.04228816E+04-0.03979863E+03 0.03213473E+02 0.02587378E+00-0.02419993E-03    3
+ 0.01273817E-06-0.02788481E-10 0.03325663E+05 0.01333320E+03                   4
+CH3CCL3            53090C   2H   3CL  3     G  0200.00   5000.00  1500.00      1
+ 0.01637160E+03 0.02935021E-01-0.04836108E-05-0.01454723E-09 0.06731691E-13    2
+-0.02378095E+06-0.05941864E+03 0.02484363E+02 0.03909474E+00-0.04013637E-03    3
+ 0.02110179E-06-0.04418213E-10-0.01902540E+06 0.01435603E+03                   4
+CH3CCLO            53090C   2H   3O   1CL  1G  0200.00   5000.00  1500.00      1
+ 0.01240595E+03 0.03210266E-01-0.03736397E-05-0.06740236E-09 0.01219081E-12    2
+-0.03432283E+06-0.03909605E+03 0.02277402E+02 0.02517912E+00-0.02151632E-03    3
+ 0.01083524E-06-0.02368079E-10-0.03024308E+06 0.01655556E+03                   4
+CH3CH2CCH         120189C   4H   6          G  0200.00   4000.00  1000.00      1
+ 0.01200695E+03 0.09576069E-01-0.08995018E-05-0.05369808E-08 0.09934174E-12    2
+ 0.01729420E+06-0.03802692E+03 0.03726043E+02 0.02053493E+00 0.03021439E-04    3
+-0.08131813E-07 0.01095280E-10 0.02048821E+06 0.08538826E+02                   4
+CH3CH2CH2C         62090C   4H  10          G  0200.00   4000.00  1500.00      1
+ 0.02032597E+03 0.01025189E+00-0.09348665E-05-0.04706743E-08 0.08327283E-12    2
+-0.02590868E+06-0.08998431E+03-0.02544545E+02 0.05770712E+00-0.04104933E-03    3
+ 0.01684742E-06-0.03176653E-10-0.01682847E+06 0.03586176E+03                   4
+CH3CH2CL           53090C   2H   5CL  1     G  0200.00   5000.00  1500.00      1
+ 0.01301118E+03 0.04448941E-01-0.05200473E-05-0.09119710E-09 0.01658842E-12    2
+-0.02013503E+06-0.04677847E+03-0.06981899E+01 0.03567705E+00-0.03230260E-03    3
+ 0.01689622E-06-0.03727523E-10-0.01476054E+06 0.02802219E+03                   4
+CH3CH2O           103190C   2H   5O   1     G  0200.00   4000.00  1500.00      1
+ 0.01187115E+03 0.05390415E-01-0.04990159E-05-0.02399585E-08 0.04255456E-12    2
+-0.05950457E+05-0.03996585E+03 0.06904570E+01 0.02951398E+00-0.02245116E-03    3
+ 0.01011600E-06-0.02044101E-10-0.01559918E+05 0.02130230E+03                   4
+CH3CHCH            82489C   3H   5          G  0200.00   4000.00  1000.00      1
+ 0.09209764E+02 0.07871413E-01-0.07724523E-05-0.04497357E-08 0.08377272E-12    2
+ 0.02853967E+06-0.02232370E+03 0.03161863E+02 0.01518100E+00 0.02722659E-04    3
+-0.05177112E-07 0.05435286E-12 0.03095548E+06 0.01197973E+03                   4
+CH3CHCL            53090C   2H   4CL  1     G  0200.00   5000.00  1500.00      1
+ 0.01166291E+03 0.03539284E-01-0.03858423E-05-0.08186871E-09 0.01407549E-12    2
+ 0.03696642E+05-0.03616108E+03 0.01903574E+02 0.02438193E+00-0.02062779E-03    3
+ 0.01068382E-06-0.02414461E-10 0.07722870E+05 0.01768152E+03                   4
+CH3CHCL2           53090C   2H   4CL  2     G  0200.00   5000.00  1500.00      1
+ 0.01454311E+03 0.03772378E-01-0.05189301E-05-0.05141063E-09 0.01163076E-12    2
+-0.02277045E+06-0.05147426E+03 0.04510764E+01 0.03884901E+00-0.03832912E-03    3
+ 0.02029502E-06-0.04357591E-10-0.01767234E+06 0.02414546E+03                   4
+CH3CHOH           103190C   2H   5O   1     G  0200.00   4000.00  1500.00      1
+ 0.01161148E+03 0.05173117E-01-0.04856685E-05-0.02202895E-08 0.03913721E-12    2
+-0.01248811E+06-0.03688213E+03 0.01415940E+02 0.02870648E+00-0.02373820E-03    3
+ 0.01148886E-06-0.02391420E-10-0.08638718E+05 0.01844256E+03                   4
+CH3CL             112989C   1H   3CL  1     G  0200.00   5000.00  1000.00      1
+ 0.03633876E+02 0.08664625E-01-0.03343871E-04 0.05950130E-08-0.04001401E-12    2
+-0.01177659E+06 0.04430651E+02 0.04621901E+01 0.02068247E+00-0.02553133E-03    3
+ 0.02160311E-06-0.07706816E-10-0.01093667E+06 0.02032977E+03                   4
+CH3CO             120186C   2H   3O   1     G  0200.00   5000.00  1000.00      1
+ 0.05612279E+02 0.08449886E-01-0.02854147E-04 0.04238376E-08-0.02268404E-12    2
+-0.05187863E+05-0.03274949E+02 0.03125278E+02 0.09778220E-01 0.04521448E-04    3
+-0.09009462E-07 0.03193718E-10-0.04108508E+05 0.01122885E+03                   4
+CH3F               82489C   1H   3F   1     G  0200.00   5000.00  1000.00      1
+ 0.03014978E+02 0.09314397E-01-0.03611697E-04 0.06443728E-08-0.04339594E-12    2
+-0.02977838E+06 0.06323815E+02 0.02600911E+01 0.02000788E+00-0.02662585E-03    3
+ 0.02561177E-06-0.09935237E-10-0.02896233E+06 0.02031799E+03                   4
+CH3HCO            120186C   2O   1H   4     G  0200.00   5000.00  1000.00      1
+ 0.05868650E+02 0.01079424E+00-0.03645530E-04 0.05412912E-08-0.02896844E-12    2
+-0.02264569E+06-0.06012946E+02 0.02505695E+02 0.01336991E+00 0.04671953E-04    3
+-0.01128140E-06 0.04263566E-10-0.02124589E+06 0.01335089E+03                   4
+CH3NO             103190C   1H   3N   1O   1G  0200.00   4000.00  1500.00      1
+ 0.08820547E+02 0.03706233E-01-0.02894741E-05-0.01897910E-08 0.03237544E-12    2
+ 0.05362862E+05-0.02213220E+03 0.02109955E+02 0.01517822E+00-0.07071789E-04    3
+ 0.01510611E-07-0.01604204E-11 0.08293612E+05 0.01569702E+03                   4
+CH3NO2            103190C   1H   3N   1O   2G  0200.00   4000.00  1500.00      1
+ 0.01090158E+03 0.04326381E-01-0.04203548E-05-0.01893071E-08 0.03417444E-12    2
+-0.01370862E+06-0.03073183E+03 0.03224717E+01 0.02665147E+00-0.01930574E-03    3
+ 0.07762620E-07-0.01398746E-10-0.09597527E+05 0.02726156E+03                   4
+CH3O              121686C   1H   3O   1     G  0200.00   3000.00  1000.00      1
+ 0.03770800E+02 0.07871497E-01-0.02656384E-04 0.03944431E-08-0.02112616E-12    2
+ 0.01278325E+04 0.02929575E+02 0.02106204E+02 0.07216595E-01 0.05338472E-04    3
+-0.07377636E-07 0.02075611E-10 0.09786011E+04 0.01315218E+03                   4
+CH3OCH3           103190C   2H   6O   1     G  0200.00   4000.00  1500.00      1
+ 0.01228100E+03 0.06711031E-01-0.04726871E-05-0.03636409E-08 0.06084545E-12    2
+-0.02839743E+06-0.04434692E+03 0.01245246E+02 0.02381198E+00-0.08266949E-04    3
+ 0.03068452E-08 0.01909248E-11-0.02335996E+06 0.01855817E+03                   4
+CH3OCL             53090C   1H   3O   1CL  1G  0200.00   5000.00  1500.00      1
+ 0.01022518E+03 0.02780047E-01-0.03331582E-05-0.05437858E-09 0.01012799E-12    2
+-0.01172886E+06-0.02912014E+03 0.01575392E+02 0.02255642E+00-0.02052644E-03    3
+ 0.01075312E-06-0.02371140E-10-0.08346834E+05 0.01804593E+03                   4
+CH3OH             121686C   1H   4O   1     G  0200.00   5000.00  1000.00      1
+ 0.04029061E+02 0.09376593E-01-0.03050254E-04 0.04358793E-08-0.02224723E-12    2
+-0.02615791E+06 0.02378196E+02 0.02660115E+02 0.07341508E-01 0.07170051E-04    3
+-0.08793194E-07 0.02390570E-10-0.02535348E+06 0.01123263E+03                   4
+CH3ONO            103190C   1H   3N   1O   2G  0200.00   4000.00  1500.00      1
+ 0.01136129E+03 0.04159349E-01-0.04145670E-05-0.01695140E-08 0.03028732E-12    2
+-0.01281482E+06-0.03545435E+03 0.01490345E+02 0.02645433E+00-0.02112332E-03    3
+ 0.09414399E-07-0.01811205E-10-0.09125782E+05 0.01813766E+03                   4
+CH3ONO2           103190C   1H   3N   1O   3G  0200.00   4000.00  1500.00      1
+ 0.01436189E+03 0.04112243E-01-0.05113052E-05-0.01496436E-08 0.03012156E-12    2
+-0.01972440E+06-0.05131842E+03 0.07803354E+01 0.03454204E+00-0.02822328E-03    3
+ 0.01232324E-06-0.02302164E-10-0.01465346E+06 0.02245752E+03                   4
+CH3SICL            10891C   1H   3CL  1SI  1G  0200.00   4000.00  1500.00      1
+ 0.01001981E+03 0.03098227E-01-0.03223524E-05-0.01222654E-08 0.02254960E-12    2
+-0.05427416E+05-0.02357211E+03 0.03485139E+02 0.01833182E+00-0.01573128E-03    3
+ 0.07856310E-07-0.01670946E-10-0.02954042E+05 0.01186948E+03                   4
+CH3SIH2SIH         10891C   2H  10SI  2     G  0200.00   4000.00  1500.00      1
+ 0.02302241E+03 0.08819047E-01-0.08859755E-05-0.03700889E-08 0.06746256E-12    2
+-0.01577058E+06-0.09458104E+03 0.02492915E+02 0.05396367E+00-0.04281663E-03    3
+ 0.01967585E-06-0.03981630E-10-0.07813141E+05 0.01758364E+03                   4
+CH3SIH2SIH2CH3     61991H  10C   2SI  2     G  0200.00   2500.00  1500.00      1
+ 0.01948332E+03 0.01195163E+00-0.02653155E-05-0.01489522E-07 0.03049901E-11    2
+-0.01405639E+06-0.07368209E+03 0.03129493E+02 0.05016930E+00-0.03522061E-03    3
+ 0.01354295E-06-0.02274339E-10-0.08303932E+05 0.01426819E+03                   4
+CH3SIHCL2          10891C   1CL  2H   4SI  1G  0200.00   4000.00  1500.00      1
+ 0.01459367E+03 0.04005638E-01-0.04816391E-05-0.01336359E-08 0.02648177E-12    2
+-0.05325682E+06-0.04689839E+03 0.04156949E+02 0.02994072E+00-0.02797859E-03    3
+ 0.01431829E-06-0.03010165E-10-0.04952345E+06 0.09043929E+02                   4
+CH4               121286C   1H   4          G  0200.00   5000.00  1000.00      1
+ 0.01683479E+02 0.01023724E+00-0.03875129E-04 0.06785585E-08-0.04503423E-12    2
+-0.01008079E+06 0.09623395E+02 0.07787415E+01 0.01747668E+00-0.02783409E-03    3
+ 0.03049708E-06-0.01223931E-09-0.09825229E+05 0.01372219E+03                   4
+CHCL              112989C   1H   1CL  1     G  0200.00   5000.00  1200.00      1
+ 0.03216518E+02 0.05976969E-01-0.02918238E-04 0.05912801E-08-0.04297945E-12    2
+ 0.03879839E+06 0.07793842E+02 0.02781263E+02 0.07805384E-01-0.01063711E-03    3
+ 0.01065441E-06-0.03916797E-10 0.03916144E+06 0.01045515E+03                   4
+CHCL2              40992H   1C   1CL  2     G  0200.00   4000.00  1500.00      1
+ 0.06912875E+02 0.01251733E-01-0.01973086E-05-0.02153722E-09 0.05853635E-13    2
+ 0.07229632E+05-0.07968135E+02 0.02809820E+02 0.01295936E+00-0.01392392E-03    3
+ 0.07533319E-07-0.01588448E-10 0.08515305E+05 0.01343798E+03                   4
+CHCL2CCL2          40992H   1C   2CL  4     G  0200.00   4000.00  1500.00      1
+ 0.01530640E+03 0.02140772E-01-0.04619954E-05 0.08299157E-10 0.05236928E-13    2
+-0.01524306E+05-0.04358303E+03 0.04207169E+02 0.03437580E+00-0.03802411E-03    3
+ 0.02026572E-06-0.04164115E-10 0.01811422E+05 0.01398021E+03                   4
+CHCL2CCLO          40992H   1C   2 O  1CL  3G  0200.00   4000.00  1500.00      1
+ 0.01488775E+03 0.02323698E-01-0.04365744E-05-0.01680889E-09 0.08613253E-13    2
+-0.03483792E+06-0.04504932E+03 0.04593886E+02 0.03118954E+00-0.03338775E-03    3
+ 0.01763042E-06-0.03630728E-10-0.03160866E+06 0.08756166E+02                   4
+CHCL2CH2           53090C   2H   3CL  2     G  0200.00   5000.00  1500.00      1
+ 0.01306632E+03 0.02964322E-01-0.04303601E-05-0.03173131E-09 0.08244908E-13    2
+ 0.04594697E+05-0.03814765E+03 0.02234889E+02 0.03152885E+00-0.03307990E-03    3
+ 0.01825221E-06-0.03994163E-10 0.08375531E+05 0.01944506E+03                   4
+CHCL2CHCL          53090C   2H   2CL  3     G  0200.00   5000.00  1500.00      1
+ 0.01445051E+03 0.02336553E-01-0.04132107E-05-0.05243785E-11 0.04204775E-13    2
+-0.05183250E+04-0.04362699E+03 0.03789098E+02 0.03243338E+00-0.03598339E-03    3
+ 0.01993302E-06-0.04287482E-10 0.02920910E+05 0.01221991E+03                   4
+CHCL2CHCL2         53090C   2H   2CL  4     G  0200.00   5000.00  1500.00      1
+ 0.01745859E+03 0.02484178E-01-0.05127803E-05 0.02266909E-09 0.02371932E-13    2
+-0.02510699E+06-0.06065213E+03 0.02711746E+02 0.04441279E+00-0.04905962E-03    3
+ 0.02632472E-06-0.05466293E-10-0.02052421E+06 0.01624857E+03                   4
+CHCL3              40992H   1C   1CL  3     G  0200.00   4000.00  1500.00      1
+ 0.01034980E+03 0.01690302E-01-0.03209168E-05-0.09502160E-10 0.05845725E-13    2
+-0.01567029E+06-0.02558805E+03 0.02905633E+02 0.02315061E+00-0.02534675E-03    3
+ 0.01356724E-06-0.02810882E-10-0.01339798E+06 0.01310749E+03                   4
+CHCLCCL            40992H   1C   2CL  2     G  0200.00   4000.00  1500.00      1
+ 0.01027647E+03 0.01733039E-01-0.03161161E-05-0.08153494E-10 0.05443014E-13    2
+ 0.02418877E+06-0.02436862E+03 0.02625129E+02 0.02366908E+00-0.02583240E-03    3
+ 0.01383374E-06-0.02870111E-10 0.02654214E+06 0.01545629E+03                   4
+CHCLCCLOH          53090C   2H   2O   1CL  2G  0200.00   5000.00  1500.00      1
+ 0.01412206E+03 0.02583764E-01-0.04576900E-05 0.05215675E-10 0.03521300E-13    2
+-0.02752482E+06-0.04544297E+03 0.02020547E+02 0.03810981E+00-0.04280147E-03    3
+ 0.02343806E-06-0.04934735E-10-0.02385982E+06 0.01729375E+03                   4
+CHCLCH             53090C   2H   2CL  1     G  0200.00   5000.00  1500.00      1
+ 0.09924881E+02 0.01618108E-01-0.02995768E-05-0.09718417E-11 0.03296695E-13    2
+ 0.02834312E+06-0.02704593E+03 0.01190122E+02 0.02432800E+00-0.02555965E-03    3
+ 0.01375158E-06-0.02941848E-10 0.03138157E+06 0.01944186E+03                   4
+CHCLCHCL           53090C   2H   2CL  2     G  0200.00   5000.00  1500.00      1
+ 0.01163648E+03 0.02461981E-01-0.03900520E-05-0.01521677E-09 0.05853766E-13    2
+-0.05593248E+05-0.03507354E+03 0.01054340E+02 0.03076645E+00-0.03252549E-03    3
+ 0.01763454E-06-0.03774444E-10-0.02006846E+05 0.02094011E+03                   4
+CHCLCHOH           53090C   2H   3O   1CL  1G  0200.00   5000.00  1500.00      1
+ 0.01285464E+03 0.03107712E-01-0.04837735E-05-0.02088657E-09 0.07393125E-13    2
+-0.02505588E+06-0.04274804E+03-0.02073397E+01 0.03868022E+00-0.04104567E-03    3
+ 0.02211252E-06-0.04680556E-10-0.02074261E+06 0.02608356E+03                   4
+CHCLOH             53090C   1H   2O   1CL  1G  0200.00   5000.00  1500.00      1
+ 0.09427376E+02 0.01722643E-01-0.02912707E-05-0.03765845E-10 0.03354461E-13    2
+-0.01224575E+06-0.02330123E+03 0.01319372E+02 0.02406119E+00-0.02560105E-03    3
+ 0.01356738E-06-0.02812530E-10-0.09640457E+05 0.01925640E+03                   4
+CHCLOHCH2          53090C   2H   4O   1CL  1G  0200.00   5000.00  1500.00      1
+ 0.01438435E+03 0.03552541E-01-0.05033147E-05-0.04051247E-09 0.01001172E-12    2
+-0.01383899E+06-0.04819745E+03 0.01473757E+02 0.03764188E+00-0.03898776E-03    3
+ 0.02112109E-06-0.04543830E-10-0.09395106E+05 0.02033823E+03                   4
+CHCLOHCHCL         53090C   2H   3O   1CL  2G  0200.00   5000.00  1500.00      1
+ 0.01567240E+03 0.02970040E-01-0.04827588E-05-0.01366600E-09 0.06500296E-13    2
+-0.01896002E+06-0.05132923E+03 0.02626025E+02 0.03856175E+00-0.04091474E-03    3
+ 0.02190241E-06-0.04603080E-10-0.01468188E+06 0.01735864E+03                   4
+CHF                82489C   1H   1F   1     G  0200.00   5000.00  1000.00      1
+ 0.04242812E+02 0.02066316E-01-0.06527951E-05 0.01388700E-08-0.01213336E-12    2
+ 0.01355982E+06 0.01680197E+02 0.03029061E+02 0.04850873E-01-0.04971679E-04    3
+ 0.05277968E-07-0.02403154E-10 0.01401435E+06 0.08324101E+02                   4
+CHF3               82489C   1H   1F   3     G  0200.00   5000.00  1000.00      1
+ 0.06834333E+02 0.06248731E-01-0.02575750E-04 0.04809112E-08-0.03352074E-12    2
+-0.08663771E+06-0.01062741E+03 0.08725142E+01 0.02308432E+00-0.02123718E-03    3
+ 0.01114428E-06-0.02909229E-10-0.08496391E+06 0.02021499E+03                   4
+CHOHCLCCL2         53090C   2H   2O   1CL  3G  0200.00   5000.00  1500.00      1
+ 0.01681824E+03 0.02450153E-01-0.04706624E-05 0.01313263E-09 0.03046283E-13    2
+-0.02253368E+06-0.05396958E+03 0.04216444E+02 0.03898554E+00-0.04360467E-03    3
+ 0.02374677E-06-0.04984764E-10-0.01867017E+06 0.01152520E+03                   4
+CHSICL             40992H   1C   1SI  1CL  1G  0200.00   4000.00  1500.00      1
+ 0.08205361E+02 0.01092172E-01-0.02021812E-05-0.04611367E-10 0.03306854E-13    2
+ 0.04201323E+06-0.01240589E+03 0.04575767E+02 0.01266147E+00-0.01507699E-03    3
+ 0.08704482E-07-0.01902710E-10 0.04304864E+06 0.06132926E+02                   4
+CHSICL2            40992H   1C   1SI  1CL  2G  0200.00   4000.00  1500.00      1
+ 0.01071823E+03 0.01148355E-01-0.02625783E-05 0.01567972E-09 0.01085455E-13    2
+ 0.01124882E+06-0.02053734E+03 0.05945817E+02 0.01709681E+00-0.02135360E-03    3
+ 0.01252863E-06-0.02749860E-10 0.01253413E+06 0.03573691E+02                   4
+CHSICL3            40992H   1C   1SI  1CL  3G  0200.00   4000.00  1500.00      1
+ 0.01359698E+03 0.01283679E-01-0.03320724E-05 0.03292615E-09-0.05463635E-14    2
+-0.02236189E+06-0.03349768E+03 0.07368467E+02 0.02227384E+00-0.02809218E-03    3
+ 0.01644147E-06-0.03590729E-10-0.02071740E+06-0.02118077E+02                   4
+CHSIH2CL           40992H   3C   1SI  1CL  1G  0200.00   4000.00  1500.00      1
+ 0.01142815E+03 0.02475732E-01-0.03864817E-05-0.04667547E-09 0.01222497E-12    2
+ 0.02085332E+06-0.03033129E+03 0.02869509E+02 0.02622702E+00-0.02794178E-03    3
+ 0.01516891E-06-0.03231519E-10 0.02364000E+06 0.01462055E+03                   4
+CHSIHCL            40992H   2C   1SI  1CL  1G  0200.00   4000.00  1500.00      1
+ 0.09716450E+02 0.01691882E-01-0.02846288E-05-0.02130090E-09 0.06948758E-13    2
+ 0.03056780E+06-0.02079822E+03 0.04045980E+02 0.01850072E+00-0.02095734E-03    3
+ 0.01185107E-06-0.02580401E-10 0.03232392E+06 0.08632908E+02                   4
+CHSIHCL2           40992H   2C   1SI  1CL  2G  0200.00   4000.00  1500.00      1
+ 0.01246646E+03 0.01911555E-01-0.03687550E-05-0.05466318E-10 0.05749803E-13    2
+-0.09679288E+04-0.03163481E+03 0.04853917E+02 0.02509790E+00-0.02916486E-03    3
+ 0.01649649E-06-0.03563598E-10 0.01297543E+05 0.07606296E+02                   4
+CL                 42189CL  1               G  0200.00   5000.00  1000.00      1
+ 0.02920237E+02-0.03597985E-02 0.01294294E-05-0.02162776E-09 0.01376517E-13    2
+ 0.01371338E+06 0.03262690E+02 0.02381577E+02 0.08891079E-02 0.04070476E-05    3
+-0.02168943E-07 0.01160827E-10 0.01383999E+06 0.06021818E+02                   4
+CL(CH3)SICH2       40992H   5C   2SI  1CL  1G  0200.00   4000.00  1500.00      1
+ 0.01496923E+03 0.05605854E-01-0.06191278E-05-0.02134591E-08 0.03977673E-12    2
+-0.01304066E+06-0.05036296E+03 0.02980753E+02 0.03627511E+00-0.03428566E-03    3
+ 0.01799146E-06-0.03853029E-10-0.08814405E+05 0.01362870E+03                   4
+CL2                42189CL  2               G  0200.00   5000.00  1000.00      1
+ 0.04274587E+02 0.03717337E-02-0.01893490E-05 0.05337465E-09-0.05057602E-13    2
+-0.01331149E+05 0.02256947E+02 0.03439587E+02 0.02870774E-01-0.02385871E-04    3
+ 0.02892918E-08 0.02915057E-11-0.01131787E+05 0.06471359E+02                   4
+CL2CCCL2           40992C   2CL  4          G  0200.00   4000.00  1500.00      1
+ 0.01440000E+03 0.01269397E-01-0.03525286E-05 0.04493620E-09-0.02348053E-13    2
+-0.08039017E+05-0.04321878E+03 0.05557831E+02 0.02778255E+00-0.03176769E-03    3
+ 0.01706054E-06-0.03492940E-10-0.05495042E+05 0.02293508E+02                   4
+CL2CCHCL           40992H   1C   2CL  3     G  0200.00   4000.00  1500.00      1
+ 0.01278204E+03 0.02068630E-01-0.03764411E-05-0.09077792E-10 0.06116574E-13    2
+-0.06934337E+05-0.03655991E+03 0.03457684E+02 0.02848717E+00-0.03070062E-03    3
+ 0.01624951E-06-0.03341401E-10-0.04047205E+05 0.01206381E+03                   4
+CL2CCHO            40992H   1C   2 O  1CL  2G  0200.00   4000.00  1500.00      1
+ 0.01294627E+03 0.02168144E-01-0.04244587E-05-0.03590986E-09 0.01220303E-12    2
+-0.01144361E+06-0.03783814E+03 0.03400952E+02 0.02760695E+00-0.02843245E-03    3
+ 0.01470263E-06-0.03017427E-10-0.08287517E+05 0.01257321E+03                   4
+CL2CHOH            53090C   1H   2O   1CL  2G  0200.00   5000.00  1500.00      1
+ 0.01129114E+03 0.02286704E-01-0.03461513E-05-0.01814480E-09 0.05661342E-13    2
+-0.03803060E+06-0.03079831E+03 0.02619078E+02 0.02601286E+00-0.02784252E-03    3
+ 0.01528682E-06-0.03294008E-10-0.03513998E+06 0.01492462E+03                   4
+CL2CO              40992C   1 O  1CL  2     G  0200.00   4000.00  1500.00      1
+ 0.08764773E+02 0.08919938E-02-0.02237590E-05 0.01486621E-09 0.09630870E-14    2
+-0.02973390E+06-0.01732025E+03 0.03460242E+02 0.01632331E+00-0.01828304E-03    3
+ 0.09805656E-07-0.02024319E-10-0.02813622E+06 0.01019127E+03                   4
+CL2COH             53090C   1O   1H   1CL  2G  0200.00   5000.00  1500.00      1
+ 0.01026215E+03 0.01316796E-01-0.02754008E-05 0.01630771E-09 0.06472563E-14    2
+-0.01511655E+06-0.02298315E+03 0.03800719E+02 0.02204678E+00-0.02673857E-03    3
+ 0.01531854E-06-0.03305323E-10-0.01332053E+06 0.09915879E+02                   4
+CL2HCO             53090C   1H   1O   1CL  2G  0200.00   5000.00  1500.00      1
+ 0.01051838E+03 0.01499316E-01-0.02927670E-05 0.07898750E-10 0.01988433E-13    2
+-0.06272394E+05-0.02634097E+03 0.02241202E+02 0.02456990E+00-0.02682371E-03    3
+ 0.01443170E-06-0.03023080E-10-0.03624526E+05 0.01703508E+03                   4
+CL2SI(CH3)2        40992H   6C   2SI  1CL  2G  0200.00   4000.00  1500.00      1
+ 0.01890988E+03 0.06245385E-01-0.06370532E-05-0.02508388E-08 0.04589637E-12    2
+-0.06523166E+06-0.06829627E+03 0.05958770E+02 0.03632045E+00-0.03098078E-03    3
+ 0.01545683E-06-0.03292671E-10-0.06031232E+06 0.01996401E+02                   4
+CL2SI(CH3)CH2      40992H   5C   2SI  1CL  2G  0200.00   4000.00  1500.00      1
+ 0.01795078E+03 0.05155757E-01-0.06049094E-05-0.01717793E-08 0.03355529E-12    2
+-0.03961749E+06-0.05949218E+03 0.05993815E+02 0.03621806E+00-0.03546358E-03    3
+ 0.01906128E-06-0.04137511E-10-0.03541814E+06 0.04216162E+02                   4
+CL2SICH2           40992H   2C   1SI  1CL  2G  0200.00   4000.00  1500.00      1
+ 0.01186709E+03 0.02689241E-01-0.04231139E-05-0.05555102E-09 0.01367174E-12    2
+-0.02169965E+06-0.03225026E+03 0.04111900E+02 0.02637445E+00-0.02985130E-03    3
+ 0.01679309E-06-0.03625511E-10-0.01940307E+06 0.07695176E+02                   4
+CL2SICH3           40992H   3C   1SI  1CL  2G  0200.00   4000.00  1500.00      1
+ 0.01285090E+03 0.03239360E-01-0.03774509E-05-0.01111777E-08 0.02163712E-12    2
+-0.03164727E+06-0.03531424E+03 0.05273286E+02 0.02205797E+00-0.02049425E-03    3
+ 0.01060061E-06-0.02257829E-10-0.02891555E+06 0.05340218E+02                   4
+CL2SISI            40992SI  2CL  2          G  0200.00   4000.00  1500.00      1
+ 0.09706403E+02 0.03323652E-02-0.01679851E-05 0.04061274E-09-0.03746093E-13    2
+ 0.01334060E+06-0.01565614E+03 0.06576632E+02 0.01105568E+00-0.01422816E-03    3
+ 0.08199114E-07-0.01752833E-10 0.01412004E+06 0.06538601E-02                   4
+CL2SISICL          40992SI  2CL  3          G  0200.00   4000.00  1500.00      1
+ 0.01304318E+03-0.01847658E-03-0.02187635E-05 0.08817012E-09-0.01004063E-12    2
+-0.01640770E+06-0.02832289E+03 0.08389457E+02 0.01629172E+00-0.02138192E-03    3
+ 0.01207431E-06-0.02508349E-10-0.01534318E+06-0.05268396E+02                   4
+CL2SISICL2         40992SI  2CL  4          G  0200.00   4000.00  1500.00      1
+ 0.01620538E+03 0.08400587E-04-0.02457560E-05 0.08992196E-09-0.09639101E-13    2
+-0.05343016E+06-0.04193027E+03 0.01077595E+03 0.01717615E+00-0.02131386E-03    3
+ 0.01172528E-06-0.02417202E-10-0.05196762E+06-0.01431634E+03                   4
+CL3CCO             81092C   2O   1CL  3     G  0200.00   5000.00  1400.00      1
+ 0.01383246E+03 0.01240141E-01-0.03510210E-05 0.04103960E-09-0.01475220E-13    2
+ 0.07499342E+07-0.03691505E+03 0.05016825E+02 0.02899350E+00-0.03563990E-03    3
+ 0.02082488E-06-0.04661957E-10 0.07524076E+07 0.08141487E+02                   4
+CL3CO              53090C   1O   1CL  3     G  0200.00   5000.00  1500.00      1
+ 0.01208526E+03 0.07759038E-02-0.02700075E-05 0.04346263E-09-0.02671642E-13    2
+-0.06464079E+05-0.03099432E+03 0.04548646E+02 0.02463303E+00-0.02974898E-03    3
+ 0.01647154E-06-0.03433021E-10-0.04416522E+05 0.07360693E+02                   4
+CL3COH             53090C   1O   1H   1CL  3G  0200.00   5000.00  1500.00      1
+ 0.01285985E+03 0.01588083E-01-0.03377500E-05 0.02031362E-09 0.08017922E-14    2
+-0.03807818E+06-0.03561945E+03 0.04269172E+02 0.02791723E+00-0.03272753E-03    3
+ 0.01828272E-06-0.03882978E-10-0.03558880E+06 0.08521096E+02                   4
+CL3SICH3           40992H   3C   1SI  1CL  3G  0200.00   4000.00  1500.00      1
+ 0.01572988E+03 0.03373817E-01-0.04472970E-05-0.09359551E-09 0.01995442E-12    2
+-0.07539927E+06-0.05017697E+03 0.06708039E+02 0.02724465E+00-0.02730290E-03    3
+ 0.01457864E-06-0.03116460E-10-0.07231476E+06-0.02328694E+02                   4
+CL3SISI            40992SI  2CL  3          G  0200.00   4000.00  1500.00      1
+ 0.01263015E+03 0.04310339E-02-0.02248369E-05 0.05573034E-09-0.05229996E-13    2
+-0.01723335E+06-0.02767933E+03 0.08429942E+02 0.01496243E+00-0.01942087E-03    3
+ 0.01125326E-06-0.02414611E-10-0.01619796E+06-0.06711706E+02                   4
+CL3SISICL          40992SI  2CL  4          G  0200.00   4000.00  1500.00      1
+ 0.01503498E+03 0.05376136E-02-0.02788507E-05 0.06889626E-09-0.06454867E-13    2
+-0.05496076E+06-0.03460735E+03 0.09721335E+02 0.01889709E+00-0.02451039E-03    3
+ 0.01419597E-06-0.03045164E-10-0.05364875E+06-0.08073287E+02                   4
+CLCCCL             40992C   2CL  2          G  0200.00   4000.00  1500.00      1
+ 0.09105373E+02 0.09281996E-02-0.01948371E-05 0.01590377E-10 0.02472937E-13    2
+ 0.02507216E+06-0.02072870E+03 0.05118707E+02 0.01243668E+00-0.01386540E-03    3
+ 0.07609302E-07-0.01615959E-10 0.02631398E+06 0.03298777E+00                   4
+CLCCO              53090C   2O   1CL  1     G  0200.00   5000.00  1500.00      1
+ 0.09368609E+02 0.03733935E-02-0.01286981E-05 0.01206469E-09 0.09220283E-15    2
+ 0.01762808E+06-0.02046752E+03 0.04417443E+02 0.01129365E+00-0.01013488E-03    3
+ 0.04661357E-07-0.09098661E-11 0.01952423E+06 0.06539246E+02                   4
+CLCH2OH            53090C   1H   3O   1CL  1G  0200.00   5000.00  1500.00      1
+ 0.09750194E+02 0.02974385E-01-0.03450482E-05-0.06010047E-09 0.01089784E-12    2
+-0.03248678E+06-0.02345467E+03 0.08330910E+01 0.02358999E+00-0.02137297E-03    3
+ 0.01105808E-06-0.02402402E-10-0.02905351E+06 0.02503745E+03                   4
+CLCO               40992C   1 O  1CL  1     G  0200.00   4000.00  1500.00      1
+ 0.06134827E+02 0.05369294E-02-0.07583742E-06-0.01514557E-09 0.03376080E-13    2
+-0.05363338E+05-0.03198172E+02 0.04790425E+02 0.03165209E-01-0.02098201E-04    3
+ 0.07703306E-08-0.01346351E-11-0.04812905E+05 0.04257480E+02                   4
+CLCOH              53090C   1H   1O   1CL  1G  0200.00   5000.00  1500.00      1
+ 0.07642908E+02 0.01507814E-01-0.02651581E-05-0.01466785E-09 0.04797316E-13    2
+-0.02511908E+05-0.01405046E+03 0.02037663E+02 0.01733328E+00-0.01936443E-03    3
+ 0.01099366E-06-0.02427341E-10-0.06596141E+04 0.01538422E+03                   4
+CLH2CO             53090C   1H   2O   1CL  1G  0200.00   5000.00  1500.00      1
+ 0.09104530E+02 0.02130629E-01-0.02994563E-05-0.02733652E-09 0.06437597E-13    2
+-0.05255641E+05-0.02258799E+03 0.08437505E+01 0.02258903E+00-0.02217447E-03    3
+ 0.01165204E-06-0.02487574E-10-0.02264707E+05 0.02176388E+03                   4
+CLHCO              40992H   1C   1 O  1CL  1G  0200.00   4000.00  1500.00      1
+ 0.07132409E+02 0.01686027E-01-0.02034320E-05-0.05804520E-09 0.01152902E-12    2
+-0.02522232E+06-0.01150137E+03 0.02378612E+02 0.01278870E+00-0.01094130E-03    3
+ 0.05089666E-07-0.09985544E-11-0.02348305E+06 0.01417749E+03                   4
+CLO                40992 O  1CL  1          G  0200.00   4000.00  1500.00      1
+ 0.04320627E+02 0.01730970E-02-0.07157875E-06 0.01424639E-09-0.01115543E-13    2
+ 0.01328601E+06 0.01764362E+02 0.02918696E+02 0.04664857E-01-0.05654826E-04    3
+ 0.03131108E-07-0.06515478E-11 0.01365989E+06 0.08877238E+02                   4
+CLOCL              53090O   1CL  2          G  0200.00   5000.00  1500.00      1
+ 0.06635186E+02 0.03284434E-02-0.01225328E-05 0.02123621E-09-0.01404377E-13    2
+ 0.07672352E+05-0.06410996E+02 0.03397880E+02 0.01080127E+00-0.01324655E-03    3
+ 0.07392960E-07-0.01546583E-10 0.08527797E+05 0.09981834E+02                   4
+CLOO               40992 O  2CL  1          G  0200.00   4000.00  1500.00      1
+ 0.06500858E+02 0.04259430E-02-0.01471496E-05 0.02312042E-09-0.01357033E-13    2
+ 0.01465068E+06-0.05831007E+02 0.03097113E+02 0.01088530E+00-0.01274586E-03    3
+ 0.06909658E-07-0.01419679E-10 0.01560137E+06 0.01159355E+03                   4
+CLSI(CH3)2         40992H   6C   2SI  1CL  1G  0200.00   4000.00  1500.00      1
+ 0.01602072E+03 0.06121766E-01-0.05697358E-05-0.02685516E-08 0.04764446E-12    2
+-0.02023771E+06-0.05448286E+03 0.04366292E+02 0.03146501E+00-0.02442313E-03    3
+ 0.01155763E-06-0.02441972E-10-0.01561856E+06 0.09415220E+02                   4
+CLSI(CH3)2CH2      40992H   8C   3SI  1CL  1G  0200.00   4000.00  1500.00      1
+ 0.02115100E+03 0.08018265E-01-0.07924248E-05-0.03295050E-08 0.05955233E-12    2
+-0.02795355E+06-0.07954995E+03 0.05283182E+02 0.04510586E+00-0.03881938E-03    3
+ 0.01972924E-06-0.04266615E-10-0.02191153E+06 0.06553031E+02                   4
+CLSI(CH3)3         40992H   9C   3SI  1CL  1G  0200.00   4000.00  1500.00      1
+ 0.02209311E+03 0.09120019E-01-0.08258094E-05-0.04093090E-08 0.07203542E-12    2
+-0.05338834E+06-0.08746922E+03 0.05151450E+02 0.04536455E+00-0.03440035E-03    3
+ 0.01610968E-06-0.03411234E-10-0.04659624E+06 0.05658041E+02                   4
+CLSICH3            40992H   3C   1SI  1CL  1G  0200.00   4000.00  1500.00      1
+ 0.01002062E+03 0.03097435E-01-0.03221687E-05-0.01222123E-08 0.02253457E-12    2
+-0.05623578E+05-0.02357626E+03 0.03485850E+02 0.01832800E+00-0.01572477E-03    3
+ 0.07852071E-07-0.01669997E-10-0.03149803E+05 0.01186709E+03                   4
+CLSISI             40992SI  2CL  1          G  0200.00   4000.00  1500.00      1
+ 0.06847303E+02 0.01844250E-02-0.09793979E-06 0.02440659E-09-0.02287823E-13    2
+ 0.04772443E+06-0.03339368E+02 0.05234557E+02 0.05788035E-01-0.07516996E-04    3
+ 0.04356402E-07-0.09346885E-11 0.04811932E+06 0.04702599E+02                   4
+CLSISICL           40992SI  2CL  2          G  0200.00   4000.00  1500.00      1
+ 0.01008343E+03-0.01216815E-02-0.01555866E-05 0.07247150E-09-0.08633006E-13    2
+ 0.01376083E+06-0.01644862E+03 0.07022588E+02 0.01136420E+00-0.01558778E-03    3
+ 0.08961882E-07-0.01874769E-10 0.01437523E+06-0.01570360E+02                   4
+CN                121286C   1N   1          G  0200.00   5000.00  1000.00      1
+ 0.03720120E+02 0.01518351E-02 0.01987381E-05-0.03798371E-09 0.01328230E-13    2
+ 0.05111626E+06 0.02888597E+02 0.03663204E+02-0.01156529E-01 0.02163409E-04    3
+ 0.01854208E-08-0.08214695E-11 0.05128118E+06 0.03739016E+02                   4
+CN+               121286C   1N   1E  -1     G  0200.00   5000.00  1000.00      1
+ 0.03701463E+02 0.07482931E-02-0.01790173E-05 0.02366368E-09-0.01437037E-13    2
+ 0.02155966E+07 0.04108678E+02 0.03118657E+02 0.01553258E-01-0.09487764E-05    3
+ 0.01479501E-07-0.09096763E-11 0.02158512E+07 0.07456254E+02                   4
+CN-               121286C   1N   1E   1     G  0200.00   5000.00  1000.00      1
+ 0.02981277E+02 0.01464773E-01-0.05672737E-05 0.01017623E-08-0.06870931E-13    2
+ 0.06346098E+05 0.06171693E+02 0.03278995E+02 0.01464192E-01-0.03925899E-04    3
+ 0.05629875E-07-0.02473497E-10 0.06279509E+05 0.04568972E+02                   4
+CN2               121686C   1N   2          G  0200.00   5000.00  1000.00      1
+ 0.05567064E+02 0.02100501E-01-0.09010517E-05 0.01718572E-08-0.01206255E-12    2
+ 0.05489968E+06-0.05630054E+02 0.03039964E+02 0.08812105E-01-0.07605508E-04    3
+ 0.03554357E-07-0.08746100E-11 0.05563268E+06 0.07555298E+02                   4
+CNN               121286C   1N   2          G  0200.00   5000.00  1000.00      1
+ 0.04785930E+02 0.02559554E-01-0.01003133E-04 0.01807149E-08-0.01227383E-12    2
+ 0.06870411E+06-0.02953957E+01 0.03524436E+02 0.07271923E-01-0.08272698E-04    3
+ 0.05628705E-07-0.01641576E-10 0.06899647E+06 0.05932445E+02                   4
+CNO               103190C   1N   1O   1     G  0200.00   4000.00  1500.00      1
+ 0.06328598E+02 0.07390401E-02-0.01110761E-05-0.01846498E-09 0.04400816E-13    2
+ 0.04683387E+06-0.09091839E+02 0.03819863E+02 0.06416255E-01-0.05303312E-04    3
+ 0.02308211E-07-0.04256414E-11 0.04775979E+06 0.04507300E+02                   4
+CO                121286C   1O   1          G  0200.00   5000.00  1000.00      1
+ 0.03025078E+02 0.01442689E-01-0.05630828E-05 0.01018581E-08-0.06910952E-13    2
+-0.01426835E+06 0.06108218E+02 0.03262452E+02 0.01511941E-01-0.03881755E-04    3
+ 0.05581944E-07-0.02474951E-10-0.01431054E+06 0.04848897E+02                   4
+CO2               121286C   1O   2          G  0200.00   5000.00  1000.00      1
+ 0.04453623E+02 0.03140169E-01-0.01278411E-04 0.02393997E-08-0.01669033E-12    2
+-0.04896696E+06-0.09553959E+01 0.02275725E+02 0.09922072E-01-0.01040911E-03    3
+ 0.06866687E-07-0.02117280E-10-0.04837314E+06 0.01018849E+03                   4
+CO2-              121286C   1O   2E   1     G  0200.00   5000.00  1000.00      1
+ 0.04610574E+02 0.02532962E-01-0.01070165E-04 0.02026771E-08-0.01424958E-12    2
+-0.05479882E+06 0.01449630E+02 0.02637077E+02 0.07803230E-01-0.08196187E-04    3
+ 0.06537897E-07-0.02520220E-10-0.05416773E+06 0.01188955E+03                   4
+COS               121286C   1O   1S   1     G  0200.00   5000.00  1000.00      1
+ 0.05191925E+02 0.02506123E-01-0.01024396E-04 0.01943914E-08-0.01370800E-12    2
+-0.01846210E+06-0.02825755E+02 0.02858531E+02 0.09515458E-01-0.08884915E-04    3
+ 0.04220994E-07-0.08557340E-11-0.01785145E+06 0.09081989E+02                   4
+CS                121686C   1S   1          G  0200.00   5000.00  1000.00      1
+ 0.03737431E+02 0.08180451E-02-0.03178918E-05 0.05356801E-09-0.02886195E-13    2
+ 0.03247725E+06 0.03576557E+02 0.02938623E+02 0.02724352E-01-0.02397707E-04    3
+ 0.01689501E-07-0.06665050E-11 0.03273992E+06 0.07848720E+02                   4
+CS2               121286C   1S   2          G  0200.00   5000.00  1000.00      1
+ 0.05930515E+02 0.01813645E-01-0.07492172E-05 0.01445892E-08-0.01032638E-12    2
+ 0.01205117E+06-0.06093910E+02 0.03566139E+02 0.08374928E-01-0.06835704E-04    3
+ 0.02091214E-07-0.06737193E-12 0.01268848E+06 0.06085967E+02                   4
+CSICL              40992C   1SI  1CL  1     G  0200.00   4000.00  1500.00      1
+ 0.06817655E+02 0.02139344E-02-0.01117811E-05 0.02768133E-09-0.02593011E-13    2
+ 0.07133105E+06-0.04934821E+02 0.04809756E+02 0.07155653E-01-0.09274105E-04    3
+ 0.05368218E-07-0.01150991E-10 0.07182609E+06 0.05089754E+02                   4
+CSICL2             40992C   1SI  1CL  2     G  0200.00   4000.00  1500.00      1
+ 0.09603536E+02 0.04212005E-02-0.02008617E-05 0.04653654E-09-0.04174779E-13    2
+ 0.04167197E+06-0.01686119E+03 0.05482765E+02 0.01432904E+00-0.01824531E-03    3
+ 0.01044588E-06-0.02224179E-10 0.04271677E+06 0.03823593E+02                   4
+CSICL3             40992C   1SI  1CL  3     G  0200.00   4000.00  1500.00      1
+ 0.01250544E+03 0.05339218E-02-0.02588613E-05 0.06075307E-09-0.05497769E-13    2
+ 0.04346089E+04-0.02851950E+03 0.07246579E+02 0.01837148E+00-0.02348583E-03    3
+ 0.01347935E-06-0.02874547E-10 0.01760441E+05-0.02151092E+02                   4
+CSIH2CL            40992H   2C   1SI  1CL  1G  0200.00   4000.00  1500.00      1
+ 0.01027485E+03 0.01774759E-01-0.03308189E-05-0.01554251E-09 0.07008815E-13    2
+ 0.04915449E+06-0.02589174E+03 0.02180376E+02 0.02405210E+00-0.02551666E-03    3
+ 0.01345591E-06-0.02782039E-10 0.05175432E+06 0.01659754E+03                   4
+CSIHCL             40992H   1C   1SI  1CL  1G  0200.00   4000.00  1500.00      1
+ 0.08584251E+02 0.09503299E-02-0.01990512E-05 0.07276089E-11 0.02697011E-13    2
+ 0.05701632E+06-0.01616263E+03 0.04195792E+02 0.01336658E+00-0.01458110E-03    3
+ 0.07822924E-07-0.01632113E-10 0.05839343E+06 0.06755654E+02                   4
+CSIHCL2            40992H   1C   1SI  1CL  2G  0200.00   4000.00  1500.00      1
+ 0.01133022E+03 0.01200867E-01-0.03112842E-05 0.02565133E-09 0.05146234E-14    2
+ 0.02764986E+06-0.02737920E+03 0.04205701E+02 0.02278870E+00-0.02653546E-03    3
+ 0.01465130E-06-0.03083816E-10 0.02972624E+06 0.09294144E+02                   4
+DIOXANE           103190C   4H   8O   2     G  0200.00   4000.00  1500.00      1
+ 0.02168170E+03 0.01049644E+00-0.01053878E-04-0.04473945E-08 0.08168288E-12    2
+-0.04922005E+06-0.09955139E+03-0.05862900E+02 0.07081444E+00-0.05458695E-03    3
+ 0.02315148E-06-0.04289514E-10-0.03876477E+06 0.05061959E+03                   4
+E                 120186E   1               G  0200.00   5000.00  1000.00      1
+ 0.02500000E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+-0.07453749E+04-0.01173403E+03 0.02500000E+02 0.00000000E+00 0.00000000E+00    3
+ 0.00000000E+00 0.00000000E+00-0.07453750E+04-0.01173403E+03                   4
+F                 121286F   1               G  0200.00   5000.00  1000.00      1
+ 0.02687459E+02-0.02010358E-02 0.08597957E-06-0.01644974E-09 0.01166160E-13    2
+ 0.08722883E+05 0.03882212E+02 0.02913905E+02-0.07336339E-02 0.05571015E-05    3
+-0.02666871E-08 0.08643255E-12 0.08651201E+05 0.02677115E+02                   4
+F2                121286F   2               G  0200.00   5000.00  1000.00      1
+ 0.04018308E+02 0.06221479E-02-0.02420845E-05 0.04742076E-09-0.03418141E-13    2
+-0.01300713E+05 0.01126327E+02 0.02940287E+02 0.03491492E-01-0.02458208E-04    3
+ 0.01837073E-08 0.02850917E-11-0.01010430E+05 0.06694194E+02                   4
+F2SINH             42489SI  1N   1F   2H   1G  0200.00   3000.00  1000.00      1
+ 0.01004830E+03 0.01983144E-01-0.02703169E-05-0.01767853E-08 0.04444368E-12    2
+-0.07739741E+06-0.02303889E+03 0.04951547E+02 0.01329636E+00-0.02098648E-04    3
+-0.01007276E-06 0.05552286E-10-0.07597541E+06 0.03690891E+02                   4
+F3SIN              22790F   3SI  1N   1     G  0200.00   4000.00  1000.00      1
+ 0.01151242E+03 0.01115029E-01-0.01605465E-05-0.05271933E-09 0.01160900E-12    2
+-0.01045919E+07-0.02981224E+03 0.06028419E+02 0.01278681E+00-0.01878856E-04    3
+-0.09695426E-07 0.05184848E-10-0.01029950E+07-0.08217831E+01                   4
+FNNF               42489F   2N   2          G  0200.00   3000.00  1000.00      1
+ 0.07255211E+02 0.02274410E-01-0.02793346E-05-0.02203844E-08 0.05359234E-12    2
+ 0.06360353E+05-0.01094248E+03 0.03127143E+02 0.01057134E+00-0.09746112E-05    3
+-0.07208357E-07 0.03567978E-10 0.07615831E+05 0.01107465E+03                   4
+FNO3              121286F   1N   1O   3     G  0200.00   5000.00  1000.00      1
+ 0.09176275E+02 0.04219072E-01-0.01835576E-04 0.03553718E-08-0.02541078E-12    2
+-0.02118639E+05-0.01934397E+03 0.02985786E+02 0.02094642E+00-0.01652733E-03    3
+ 0.04318770E-07 0.01660784E-11-0.04237215E+04 0.01266793E+03                   4
+FO                121286F   1O   1          G  0200.00   5000.00  1000.00      1
+ 0.03913735E+02 0.07210714E-02-0.02796614E-05 0.05337821E-09-0.03720184E-13    2
+ 0.01180141E+06 0.03346368E+02 0.02879578E+02 0.03399121E-01-0.02572855E-04    3
+ 0.07422381E-08-0.04328053E-12 0.01209663E+06 0.08738887E+02                   4
+FO2               121286F   1O   2          G  0200.00   5000.00  1000.00      1
+ 0.05678971E+02 0.01442455E-01-0.06229546E-05 0.01199612E-08-0.08543416E-13    2
+-0.03861836E+04-0.01941812E+02 0.03872542E+02 0.06409974E-01-0.05517785E-04    3
+ 0.02232771E-07-0.03876157E-11 0.01157076E+04 0.07406950E+02                   4
+FSIN               42489SI  1N   1F   1     G  0200.00   3000.00  1000.00      1
+ 0.06269572E+02 0.06747867E-02-0.01241976E-05-0.04970158E-09 0.01424452E-12    2
+ 0.02533350E+06-0.04201141E+02 0.04269969E+02 0.05298358E-01-0.01103802E-04    3
+-0.03962805E-07 0.02282982E-10 0.02587238E+06 0.06215038E+02                   4
+GA                 62987GA  1               G  0200.00   1500.00  0600.00      1
+ 0.02679919E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+ 0.03368804E+06 0.06788109E+02 0.02679919E+02 0.00000000E+00 0.00000000E+00    3
+ 0.00000000E+00 0.00000000E+00 0.03368804E+06 0.06788109E+02                   4
+GA2H6              62987GA  2H   6          G  0200.00   1500.00  0600.00      1
+ 0.06016247E+02 0.01788370E+00-0.01204229E-05-0.06487881E-07 0.02075367E-10    2
+ 0.01312548E+06-0.05228030E+02-0.03914561E+02 0.04965434E+00 0.07401904E-04    3
+-0.01124137E-05 0.08726339E-09 0.01493079E+06 0.04274883E+03                   4
+GAAS               62987GA  1AS  1          G  0200.00   1500.00  0600.00      1
+ 0.04471149E+02 0.04238449E-02-0.02279405E-05-0.04441172E-10 0.02618952E-12    2
+ 0.04313359E+06 0.06212471E+02 0.03967474E+02 0.02318966E-01-0.01145452E-04    3
+-0.03411431E-07 0.03365821E-10 0.04321919E+06 0.08599628E+02                   4
+GAAS(3,C)          62987GA  3AS  3          G  0200.00   1500.00  0600.00      1
+ 0.01485247E+03 0.02959435E-01-0.07124246E-05-0.05316048E-08 0.01287321E-11    2
+ 0.01191262E+07-0.03514144E+03 0.01470189E+03 0.03827728E-01-0.02945747E-04    3
+ 0.02465370E-07-0.01520598E-10 0.01191496E+07-0.03445955E+03                   4
+GAAS(3,L)          62987GA  3AS  3          G  0200.00   1500.00  0600.00      1
+ 0.01356850E+03 0.02802435E-01-0.07969918E-05-0.06437098E-08 0.01560255E-11    2
+ 0.01248005E+07-0.01381063E+03 0.01341276E+03 0.03617689E-01-0.02726209E-04    3
+ 0.01877183E-07-0.01259178E-10 0.01248265E+07-0.01309195E+03                   4
+GAAS(5,C)          62987GA  5AS  5          G  0200.00   1500.00  0600.00      1
+ 0.02573672E+03 0.05523956E-01-0.01203468E-04-0.01043743E-07 0.02528931E-11    2
+ 0.01721381E+07-0.08254488E+03 0.02546512E+03 0.07014337E-01-0.04881356E-04    3
+ 0.03825484E-07-0.02450420E-10 0.01721819E+07-0.08130267E+03                   4
+GAAS(5,L)          62987GA  5AS  5          G  0200.00   1500.00  0600.00      1
+ 0.03045793E+03 0.05403152E-01-0.01649477E-04-0.09968842E-08 0.02413154E-11    2
+ 0.02020691E+07-0.07768010E+03 0.03015255E+03 0.07234394E-01-0.06497994E-04    3
+ 0.05559585E-07-0.03339653E-10 0.02021151E+07-0.07630866E+03                   4
+GAET               62987GA  1C   2H   5     G  0200.00   1500.00  0600.00      1
+ 0.05932970E+02 0.01342454E+00 0.04110518E-05-0.04286069E-07 0.01238710E-10    2
+ 0.06504863E+05 0.03090838E+02 0.01846399E+02 0.02592050E+00 0.05522394E-04    3
+-0.04977960E-06 0.03654362E-09 0.07264445E+05 0.02294639E+03                   4
+GAET2              62987GA  1C   4H  10     G  0200.00   1500.00  0600.00      1
+ 0.07213832E+02 0.03055228E+00 0.01249451E-04-0.09990274E-07 0.02881966E-10    2
+-0.01392119E+05-0.07795098E+00-0.02162930E+02 0.05892512E+00 0.01447145E-03    3
+-0.01168602E-05 0.08526654E-09 0.03561841E+04 0.04552626E+03                   4
+GAET3              62987GA  1C   6H  15     G  0200.00   1500.00  0600.00      1
+ 0.08436453E+02 0.04804950E+00 0.02119157E-04-0.01581685E-06 0.04571178E-10    2
+-0.01346996E+06-0.06196490E+02-0.06544289E+02 0.09332246E+00 0.02364121E-03    3
+-0.01874104E-05 0.01367721E-08-0.01067659E+06 0.06666796E+03                   4
+GAH                62987GA  1H   1          G  0200.00   1500.00  0600.00      1
+ 0.03232142E+02 0.01343247E-01-0.04325499E-06-0.02791841E-08 0.04973590E-12    2
+ 0.02656060E+06 0.05947896E+02 0.03524579E+02 0.03386213E-02-0.02064014E-05    3
+ 0.03220999E-07-0.02936132E-10 0.02651074E+06 0.04554067E+02                   4
+GAH2               62987GA  1H   2          G  0200.00   1500.00  0600.00      1
+ 0.03762385E+02 0.03210792E-01 0.02180096E-06-0.08908393E-08 0.02219063E-11    2
+ 0.01936647E+06 0.05783398E+02 0.03559710E+02 0.03676742E-01 0.06484499E-05    3
+-0.03109349E-07 0.01585414E-10 0.01940976E+06 0.06803082E+02                   4
+GAH3               62987GA  1H   3          G  0200.00   1500.00  0600.00      1
+ 0.03345476E+02 0.06399313E-01 0.01122996E-05-0.02065900E-07 0.05780202E-11    2
+ 0.01228185E+06 0.06394842E+02 0.01726154E+02 0.01124739E+00 0.02447527E-04    3
+-0.02026314E-06 0.01447000E-09 0.01258620E+06 0.01428445E+03                   4
+GAME               62987GA  1C   1H   3     G  0200.00   1500.00  0600.00      1
+ 0.04809857E+02 0.06824207E-01 0.02258235E-05-0.02018341E-07 0.05736453E-11    2
+ 0.07558677E+05 0.02595904E+02 0.03054537E+02 0.01218640E+00 0.02332213E-04    3
+-0.02121866E-06 0.01544226E-09 0.07885869E+05 0.01112878E+03                   4
+GAME2              62987GA  1C   2H   6     G  0200.00   1500.00  0600.00      1
+ 0.07068373E+02 0.01421602E+00 0.05120694E-05-0.04421986E-07 0.01309641E-10    2
+ 0.05453790E+05-0.04173960E+02 0.02257655E+02 0.02916446E+00 0.05669861E-04    3
+-0.05709755E-06 0.04268905E-09 0.06341297E+05 0.01915435E+03                   4
+GAME3              62987GA  1C   3H   9     G  0200.00   1500.00  0600.00      1
+ 0.08410636E+02 0.02262803E+00 0.01043019E-04-0.07049611E-07 0.02015308E-10    2
+-0.09087271E+05-0.01072250E+03 0.02120239E+02 0.04161029E+00 0.09959505E-04    3
+-0.07846792E-06 0.05693396E-09-0.07911968E+05 0.01988516E+03                   4
+H                 120186H   1               G  0200.00   5000.00  1000.00      1
+ 0.02500000E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+ 0.02547163E+06-0.04601176E+01 0.02500000E+02 0.00000000E+00 0.00000000E+00    3
+ 0.00000000E+00 0.00000000E+00 0.02547163E+06-0.04601176E+01                   4
+H(CH3)SICH2        61991H   6C   2SI  1     G  0200.00   2500.00  1500.00      1
+ 0.01254527E+03 0.07143719E-01-0.01146987E-05-0.08100963E-08 0.01568740E-11    2
+ 0.07723628E+05-0.04075435E+03 0.01206249E+02 0.03587271E+00-0.02971970E-03    3
+ 0.01379675E-06-0.02695736E-10 0.01156328E+06 0.01956017E+03                   4
+H+                120186H   1E  -1          G  0200.00   5000.00  1000.00      1
+ 0.02500000E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+ 0.01840334E+07-0.01153862E+02 0.02500000E+02 0.00000000E+00 0.00000000E+00    3
+ 0.00000000E+00 0.00000000E+00 0.01840334E+07-0.01153862E+02                   4
+H-                120186H   1E   1          G  0200.00   5000.00  1000.00      1
+ 0.02500000E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+ 0.01596104E+06-0.01152449E+02 0.02500000E+02 0.00000000E+00 0.00000000E+00    3
+ 0.00000000E+00 0.00000000E+00 0.01596104E+06-0.01152449E+02                   4
+H2                121286H   2               G  0200.00   5000.00  1000.00      1
+ 0.02991423E+02 0.07000644E-02-0.05633829E-06-0.09231578E-10 0.01582752E-13    2
+-0.08350340E+04-0.01355110E+02 0.03298124E+02 0.08249442E-02-0.08143015E-05    3
+-0.09475434E-09 0.04134872E-11-0.01012521E+05-0.03294094E+02                   4
+H2ALME             62987AL  1C   1H   5     G  0200.00   1500.00  0600.00      1
+ 0.04898410E+02 0.01358223E+00 0.02611459E-05-0.04575170E-07 0.01384802E-10    2
+ 0.08743072E+04-0.01113117E+02-0.06283259E+01 0.03089531E+00 0.05774090E-04    3
+-0.06488033E-06 0.04907111E-09 0.01889334E+05 0.02565779E+03                   4
+H2ASME             62987AS  1C   1H   5     G  0200.00   1500.00  0600.00      1
+ 0.05686213E+02 0.02154422E+00 0.08185248E-05-0.07069951E-07 0.02101522E-10    2
+ 0.09331084E+05-0.06513957E+02-0.02113506E+02 0.04564229E+00 0.09983227E-04    3
+-0.09399697E-06 0.07014021E-09 0.01077170E+06 0.03132611E+03                   4
+H2C4O             120189H   2C   4O   1     G  0200.00   4000.00  1000.00      1
+ 0.01026888E+03 0.04896164E-01-0.04885081E-05-0.02708566E-08 0.05107013E-12    2
+ 0.02346903E+06-0.02815985E+03 0.04810971E+02 0.01313999E+00 0.09865073E-05    3
+-0.06120720E-07 0.01640003E-10 0.02545803E+06 0.02113424E+02                   4
+H2CCC             102093H   2C   3          G  0200.00   4000.00  1400.00      1
+ 0.08266525E+02 0.02728619E-01-0.02160829E-05-0.01515161E-08 0.02641695E-12    2
+ 0.07757192E+06-0.01864937E+03 0.04212193E+02 0.08954521E-01-0.01050721E-04    3
+-0.02578513E-07 0.09722836E-11 0.07922349E+06 0.04134299E+02                   4
+H2CCC(S)          102093H   2C   3          G  0200.00   4000.00  1400.00      1
+ 0.07904213E+02 0.02907464E-01-0.02219731E-05-0.01620844E-08 0.02796013E-12    2
+ 0.06385167E+06-0.01810882E+03 0.03794178E+02 0.08761049E-01-0.07975878E-05    3
+-0.02308045E-07 0.07911151E-11 0.06563580E+06 0.05264196E+02                   4
+H2CCCCCH          101993H   3C   5          G  0200.00   4000.00  1400.00      1
+ 0.01440736E+03 0.04424058E-01-0.03618245E-05-0.02456408E-08 0.04327859E-12    2
+ 0.05896103E+06-0.04775145E+03 0.07441421E+02 0.01585165E+00-0.02219895E-04    3
+-0.04928038E-07 0.01984559E-10 0.06162266E+06-0.09047891E+02                   4
+H2CCCCH            82489C   4H   3          G  0200.00   4000.00  1000.00      1
+ 0.01131409E+03 0.05014414E-01-0.05350445E-05-0.02825309E-08 0.05403279E-12    2
+ 0.05181211E+06-0.03062434E+03 0.06545799E+02 0.01242477E+00 0.05603226E-05    3
+-0.05631141E-07 0.01665218E-10 0.05352503E+06-0.04264082E+02                   4
+H2CCCCH2           82489C   4H   4          G  0200.00   4000.00  1000.00      1
+ 0.01062083E+03 0.07199370E-01-0.06806234E-05-0.04021185E-08 0.07378498E-12    2
+ 0.03358798E+06-0.03193583E+03 0.03849007E+02 0.01713169E+00 0.01644270E-04    3
+-0.07761590E-07 0.01947860E-10 0.03608372E+06 0.05732121E+02                   4
+H2CCCH             82489C   3H   3          G  0200.00   4000.00  1000.00      1
+ 0.08831047E+02 0.04357195E-01-0.04109067E-05-0.02368723E-08 0.04376520E-12    2
+ 0.03847420E+06-0.02177919E+03 0.04754200E+02 0.01108028E+00 0.02793323E-05    3
+-0.05479212E-07 0.01949629E-10 0.03988883E+06 0.05854549E+01                   4
+H2CCCLO            53090C   2H   2O   1CL  1G  0200.00   5000.00  1500.00      1
+ 0.01240462E+03 0.02067658E-01-0.03889952E-05-0.03138121E-10 0.04625008E-13    2
+-0.01114503E+06-0.03928723E+03 0.01680422E+02 0.03020642E+00-0.03234256E-03    3
+ 0.01779343E-06-0.03877221E-10-0.07395297E+05 0.01777265E+03                   4
+H2CCH(SICL2H)      40992H   4C   2SI  1CL  2G  0200.00   4000.00  1500.00      1
+ 0.01680247E+03 0.04516342E-01-0.05794312E-05-0.01367868E-08 0.02833862E-12    2
+-0.04037858E+06-0.05763375E+03 0.03640801E+02 0.03803764E+00-0.03641732E-03    3
+ 0.01855101E-06-0.03834642E-10-0.03581475E+06 0.01252145E+03                   4
+H2CCH2OH          103190C   2H   5O   1     G  0200.00   4000.00  1500.00      1
+ 0.01144956E+03 0.05249185E-01-0.04887850E-05-0.02243250E-08 0.03973360E-12    2
+-0.07554972E+05-0.03426083E+03 0.01304406E+02 0.02873214E+00-0.02387448E-03    3
+ 0.01166988E-06-0.02450027E-10-0.03718933E+05 0.02078756E+03                   4
+H2CCHO            103190C   2H   3O   1     G  0200.00   4000.00  1500.00      1
+ 0.09710060E+02 0.03854966E-01-0.04677825E-05-0.01505179E-08 0.02941428E-12    2
+-0.02692492E+05-0.02810566E+03 0.02802205E+01 0.02740311E+00-0.02554683E-03    3
+ 0.01306679E-06-0.02750425E-10 0.06682648E+04 0.02239731E+03                   4
+H2CCHSI            61991H   3C   2SI  1     G  0200.00   2500.00  1500.00      1
+ 0.09386889E+02 0.03941784E-01-0.01316150E-05-0.04081553E-08 0.07971026E-12    2
+ 0.04528924E+06-0.02340680E+03 0.01645904E+02 0.02461474E+00-0.02252401E-03    3
+ 0.01105892E-06-0.02209069E-10 0.04779814E+06 0.01738303E+03                   4
+H2CCHSIH           61991H   4C   2SI  1     G  0200.00   2500.00  1500.00      1
+ 0.01039415E+03 0.04987864E-01-0.01480904E-05-0.05650110E-08 0.01139073E-11    2
+ 0.03263919E+06-0.02930385E+03 0.01989225E+02 0.02637566E+00-0.02197547E-03    3
+ 0.09982490E-07-0.01893595E-10 0.03544082E+06 0.01531216E+03                   4
+H2CCHSIH2          61991H   5C   2SI  1     G  0200.00   2500.00  1500.00      1
+ 0.01289871E+03 0.05366252E-01-0.02345064E-05-0.05622057E-08 0.01143224E-11    2
+ 0.02373919E+06-0.04346106E+03 0.04606628E+01 0.03824847E+00-0.03490747E-03    3
+ 0.01656684E-06-0.03180820E-10 0.02773639E+06 0.02208512E+03                   4
+H2CCHSIH3          61991H   6C   2SI  1     G  0200.00   2500.00  1500.00      1
+ 0.01249653E+03 0.07666553E-01-0.02075339E-05-0.09569749E-08 0.01987112E-11    2
+ 0.04799029E+05-0.04174850E+03 0.07686183E+01 0.03576322E+00-0.02634364E-03    3
+ 0.01032868E-06-0.01717329E-10 0.08811836E+05 0.02100703E+03                   4
+H2CLSICH3          40992H   5C   1SI  1CL  1G  0200.00   4000.00  1500.00      1
+ 0.01354344E+03 0.04577293E-01-0.04988032E-05-0.01758807E-08 0.03311232E-12    2
+-0.03126783E+06-0.04541432E+03 0.02142669E+02 0.03103477E+00-0.02660368E-03    3
+ 0.01286599E-06-0.02646554E-10-0.02699973E+06 0.01636317E+03                   4
+H2CLSISICL3        40992H   2SI  2CL  4     G  0200.00   4000.00  1500.00      1
+ 0.01871701E+03 0.01924360E-01-0.04472779E-05 0.02003132E-09 0.03268818E-13    2
+-0.08047111E+06-0.05817685E+03 0.08945602E+02 0.03068227E+00-0.03483212E-03    3
+ 0.01910354E-06-0.04027623E-10-0.07751434E+06-0.07537633E+02                   4
+H2CN               41687H   2C   1N   1     G  0200.00   4000.00  1000.00      1
+ 0.05209703E+02 0.02969291E-01-0.02855589E-05-0.01635550E-08 0.03043259E-12    2
+ 0.02767711E+06-0.04444478E+02 0.02851661E+02 0.05695233E-01 0.01071140E-04    3
+-0.01622612E-07-0.02351108E-11 0.02863782E+06 0.08992751E+02                   4
+H2CNCH2           103190C   2H   4N   1     G  0200.00   4000.00  1500.00      1
+ 0.01065385E+03 0.05191287E-01-0.05816522E-05-0.02206912E-08 0.04101341E-12    2
+ 0.02345063E+06-0.03469895E+03-0.01203076E+01 0.03225369E+00-0.02968723E-03    3
+ 0.01527290E-06-0.03242500E-10 0.02728820E+06 0.02297042E+03                   4
+H2CNCH2O          103190C   2H   4N   1O   1G  0200.00   4000.00  1500.00      1
+ 0.01327652E+03 0.04830938E-01-0.04858949E-05-0.02009495E-08 0.03640181E-12    2
+ 0.01624962E+06-0.04713094E+03-0.01978522E+01 0.03341279E+00-0.02432022E-03    3
+ 0.09438643E-07-0.01604050E-10 0.02141154E+06 0.02658265E+03                   4
+H2CNCHO           103190C   2H   3N   1O   1G  0200.00   4000.00  1500.00      1
+ 0.01196792E+03 0.03915428E-01-0.03860933E-05-0.01696877E-08 0.03041050E-12    2
+-0.05902236E+05-0.03958545E+03 0.01096066E+02 0.02577215E+00-0.01711630E-03    3
+ 0.05880104E-07-0.08956774E-11-0.01612063E+05 0.02032528E+03                   4
+H2CNH              41687C   1H   3N   1     G  0200.00   4000.00  1000.00      1
+ 0.05221589E+02 0.04748526E-01-0.04179159E-05-0.02606612E-08 0.04703140E-12    2
+ 0.08657219E+05-0.04500776E+02 0.02365879E+02 0.06780570E-01 0.02423000E-04    3
+-0.06157824E-08-0.01615097E-10 0.09971141E+05 0.01230718E+03                   4
+H2CNNHO           103190C   1H   3N   2O   1G  0200.00   4000.00  1500.00      1
+ 0.01157754E+03 0.04489180E-01-0.05033233E-05-0.01651066E-08 0.03069139E-12    2
+ 0.01986783E+06-0.03656958E+03 0.05954945E+01 0.03239559E+00-0.02993966E-03    3
+ 0.01489054E-06-0.03022863E-10 0.02364485E+06 0.02192790E+03                   4
+H2CNNO            103190C   1H   2N   2O   1G  0200.00   4000.00  1500.00      1
+ 0.01016234E+03 0.03065936E-01-0.03082820E-05-0.01194424E-08 0.02169867E-12    2
+ 0.02494088E+06-0.02762275E+03 0.02498334E+02 0.01993009E+00-0.01557879E-03    3
+ 0.06838956E-07-0.01313250E-10 0.02786476E+06 0.01417025E+03                   4
+H2CNNO2            41687H   2C   1N   2O   2G  0200.00   4000.00  1000.00      1
+ 0.01140794E+03 0.04564542E-01-0.04600304E-05-0.02513539E-08 0.04782211E-12    2
+ 0.01242142E+06-0.03165238E+03 0.03534317E+02 0.01811272E+00 0.02394018E-05    3
+-0.01080024E-06 0.04222725E-10 0.01509006E+06 0.01131138E+03                   4
+H2CNO             103190C   1H   2N   1O   1G  0200.00   4000.00  1500.00      1
+ 0.08485639E+02 0.02633277E-01-0.03017498E-05-0.08341916E-09 0.01593977E-12    2
+ 0.01716434E+06-0.02052156E+03 0.01045856E+02 0.02126494E+00-0.01962754E-03    3
+ 0.09659592E-07-0.01941069E-10 0.01974611E+06 0.01919718E+03                   4
+H2CNO2            103190C   1H   2N   1O   2G  0200.00   4000.00  1500.00      1
+ 0.01127481E+03 0.02584711E-01-0.03934331E-05-0.05614969E-09 0.01392400E-12    2
+ 0.01360470E+06-0.03461951E+03 0.01165696E+02 0.02890490E+00-0.02817663E-03    3
+ 0.01387569E-06-0.02727595E-10 0.01694546E+06 0.01888293E+03                   4
+H2CONO            103190C   1H   2N   1O   2G  0200.00   4000.00  1500.00      1
+ 0.01075754E+03 0.02983288E-01-0.04123564E-05-0.08096724E-09 0.01720195E-12    2
+ 0.01230253E+06-0.02976009E+03 0.02120026E+02 0.02709056E+00-0.02799616E-03    3
+ 0.01479145E-06-0.03074997E-10 0.01504327E+06 0.01546092E+03                   4
+H2GAET             62987GA  1C   2H   7     G  0200.00   1500.00  0600.00      1
+ 0.07187273E+02 0.01867211E+00 0.06156157E-05-0.06027764E-07 0.01797524E-10    2
+-0.04232757E+05-0.04686699E+02 0.04124020E+01 0.03972972E+00 0.07979140E-04    3
+-0.08059234E-06 0.06040387E-09-0.02983932E+05 0.02816148E+03                   4
+H2GAME             62987GA  1C   1H   5     G  0200.00   1500.00  0600.00      1
+ 0.05831604E+02 0.01222872E+00 0.03033669E-05-0.03956941E-07 0.01225452E-10    2
+ 0.05189255E+05-0.04446614E+02 0.05251130E+01 0.02904695E+00 0.04844148E-04    3
+-0.06097646E-06 0.04672763E-09 0.06158712E+05 0.02122149E+03                   4
+H2NF               42489H   2N   1F   1     G  0200.00   3000.00  1000.00      1
+ 0.04143658E+02 0.03805135E-01-0.02771153E-05-0.03589717E-08 0.07589549E-12    2
+-0.04891486E+05 0.02309362E+02 0.02597863E+02 0.05882104E-01 0.04938351E-05    3
+-0.01948600E-07 0.03634003E-11-0.04301253E+05 0.01098289E+03                   4
+H2NNO             103190H   2N   2O   1     G  0200.00   4000.00  1500.00      1
+ 0.07759737E+02 0.03025701E-01-0.02888916E-05-0.01262990E-08 0.02195026E-12    2
+ 0.05894193E+05-0.01647713E+03 0.02088916E+02 0.01684997E+00-0.01428977E-03    3
+ 0.06830147E-07-0.01368985E-10 0.07907340E+05 0.01394381E+03                   4
+H2NO              102290H   2N   1O   1     G  0200.00   4000.00  1500.00      1
+ 0.05673346E+02 0.02298837E-01-0.01774446E-05-0.01103482E-08 0.01859762E-12    2
+ 0.05569325E+05-0.06153540E+02 0.02530590E+02 0.08596035E-01-0.05471030E-04    3
+ 0.02276249E-07-0.04648073E-11 0.06868030E+05 0.01126651E+03                   4
+H2NOH             103190H   3N   1O   1     G  0200.00   4000.00  1500.00      1
+ 0.06764633E+02 0.03047036E-01-0.02777798E-05-0.01250487E-08 0.02191094E-12    2
+-0.09026701E+05-0.01269845E+03 0.01407003E+02 0.01658498E+00-0.01463594E-03    3
+ 0.07318354E-07-0.01511897E-10-0.07158596E+05 0.01589649E+03                   4
+H2O                20387H   2O   1          G  0200.00   5000.00  1000.00      1
+ 0.02672146E+02 0.03056293E-01-0.08730260E-05 0.01200996E-08-0.06391618E-13    2
+-0.02989921E+06 0.06862817E+02 0.03386842E+02 0.03474982E-01-0.06354696E-04    3
+ 0.06968581E-07-0.02506588E-10-0.03020811E+06 0.02590233E+02                   4
+H2O(L)            120186H   2O   1          L  0273.15   1000.00  1000.00      1
+ 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+ 0.00000000E+00 0.00000000E+00 0.01271278E+03-0.01766279E+00-0.02255666E-03    3
+ 0.02082091E-05-0.02407861E-08-0.03748320E+06-0.05911535E+03                   4
+H2O(S)            120186H   2O   1          S  0200.00   0273.15  0273.15      1
+ 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+ 0.00000000E+00 0.00000000E+00-0.03926933E+00 0.01692042E+00 0.00000000E+00    3
+ 0.00000000E+00 0.00000000E+00-0.03594958E+06 0.05693378E+01                   4
+H2O2              120186H   2O   2          G  0200.00   5000.00  1000.00      1
+ 0.04573167E+02 0.04336136E-01-0.01474689E-04 0.02348904E-08-0.01431654E-12    2
+-0.01800696E+06 0.05011370E+01 0.03388754E+02 0.06569226E-01-0.01485013E-05    3
+-0.04625806E-07 0.02471515E-10-0.01766315E+06 0.06785363E+02                   4
+H2S               121286H   2S   1          G  0200.00   5000.00  1000.00      1
+ 0.02883147E+02 0.03827835E-01-0.01423398E-04 0.02497999E-08-0.01660273E-12    2
+-0.03480743E+05 0.07258162E+02 0.03071029E+02 0.05578261E-01-0.01030967E-03    3
+ 0.01201953E-06-0.04838370E-10-0.03559826E+05 0.05935226E+02                   4
+H2SI(CH3)2         61991H   8C   2SI  1     G  0200.00   2500.00  1500.00      1
+ 0.01362000E+03 0.01024457E+00-0.01528107E-05-0.01329179E-07 0.02717974E-11    2
+-0.01781386E+06-0.04695844E+03 0.02005893E+02 0.03638380E+00-0.02273374E-03    3
+ 0.07691266E-07-0.01156681E-10-0.01364280E+06 0.01583265E+03                   4
+H2SI(CH3)CH2       61991H   7C   2SI  1     G  0200.00   2500.00  1500.00      1
+ 0.01388829E+03 0.07937538E-01-0.01559644E-05-0.09324826E-08 0.01847251E-11    2
+ 0.06767195E+05-0.04464997E+03 0.01980449E+02 0.03727036E+00-0.02944759E-03    3
+ 0.01312558E-06-0.02507859E-10 0.01087973E+06 0.01898102E+03                   4
+H2SI(NH2)2         22790SI  1H   6N   2     G  0200.00   4000.00  1000.00      1
+ 0.01302179E+03 0.06465444E-01-0.05816746E-05-0.03484493E-08 0.06340675E-12    2
+-0.02357071E+06-0.04132570E+03 0.05615307E+02 0.02079854E+00-0.09999530E-05    3
+-0.01288525E-06 0.06091866E-10-0.02126283E+06-0.01615658E+02                   4
+H2SIC              61991H   2C   1SI  1     G  0200.00   2500.00  1500.00      1
+ 0.07319671E+02 0.01729952E-01-0.01346466E-05-0.01450487E-08 0.03000643E-12    2
+ 0.08125478E+06-0.01320432E+03 0.02408167E+02 0.01437372E+00-0.01331203E-03    3
+ 0.06387472E-07-0.01244523E-10 0.08289031E+06 0.01283748E+03                   4
+H2SICCH            61991H   3C   2SI  1     G  0200.00   2500.00  1500.00      1
+ 0.01091422E+03 0.03001577E-01-0.01622344E-05-0.02466767E-08 0.04595260E-12    2
+ 0.04137118E+06-0.03153165E+03 0.02952641E+02 0.02407857E+00-0.02313898E-03    3
+ 0.01172227E-06-0.02393835E-10 0.04400800E+06 0.01054929E+03                   4
+H2SICH             61991H   3C   1SI  1     G  0200.00   2500.00  1500.00      1
+ 0.08489276E+02 0.02348812E-01-0.01091163E-05-0.02027972E-08 0.03759264E-12    2
+ 0.04973382E+06-0.01845097E+03 0.03442743E+02 0.01542521E+00-0.01429096E-03    3
+ 0.07252204E-07-0.01507009E-10 0.05145786E+06 0.08363421E+02                   4
+H2SICH2            61991H   4C   1SI  1     G  0200.00   2500.00  1500.00      1
+ 0.09303939E+02 0.04006038E-01-0.09702324E-06-0.03997739E-08 0.07350215E-12    2
+ 0.01649066E+06-0.02623845E+03 0.01049782E+02 0.02562277E+00-0.02324392E-03    3
+ 0.01142315E-06-0.02295441E-10 0.01922778E+06 0.01743860E+03                   4
+H2SICH3            61991H   5C   1SI  1     G  0200.00   2500.00  1500.00      1
+ 0.08991115E+02 0.06006339E-01-0.01118591E-05-0.07745983E-08 0.01594429E-11    2
+ 0.01270233E+06-0.02218700E+03 0.02094419E+02 0.02127010E+00-0.01294390E-03    3
+ 0.04156964E-07-0.05854213E-11 0.01520143E+06 0.01518517E+03                   4
+H2SIN              22790H   2SI  1N   1     G  0200.00   4000.00  1000.00      1
+ 0.06826533E+02 0.02125460E-01-0.02343132E-05-0.01166339E-08 0.02277273E-12    2
+ 0.07253673E+06-0.01052162E+03 0.03549344E+02 0.07311005E-01 0.03249026E-05    3
+-0.03682945E-07 0.01121511E-10 0.07370656E+06 0.07565329E+02                   4
+H2SINH             42489SI  1N   1H   3     G  0200.00   3000.00  1000.00      1
+ 0.06588295E+02 0.04903194E-01-0.04944720E-05-0.05014630E-08 0.01139470E-11    2
+ 0.01809794E+06-0.09522970E+02 0.02822196E+02 0.01245518E+00-0.08350819E-05    3
+-0.07411814E-07 0.03579019E-10 0.01923616E+06 0.01054783E+03                   4
+H2SINH2            42489SI  1N   1H   4     G  0200.00   3000.00  1000.00      1
+ 0.07392047E+02 0.05476841E-01-0.04453276E-05-0.05236661E-08 0.01138390E-11    2
+ 0.01136858E+06-0.01138050E+03 0.04053223E+02 0.01182231E+00-0.04348128E-05    3
+-0.06225818E-07 0.02798829E-10 0.01241971E+06 0.06562033E+02                   4
+H2SINH3           121386SI  1H   5N   1     G  0200.00   4000.00  1000.00      1
+ 0.08711392E+02 0.05909106E-01-0.05436615E-05-0.03248350E-08 0.05960257E-12    2
+ 0.08441694E+05-0.01933470E+03 0.04269730E+02 0.01125224E+00 0.01951722E-04    3
+-0.03578373E-07-0.08372202E-12 0.01022204E+06 0.05876736E+02                   4
+H2SISIH2           42489SI  2H   4          G  0200.00   3000.00  1000.00      1
+ 0.08986817E+02 0.05405047E-01-0.05214022E-05-0.05313742E-08 0.01188727E-11    2
+ 0.02832748E+06-0.02004478E+03 0.05133186E+02 0.01252855E+00-0.04620421E-05    3
+-0.06606075E-07 0.02864345E-10 0.02956915E+06 0.07605133E+01                   4
+H3ASGAET3          62987AS  1GA  1C   6H  18G  0200.00   1500.00  0600.00      1
+ 0.08508501E+02 0.05632369E+00 0.02524140E-04-0.01861451E-06 0.05372403E-10    2
+-0.01085517E+06-0.03399858E+02-0.08974745E+02 0.01090516E+01 0.02811457E-03    3
+-0.02195513E-05 0.01599734E-08-0.07592761E+05 0.08165459E+03                   4
+H3ASGAME3          62987AS  1GA  1C   3H  12G  0200.00   1500.00  0600.00      1
+ 0.01125499E+03 0.03159753E+00 0.01177904E-04-0.01013352E-06 0.02947356E-10    2
+-0.07280344E+05-0.02238730E+03 0.01267161E+02 0.06214586E+00 0.01385631E-03    3
+-0.01220044E-05 0.08982019E-09-0.05425619E+05 0.02613306E+03                   4
+H3CONHO           103190C   1H   4N   1O   2G  0200.00   4000.00  1500.00      1
+ 0.01249270E+03 0.04773900E-01-0.04717255E-05-0.01987935E-08 0.03599460E-12    2
+-0.02354754E+05-0.03945442E+03 0.01930733E+02 0.02865910E+00-0.02313063E-03    3
+ 0.01068402E-06-0.02139376E-10 0.01638891E+05 0.01796108E+03                   4
+H3SIC              61991H   3C   1SI  1     G  0200.00   2500.00  1500.00      1
+ 0.08536022E+02 0.02944748E-01-0.01752614E-05-0.03061316E-08 0.06463710E-12    2
+ 0.07066730E+06-0.02041360E+03 0.01037017E+02 0.02192253E+00-0.01926062E-03    3
+ 0.08725014E-07-0.01615505E-10 0.07315849E+06 0.01939904E+03                   4
+H3SICCH            61991H   4C   2SI  1     G  0200.00   2500.00  1500.00      1
+ 0.01193845E+03 0.04298239E-01-0.01882154E-05-0.04212272E-08 0.08245783E-12    2
+ 0.02161639E+06-0.03978125E+03 0.01692389E+02 0.03078862E+00-0.02808630E-03    3
+ 0.01359918E-06-0.02690423E-10 0.02503587E+06 0.01453670E+03                   4
+H3SICH             61991H   4C   1SI  1     G  0200.00   2500.00  1500.00      1
+ 0.09747808E+02 0.03532863E-01-0.01540271E-05-0.03539077E-08 0.06992248E-12    2
+ 0.04253036E+06-0.02504347E+03 0.01710027E+02 0.02413212E+00-0.02164005E-03    3
+ 0.01035470E-06-0.02035579E-10 0.04522928E+06 0.01762908E+03                   4
+H3SICH2            61991H   5C   1SI  1     G  0200.00   2500.00  1500.00      1
+ 0.01050164E+03 0.04907525E-01-0.01523178E-05-0.05436598E-08 0.01082455E-11    2
+ 0.01632252E+06-0.02911264E+03 0.01199673E+02 0.02828259E+00-0.02394311E-03    3
+ 0.01103518E-06-0.02125819E-10 0.01948167E+06 0.02041804E+03                   4
+H3SICH3            61991H   6C   1SI  1     G  0200.00   2500.00  1500.00      1
+ 0.01022214E+03 0.07221275E-01-0.01482544E-05-0.09419140E-08 0.01956175E-11    2
+-0.08301660E+05-0.03163487E+03 0.01240228E+02 0.02729962E+00-0.01707597E-03    3
+ 0.05502474E-07-0.07521465E-11-0.05090007E+05 0.01692759E+03                   4
+H3SIN              22790H   3SI  1N   1     G  0200.00   4000.00  1000.00      1
+ 0.07964213E+02 0.03355633E-01-0.03579695E-05-0.01889818E-08 0.03650912E-12    2
+ 0.01148697E+07-0.01924110E+03 0.02790629E+02 0.01134566E+00 0.08321879E-05    3
+-0.05845045E-07 0.01685969E-10 0.01167357E+07 0.09384630E+02                   4
+H3SINH             42489SI  1N   1H   4     G  0200.00   3000.00  1000.00      1
+ 0.07697340E+02 0.05657943E-01-0.05209306E-05-0.05617966E-08 0.01263502E-11    2
+ 0.02282005E+06-0.01330379E+03 0.02778390E+02 0.01510711E+00-0.06734261E-05    3
+-0.08928515E-07 0.04115347E-10 0.02435913E+06 0.01309386E+03                   4
+H3SISIH           111191H   4SI  2          G  0200.00   4000.00  1500.00      1
+ 0.01127202E+03 0.02538145E-01-0.02998472E-05-0.09465367E-09 0.01855053E-12    2
+ 0.03297169E+06-0.03264598E+03 0.03698707E+02 0.01870180E+00-0.01430704E-03    3
+ 0.06005836E-07-0.01116293E-10 0.03590825E+06 0.08825191E+02                   4
+H3SISIH3           42489SI  2H   6          G  0200.00   3000.00  1000.00      1
+ 0.01068273E+03 0.08221416E-01-0.08096035E-05-0.08337975E-08 0.01908205E-11    2
+ 0.05316920E+05-0.03082188E+03 0.03898290E+02 0.01977415E+00 0.01791014E-05    3
+-0.01033168E-06 0.03931699E-10 0.07621719E+05 0.06227022E+02                   4
+HALME              62987AL  1C   1H   4     G  0200.00   1500.00  0600.00      1
+ 0.04812273E+02 0.01029645E+00 0.02582808E-05-0.03323597E-07 0.09884584E-11    2
+ 0.01176673E+06 0.09557062E+01 0.01118789E+02 0.02180038E+00 0.04120785E-04    3
+-0.04366690E-06 0.03273825E-09 0.01244736E+06 0.01886107E+03                   4
+HALME2             62987AL  1C   2H   7     G  0200.00   1500.00  0600.00      1
+ 0.05705172E+02 0.01924317E+00 0.06377855E-05-0.06346800E-07 0.01896800E-10    2
+-0.06049865E+05-0.06331378E+01-0.01494261E+02 0.04158568E+00 0.08686772E-04    3
+-0.08604142E-06 0.06447653E-09-0.04722517E+05 0.03427725E+03                   4
+HASALME            62987AS  1AL  1C   1H   4G  0200.00   1500.00  0600.00      1
+ 0.06956539E+02 0.01061278E+00 0.02440154E-05-0.03297737E-07 0.01020004E-10    2
+ 0.02582506E+06-0.08625792E+01 0.02544859E+02 0.02465795E+00 0.03677808E-04    3
+-0.05008894E-06 0.03848384E-09 0.02663010E+06 0.02046859E+03                   4
+HASGAET            62987AS  1GA  1C   2H   6G  0200.00   1500.00  0600.00      1
+ 0.06336445E+02 0.02340603E+00 0.09066638E-05-0.07519059E-07 0.01828115E-10    2
+ 0.03184605E+06 0.05812180E+02 0.05642724E+02 0.02296739E+00 0.01094867E-03    3
+-0.02449038E-06 0.09602701E-10 0.03204718E+06 0.09675533E+02                   4
+HASGAME            62987AS  1GA  1C   1H   4G  0200.00   1500.00  0600.00      1
+ 0.07507970E+02 0.09277900E-01 0.01891932E-05-0.02769887E-07 0.07996070E-11    2
+ 0.03253908E+06-0.01422608E+02 0.04859127E+02 0.01750423E+00 0.02831996E-04    3
+-0.03107937E-06 0.02299468E-09 0.03302941E+06 0.01142952E+03                   4
+HASME              62987AS  1C   1H   4     G  0200.00   1500.00  0600.00      1
+ 0.05753261E+02 0.01841813E+00 0.07493313E-05-0.05919917E-07 0.01726247E-10    2
+ 0.01880057E+06-0.05360325E+02-0.01575095E+01 0.03649094E+00 0.08332940E-04    3
+-0.07234666E-06 0.05330928E-09 0.01989792E+06 0.02335316E+03                   4
+HASME2             62987AS  1C   2H   7     G  0200.00   1500.00  0600.00      1
+ 0.05850437E+02 0.01841766E+00 0.08066845E-05-0.05868715E-07 0.01726428E-10    2
+ 0.06450535E+05 0.03909152E+01-0.02908405E+01 0.03729577E+00 0.08335855E-04    3
+-0.07455611E-06 0.05527881E-09 0.07587766E+05 0.03020451E+03                   4
+HCCCHCCH          101993H   3C   5          G  0200.00   4000.00  1400.00      1
+ 0.01412247E+03 0.04593411E-01-0.03738175E-05-0.02574329E-08 0.04539160E-12    2
+ 0.06249257E+06-0.04722335E+03 0.06854796E+02 0.01699404E+00-0.02582284E-04    3
+-0.05488765E-07 0.02281481E-10 0.06515364E+06-0.07133854E+02                   4
+HCCCL              40992H   1C   2CL  1     G  0200.00   4000.00  1500.00      1
+ 0.07743241E+02 0.01618655E-01-0.02465935E-05-0.02909336E-09 0.07522752E-13    2
+ 0.02472494E+06-0.01686593E+03 0.02969338E+02 0.01583152E+00-0.01787078E-03    3
+ 0.01017728E-06-0.02231985E-10 0.02620733E+06 0.07906791E+02                   4
+HCCHCCH            82489C   4H   3          G  0200.00   4000.00  1000.00      1
+ 0.01075274E+03 0.05381153E-01-0.05549638E-05-0.03052266E-08 0.05761740E-12    2
+ 0.06121419E+06-0.02973025E+03 0.04153882E+02 0.01726287E+00-0.02389374E-05    3
+-0.01018700E-06 0.04340505E-10 0.06338071E+06 0.06036507E+02                   4
+HCCO               32387H   1C   2O   1     G  0200.00   4000.00  1000.00      1
+ 0.06758073E+02 0.02000400E-01-0.02027607E-05-0.01041132E-08 0.01965165E-12    2
+ 0.01901513E+06-0.09071262E+02 0.05047965E+02 0.04453478E-01 0.02268283E-05    3
+-0.01482095E-07 0.02250742E-11 0.01965892E+06 0.04818439E+01                   4
+HCCOH              32387H   2C   2O   1     G  0200.00   4000.00  1000.00      1
+ 0.07328324E+02 0.03336416E-01-0.03024705E-05-0.01781106E-08 0.03245168E-12    2
+ 0.07598258E+05-0.01401214E+03 0.03899465E+02 0.09701075E-01-0.03119309E-05    3
+-0.05537732E-07 0.02465732E-10 0.08701190E+05 0.04491875E+02                   4
+HCCSICL2H          40992H   2C   2SI  1CL  2G  0200.00   4000.00  1500.00      1
+ 0.01480501E+03 0.02600965E-01-0.04631204E-05-0.02401379E-09 0.09812397E-13    2
+-0.02163059E+06-0.04610236E+03 0.04846840E+02 0.03181717E+00-0.03572068E-03    3
+ 0.01983339E-06-0.04248036E-10-0.01856223E+06 0.05613645E+02                   4
+HCL                42189CL  1H   1          G  0200.00   5000.00  1000.00      1
+ 0.02755335E+02 0.01473581E-01-0.04971254E-05 0.08108658E-09-0.05072063E-13    2
+-0.01191806E+06 0.06515116E+02 0.03338534E+02 0.01268207E-01-0.03666917E-04    3
+ 0.04703992E-07-0.01836011E-10-0.01213151E+06 0.03193555E+02                   4
+HCL2SICH3          40992H   4C   1SI  1CL  2G  0200.00   4000.00  1500.00      1
+ 0.01459366E+03 0.04006211E-01-0.04818700E-05-0.01336338E-08 0.02648821E-12    2
+-0.05346984E+06-0.04689795E+03 0.04155299E+02 0.02995026E+00-0.02799546E-03    3
+ 0.01433046E-06-0.03013208E-10-0.04973616E+06 0.09051815E+02                   4
+HCL2SISICL2H       40992H   2SI  2CL  4     G  0200.00   4000.00  1500.00      1
+ 0.01863092E+03 0.01991871E-01-0.04703153E-05 0.02393378E-09 0.02997096E-13    2
+-0.07983306E+06-0.05812192E+03 0.08215700E+02 0.03290751E+00-0.03764294E-03    3
+ 0.02071053E-06-0.04369767E-10-0.07671145E+06-0.04245506E+02                   4
+HCLCCCLO           40992H   1C   2 O  1CL  2G  0200.00   4000.00  1500.00      1
+ 0.01282877E+03 0.02295631E-01-0.04601887E-05-0.02941710E-09 0.01148412E-12    2
+-0.01481358E+06-0.03708152E+03 0.03082763E+02 0.03013466E+00-0.03298082E-03    3
+ 0.01776354E-06-0.03720337E-10-0.01177928E+06 0.01372635E+03                   4
+HCLCCHO            53090C   2H   2O   1CL  1G  0200.00   5000.00  1500.00      1
+ 0.01228193E+03 0.02136310E-01-0.03756942E-05-0.01347374E-09 0.05834907E-13    2
+-0.08447210E+05-0.03860056E+03 0.01544662E+02 0.02882431E+00-0.02921314E-03    3
+ 0.01557811E-06-0.03358528E-10-0.04546644E+05 0.01905110E+03                   4
+HCLSI(CH3)2        40992H   7C   2SI  1CL  1G  0200.00   4000.00  1500.00      1
+ 0.01779932E+03 0.06864497E-01-0.06677913E-05-0.02916791E-08 0.05251096E-12    2
+-0.04235416E+06-0.06627844E+03 0.03428693E+02 0.03880542E+00-0.03118298E-03    3
+ 0.01483918E-06-0.03097758E-10-0.03676770E+06 0.01220014E+03                   4
+HCLSI(CH3)CH2      40992H   6C   2SI  1CL  1G  0200.00   4000.00  1500.00      1
+ 0.01684996E+03 0.05769153E-01-0.06362653E-05-0.02117805E-08 0.04004912E-12    2
+-0.01692029E+06-0.05821970E+03 0.03518672E+02 0.03868692E+00-0.03578989E-03    3
+ 0.01856940E-06-0.03976975E-10-0.01207708E+06 0.01340137E+03                   4
+HCLSICH2           40992H   3C   1SI  1CL  1G  0200.00   4000.00  1500.00      1
+ 0.01094639E+03 0.03063482E-01-0.04057563E-05-0.07933510E-09 0.01649546E-12    2
+-0.03161099E+05-0.03101113E+03 0.02331473E+02 0.02712338E+00-0.02843577E-03    3
+ 0.01542443E-06-0.03288710E-10-0.03745104E+04 0.01417701E+03                   4
+HCLSICH3           40992H   4C   1SI  1CL  1G  0200.00   4000.00  1500.00      1
+ 0.01183446E+03 0.03802168E-01-0.04054360E-05-0.01478932E-08 0.02756845E-12    2
+-0.09669808E+05-0.03413556E+03 0.03061496E+02 0.02418432E+00-0.02072566E-03    3
+ 0.01016711E-06-0.02124115E-10-0.06367089E+05 0.01342892E+03                   4
+HCLSISI            40992H   1SI  2CL  1     G  0200.00   4000.00  1500.00      1
+ 0.08766356E+02 0.08352699E-02-0.01828719E-05 0.04227080E-10 0.01924493E-13    2
+ 0.03066829E+06-0.01515527E+03 0.05006777E+02 0.01170423E+00-0.01308663E-03    3
+ 0.07173085E-07-0.01520111E-10 0.03183531E+06 0.04414009E+02                   4
+HCN               110193H   1C   1N   1     G  0200.00   4000.00  1000.00      1
+ 0.03426457E+02 0.03924190E-01-0.01601138E-04 0.03161966E-08-0.02432850E-12    2
+ 0.01485552E+06 0.03607795E+02 0.02417787E+02 0.09031856E-01-0.01107727E-03    3
+ 0.07980141E-07-0.02311141E-10 0.01501044E+06 0.08222891E+02                   4
+HCNH               41687C   1H   2N   1     G  0200.00   4000.00  1000.00      1
+ 0.04923293E+02 0.03332897E-01-0.03370897E-05-0.01901619E-08 0.03531825E-12    2
+ 0.03132669E+06-0.01632509E+02 0.02759456E+02 0.06103387E-01 0.07713149E-05    3
+-0.02063094E-07 0.01931920E-11 0.03217247E+06 0.01057489E+03                   4
+HCNO              120186H   1C   1N   1O   1G  0250.00   4000.00  1000.00      1
+ 0.06692412E+02 0.02368360E-01-0.02371510E-05-0.01275503E-08 0.02407137E-12    2
+ 0.01694737E+06-0.01245434E+03 0.03184859E+02 0.09752316E-01-0.01280203E-04    3
+-0.06163104E-07 0.03226275E-10 0.01797907E+06 0.06123844E+02                   4
+HCO               121286H   1C   1O   1     G  0200.00   5000.00  1000.00      1
+ 0.03557271E+02 0.03345573E-01-0.01335006E-04 0.02470573E-08-0.01713851E-12    2
+ 0.03916324E+05 0.05552299E+02 0.02898330E+02 0.06199147E-01-0.09623084E-04    3
+ 0.01089825E-06-0.04574885E-10 0.04159922E+05 0.08983614E+02                   4
+HCO+              121286H   1C   1O   1E  -1G  0200.00   5000.00  1000.00      1
+ 0.03692074E+02 0.03454732E-01-0.01316524E-04 0.02323551E-08-0.01554132E-12    2
+ 0.09890941E+06 0.02330722E+02 0.02496483E+02 0.08690658E-01-0.01060445E-03    3
+ 0.07882791E-07-0.02418385E-10 0.09915097E+06 0.08048178E+02                   4
+HCOOH             103190C   1H   2O   2     G  0200.00   4000.00  1500.00      1
+ 0.07959698E+02 0.03024532E-01-0.03434242E-05-0.01326767E-08 0.02520240E-12    2
+-0.05027445E+06-0.01872208E+03 0.09326031E+01 0.01891002E+00-0.01554964E-03    3
+ 0.07290031E-07-0.01483695E-10-0.04760071E+06 0.01950653E+03                   4
+HE                120186HE  1               G  0200.00   5000.00  1000.00      1
+ 0.02500000E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+-0.07453750E+04 0.09153489E+01 0.02500000E+02 0.00000000E+00 0.00000000E+00    3
+ 0.00000000E+00 0.00000000E+00-0.07453750E+04 0.09153488E+01                   4
+HE+               120186HE  1E  -1          G  0200.00   5000.00  1000.00      1
+ 0.02500000E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+ 0.02853427E+07 0.01608405E+02 0.02500000E+02 0.00000000E+00 0.00000000E+00    3
+ 0.00000000E+00 0.00000000E+00 0.02853427E+07 0.01608405E+02                   4
+HF                121286H   1F   1          G  0200.00   5000.00  1000.00      1
+ 0.02956767E+02 0.07721015E-02-0.09899833E-06-0.04993521E-10 0.01429331E-13    2
+-0.03361061E+06 0.04011673E+02 0.03431841E+02 0.04404166E-02-0.08828452E-05    3
+ 0.06574516E-08-0.02055910E-12-0.03381977E+06 0.01238270E+02                   4
+HG2BR2(S)          81292BR  2HG  2          S  0200.00   1500.00  1000.00      1
+ 0.01131527E+03 0.05176237E-01-0.09149018E-05-0.01774353E-07 0.08208311E-11    2
+-0.02812664E+06-0.03960847E+03 0.09176256E+02 0.01716637E+00-0.02379101E-03    3
+ 0.01656353E-06-0.04492058E-10-0.02787921E+06-0.03016915E+03                   4
+HG2CL2(S)          81292CL  2HG  2          S  0200.00   1500.00  1000.00      1
+ 0.01170237E+03 0.03242224E-01-0.01018772E-05-0.03745899E-08 0.04682208E-12    2
+-0.03555571E+06-0.04461773E+03 0.01002375E+03 0.01031694E+00-0.01160577E-03    3
+ 0.08123549E-07-0.02343515E-10-0.03522627E+06-0.03658009E+03                   4
+HG2F2(S)           81292F   2HG  2          S  0200.00   1500.00  1000.00      1
+ 0.01156086E+03 0.03513290E-01-0.04228193E-06-0.06265655E-08 0.01191005E-11    2
+-0.06207291E+06-0.04780613E+03 0.01035013E+03 0.06139501E-01-0.03674693E-05    3
+-0.03011902E-07 0.01414143E-10-0.06172955E+06-0.04143495E+03                   4
+HG2I2(S)           81292HG  2I   2          S  0200.00   1500.00  1000.00      1
+ 0.01104021E+03 0.05724188E-01-0.09515335E-05-0.02149612E-07 0.09793057E-11    2
+-0.01777374E+06-0.03535439E+03 0.09788829E+02 0.01440390E+00-0.01844748E-03    3
+ 0.01180869E-06-0.02911372E-10-0.01774167E+06-0.03032197E+03                   4
+HGAET              62987GA  1C   2H   6     G  0200.00   1500.00  0600.00      1
+ 0.06580152E+02 0.01610132E+00 0.05009546E-05-0.05185148E-07 0.01524085E-10    2
+ 0.08765131E+05-0.04046067E+01 0.01163284E+02 0.03282213E+00 0.06765717E-04    3
+-0.06509541E-06 0.04835807E-09 0.09767174E+05 0.02588269E+03                   4
+HGAET2             62987GA  1C   4H  11     G  0200.00   1500.00  0600.00      1
+ 0.06511306E+02 0.02819754E+00 0.01418751E-04-0.09000947E-07 0.02572894E-10    2
+-0.04482180E+05 0.04709022E+02-0.01486576E+02 0.05217640E+00 0.01356342E-03    3
+-0.01011982E-05 0.07319854E-09-0.02985242E+05 0.04364749E+03                   4
+HGAME              62987GA  1C   1H   4     G  0200.00   1500.00  0600.00      1
+ 0.05318279E+02 0.09490931E-01 0.02277164E-05-0.03005070E-07 0.09037830E-11    2
+ 0.01253534E+06-0.01065710E+01 0.01784750E+02 0.02058861E+00 0.03548509E-04    3
+-0.04111927E-06 0.03108978E-09 0.01318422E+06 0.01700702E+03                   4
+HGAME2             62987GA  1C   2H   7     G  0200.00   1500.00  0600.00      1
+ 0.06759398E+02 0.01426103E+00-0.01174024E-05-0.05001401E-07 0.01502785E-10    2
+-0.01473265E+05-0.02967135E+02 0.09039155E+01 0.03264779E+00 0.05389244E-04    3
+-0.06814504E-06 0.05150323E-09-0.03978242E+04 0.02539305E+03                   4
+HGBR               81292BR  1HG  1          G  0200.00   5000.00  1000.00      1
+ 0.04470182E+02 0.01740022E-02-0.01782286E-06 0.03639776E-10-0.02699461E-14    2
+ 0.01118634E+06 0.07116504E+02 0.04325519E+02 0.06429246E-02-0.04527797E-05    3
+ 0.04543436E-09 0.06863204E-12 0.01121730E+06 0.07833202E+02                   4
+HGCL2              81292CL  2HG  1          G  0200.00   5000.00  1000.00      1
+ 0.07251462E+02 0.03082143E-02-0.01447555E-05 0.02958294E-09-0.02201214E-13    2
+-0.01981231E+06-0.06061846E+02 0.06249130E+02 0.03221573E-01-0.02109668E-04    3
+-0.07713536E-08 0.08526178E-11-0.01958242E+06-0.01015613E+02                   4
+HGCL2(S)           81292CL  2HG  1          S  0200.00   1500.00  1000.00      1
+ 0.07750329E+02 0.03529253E-01 0.03886646E-06-0.08307839E-08 0.02781535E-11    2
+-0.03009787E+06-0.02772331E+03 0.07611778E+02 0.05084911E-01-0.02887606E-04    3
+ 0.09093899E-08 0.04734468E-12-0.03015054E+06-0.02738100E+03                   4
+HGF2               81292F   2HG  1          G  0200.00   5000.00  1000.00      1
+ 0.06970407E+02 0.06373497E-02-0.02938029E-05 0.05925826E-09-0.04366956E-13    2
+-0.03751535E+06-0.08137829E+02 0.05155538E+02 0.05733727E-01-0.03667157E-04    3
+-0.01223692E-07 0.01370429E-10-0.03707844E+06 0.01073098E+02                   4
+HGF2(S)            81292F   2HG  1          S  0200.00   2000.00  1000.00      1
+ 0.08322627E+02 0.02317361E-01 0.02103511E-05-0.09665973E-09 0.01631405E-12    2
+-0.05342179E+06-0.03414006E+03 0.08250103E+02 0.02543387E-01-0.07218619E-06    3
+ 0.08044224E-09-0.03175138E-12-0.05340276E+06-0.03377085E+03                   4
+HGH                81292H   1HG  1          G  0200.00   5000.00  1000.00      1
+ 0.03674353E+02 0.01116618E-01-0.03728888E-05 0.07077644E-09-0.04984356E-13    2
+ 0.02745200E+06 0.04954799E+02 0.02859969E+02 0.03217363E-01-0.02993410E-04    3
+ 0.02267118E-07-0.08671660E-11 0.02771287E+06 0.09273314E+02                   4
+HGI                81292HG  1I   1          G  0200.00   5000.00  1000.00      1
+ 0.04487935E+02 0.03041356E-02-0.07219846E-07 0.01468881E-10-0.01089820E-14    2
+ 0.01470042E+06 0.08086309E+02 0.04411734E+02 0.05799910E-02-0.03475217E-05    3
+ 0.01593090E-08-0.01730073E-12 0.01471610E+06 0.08458668E+02                   4
+HGO                81292HG  1O   1          G  0200.00   5000.00  1000.00      1
+ 0.04192036E+02 0.04176084E-02-0.01658976E-05 0.03318185E-09-0.02429647E-13    2
+ 0.03713110E+05 0.04621457E+02 0.03235991E+02 0.03067171E-01-0.01992628E-04    3
+-0.04378690E-08 0.06018341E-11 0.03950193E+05 0.09495331E+02                   4
+HGO(S)             81292HG  1O   1          S  0200.00   1000.00  1000.00      1
+ 0.07146808E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+-0.01350616E+06-0.03327734E+03 0.02854835E+02 0.01115052E+00-0.01160794E-03    3
+ 0.06126729E-07-0.01377341E-10-0.01217635E+06-0.01067390E+03                   4
+HMEGAET            62987GA  1C   3H   9     G  0200.00   1500.00  0600.00      1
+ 0.07025463E+02 0.02564787E+00 0.09619100E-05-0.08403699E-07 0.02488960E-10    2
+-0.01361377E+05-0.03319484E+02-0.02079143E+02 0.05373076E+00 0.01181036E-03    3
+-0.01099855E-05 0.08189554E-09 0.03216961E+04 0.04086070E+03                   4
+HN(OH)2           103190H   3N   1O   2     G  0200.00   4000.00  1500.00      1
+ 0.09963640E+02 0.02864737E-01-0.03812930E-05-0.07443356E-09 0.01610124E-12    2
+-0.01662184E+06-0.02871770E+03 0.03244199E+01 0.02850544E+00-0.02753934E-03    3
+ 0.01337294E-06-0.02571777E-10-0.01354499E+06 0.02201480E+03                   4
+HN3                82687H   1N   3          G  0200.00   4000.00  1000.00      1
+ 0.06023015E+02 0.02454362E-01-0.02404279E-05-0.01322973E-08 0.02474146E-12    2
+ 0.03394051E+06-0.07015537E+02 0.03621003E+02 0.06030785E-01 0.04054460E-05    3
+-0.02545271E-07 0.06174280E-11 0.03482373E+06 0.06333769E+02                   4
+HNC                92392H   1C   1N   1     G  0200.00   5000.00  1500.00      1
+ 0.05283464E+02 0.01092476E-01-0.01170865E-05-0.02308672E-09 0.03950673E-13    2
+ 0.02012958E+06-0.06388218E+02 0.03592377E+02 0.05561340E-01-0.05936823E-04    3
+ 0.03782329E-07-0.09365092E-11 0.02079803E+06 0.02732160E+02                   4
+HNCN               62790C   1H   1N   2     G  0200.00   4000.00  1500.00      1
+ 0.07251951E+02 0.01587363E-01-0.01995579E-05-0.04841944E-09 0.09908280E-13    2
+ 0.03563666E+06-0.01312080E+03 0.02951908E+02 0.01245028E+00-0.01161611E-03    3
+ 0.05786108E-07-0.01175004E-10 0.03712483E+06 0.09811426E+02                   4
+HNCNH              62790C   1H   2N   2     G  0200.00   4000.00  1500.00      1
+ 0.08374143E+02 0.02366143E-01-0.03502324E-05-0.04391102E-09 0.01096859E-12    2
+ 0.01461088E+06-0.02107393E+03 0.01001985E+02 0.02464016E+00-0.02759770E-03    3
+ 0.01532472E-06-0.03268280E-10 0.01679368E+06 0.01694325E+03                   4
+HNCO              110193H   1C   1N   1O   1G  0200.00   4000.00  1400.00      1
+ 0.06545307E+02 0.01965760E-01-0.01562664E-05-0.01074318E-08 0.01874680E-12    2
+-0.01664773E+06-0.01003880E+03 0.03858467E+02 0.06390342E-01-0.09016628E-05    3
+-0.01898224E-07 0.07651380E-11-0.01562343E+06 0.04882493E+02                   4
+HNF                42489H   1N   1F   1     G  0200.00   3000.00  1000.00      1
+ 0.04133219E+02 0.01912057E-01-0.01625330E-05-0.01726461E-08 0.03743691E-12    2
+ 0.01467052E+06 0.03292122E+02 0.03249761E+02 0.03261818E-01 0.04355642E-06    3
+-0.01100277E-07 0.02926757E-11 0.01499126E+06 0.08187434E+02                   4
+HNF2               42489H   1N   1F   2     G  0200.00   3000.00  1000.00      1
+ 0.05704866E+02 0.03049897E-01-0.02826803E-05-0.02923185E-08 0.06551055E-12    2
+-0.09107488E+05-0.03941332E+02 0.02572812E+02 0.08762144E-01-0.02326921E-05    3
+-0.05000826E-07 0.02143838E-10-0.08086760E+05 0.01300681E+03                   4
+HNNHO             103190H   2N   2O   1     G  0200.00   4000.00  1500.00      1
+ 0.07462348E+02 0.03113521E-01-0.02614534E-05-0.01394601E-08 0.02363352E-12    2
+ 0.07517607E+05-0.01619293E+03 0.07974964E+01 0.01693171E+00-0.01141086E-03    3
+ 0.04201242E-07-0.06926417E-11 0.01010665E+06 0.02038765E+03                   4
+HNNO              103190H   1N   2O   1     G  0200.00   4000.00  1500.00      1
+ 0.06991217E+02 0.01875970E-01-0.02124584E-05-0.06710472E-09 0.01230508E-12    2
+ 0.02497566E+06-0.01123523E+03 0.02238298E+02 0.01359200E+00-0.01179873E-03    3
+ 0.05392971E-07-0.01010859E-10 0.02660259E+06 0.01413679E+03                   4
+HNNONO             10891H   1N   3O   2     G  0200.00   4000.00  1500.00      1
+ 0.01246747E+03 0.02018438E-01-0.03674474E-05-0.03459117E-09 0.01090810E-12    2
+ 0.02452278E+06-0.03868309E+03 0.02642670E+02 0.02625418E+00-0.02477878E-03    3
+ 0.01184374E-06-0.02298757E-10 0.02793182E+06 0.01383705E+03                   4
+HNO               121286H   1N   1O   1     G  0200.00   5000.00  1000.00      1
+ 0.03615144E+02 0.03212486E-01-0.01260337E-04 0.02267298E-08-0.01536236E-12    2
+ 0.01066191E+06 0.04810264E+02 0.02784403E+02 0.06609646E-01-0.09300223E-04    3
+ 0.09437980E-07-0.03753146E-10 0.01091878E+06 0.09035629E+02                   4
+HNO2              103190H   1N   1O   2     G  0200.00   4000.00  1500.00      1
+ 0.06479630E+02 0.01995274E-01-0.01740387E-05-0.09695872E-09 0.01701480E-12    2
+-0.09999271E+05-0.01067286E+03 0.01934838E+02 0.01010036E+00-0.04964616E-04    3
+ 0.08701120E-08-0.02324135E-13-0.08105484E+05 0.01473250E+03                   4
+HNO3              121286H   1N   1O   3     G  0200.00   5000.00  1000.00      1
+ 0.07003845E+02 0.05811493E-01-0.02333789E-04 0.04288814E-08-0.02959385E-12    2
+-0.01889952E+06-0.01047863E+03 0.01353185E+02 0.02220025E+00-0.01978812E-03    3
+ 0.08773908E-07-0.01658384E-10-0.01738563E+06 0.01851868E+03                   4
+HNOH              102290H   2N   1O   1     G  0200.00   4000.00  1500.00      1
+ 0.06396134E+02 0.01821067E-01-0.01870892E-05-0.07844472E-09 0.01444855E-12    2
+ 0.07859615E+05-0.01040479E+03 0.02125274E+02 0.01066282E+00-0.07602589E-04    3
+ 0.03081642E-07-0.05726498E-11 0.09553544E+05 0.01309672E+03                   4
+HO2                20387H   1O   2          G  0200.00   5000.00  1000.00      1
+ 0.04072191E+02 0.02131296E-01-0.05308145E-05 0.06112269E-09-0.02841165E-13    2
+-0.01579727E+04 0.03476029E+02 0.02979963E+02 0.04996697E-01-0.03790997E-04    3
+ 0.02354192E-07-0.08089024E-11 0.01762274E+04 0.09222724E+02                   4
+HOCH2OH           103190C   1H   4O   2     G  0200.00   4000.00  1500.00      1
+ 0.01089048E+03 0.04000443E-01-0.04729597E-05-0.01295970E-08 0.02552658E-12    2
+-0.05347440E+06-0.03540623E+03-0.06548874E+01 0.03377715E+00-0.03157595E-03    3
+ 0.01532216E-06-0.02994259E-10-0.04963411E+06 0.02579207E+03                   4
+HOCL               40992H   1 O  1CL  1     G  0200.00   4000.00  1500.00      1
+ 0.04953150E+02 0.01100053E-01-0.01256296E-05-0.03349951E-09 0.06464506E-13    2
+-0.01114737E+06-0.06838384E+01 0.02861399E+02 0.07134484E-01-0.07311028E-04    3
+ 0.03980236E-07-0.08506421E-11-0.01049306E+06 0.01021485E+03                   4
+HOCN              110193H   1C   1N   1O   1G  0200.00   4000.00  1400.00      1
+ 0.06022112E+02 0.01929530E-01-0.01455029E-05-0.01045811E-08 0.01794814E-12    2
+-0.04040321E+05-0.05866433E+02 0.03789424E+02 0.05387981E-01-0.06518270E-05    3
+-0.01420164E-07 0.05367969E-11-0.03135335E+05 0.06667052E+02                   4
+HOCO              103190C   1H   1O   2     G  0200.00   4000.00  1500.00      1
+ 0.07517634E+02 0.01259029E-01-0.01910901E-05-0.03136391E-09 0.07547673E-13    2
+-0.02634121E+06-0.01448392E+03 0.02285122E+02 0.01351435E+00-0.01160407E-03    3
+ 0.05047011E-07-0.09032231E-11-0.02448416E+06 0.01367874E+03                   4
+HONO               31787H   1N   1O   2     G  0200.00   5000.00  1000.00      1
+ 0.05486893E+02 0.04218065E-01-0.01649143E-04 0.02971877E-08-0.02021148E-12    2
+-0.01126865E+06-0.02997002E+02 0.02290413E+02 0.01409922E+00-0.01367872E-03    3
+ 0.07498780E-07-0.01876905E-10-0.01043195E+06 0.01328077E+03                   4
+HONO2             103190H   1N   1O   3     G  0200.00   4000.00  1500.00      1
+ 0.09756148E+02 0.01900948E-01-0.03240020E-05-0.03976639E-09 0.01100334E-12    2
+-0.01942244E+06-0.02690023E+03 0.07877668E+01 0.02382329E+00-0.02205964E-03    3
+ 0.01034048E-06-0.01972857E-10-0.01630442E+06 0.02108964E+03                   4
+HSI(CH3)2          61991H   7C   2SI  1     G  0200.00   2500.00  1500.00      1
+ 0.01220942E+03 0.09173338E-01-0.01186653E-05-0.01188590E-07 0.02418110E-11    2
+ 0.03781464E+05-0.03668250E+03 0.02568267E+02 0.03071446E+00-0.01863911E-03    3
+ 0.06210373E-07-0.09376544E-11 0.07271919E+05 0.01551808E+03                   4
+HSI(CH3)2CH2       61991H   9C   3SI  1     G  0200.00   2500.00  1500.00      1
+ 0.01723999E+03 0.01101475E+00-0.01546410E-05-0.01338650E-07 0.02653453E-11    2
+-0.02842083E+05-0.06077749E+03 0.03367732E+02 0.04430759E+00-0.03246598E-03    3
+ 0.01379387E-06-0.02586752E-10 0.02041653E+05 0.01367000E+03                   4
+HSI(CH3)3          61991H  10C   3SI  1     G  0200.00   2500.00  1500.00      1
+ 0.01689903E+03 0.01338224E+00-0.01538243E-05-0.01746233E-07 0.03550375E-11    2
+-0.02740327E+06-0.06121112E+03 0.03224459E+02 0.04373614E+00-0.02597404E-03    3
+ 0.08415742E-07-0.01236561E-10-0.02243583E+06 0.01289306E+03                   4
+HSI(NH2)2          22790SI  1H   5N   2     G  0200.00   4000.00  1000.00      1
+ 0.01171677E+03 0.05339021E-01-0.04667824E-05-0.02824087E-08 0.05080916E-12    2
+-0.01264169E+05-0.03245118E+03 0.06289699E+02 0.01675060E+00-0.01520878E-04    3
+-0.01070065E-06 0.05538641E-10 0.03154771E+04-0.03746008E+02                   4
+HSI(NH2)3          22790SI  1H   7N   3     G  0200.00   4000.00  1000.00      1
+ 0.01661406E+03 0.07395874E-01-0.06440010E-05-0.03918887E-08 0.07045959E-12    2
+-0.03859547E+06-0.05865318E+03 0.07070983E+02 0.02754435E+00-0.02603669E-04    3
+-0.01874567E-06 0.09778511E-10-0.03582658E+06-0.08209675E+02                   4
+HSIC               61991H   1C   1SI  1     G  0200.00   2500.00  1500.00      1
+ 0.05849544E+02 0.07628346E-02-0.09974130E-06-0.03811586E-09 0.08581471E-13    2
+ 0.09097438E+06-0.04862062E+02 0.03761288E+02 0.06108070E-01-0.05721172E-04    3
+ 0.02805116E-07-0.05597709E-11 0.09168219E+06 0.06236756E+02                   4
+HSICCH             61991H   2C   2SI  1     G  0200.00   2500.00  1500.00      1
+ 0.09098096E+02 0.02292999E-01-0.01278589E-05-0.01869017E-08 0.03514532E-12    2
+ 0.04933532E+06-0.02153271E+03 0.03799881E+02 0.01633703E+00-0.01551299E-03    3
+ 0.07880591E-07-0.01619982E-10 0.05109468E+06 0.06475363E+02                   4
+HSICH2             61991H   3C   1SI  1     G  0200.00   2500.00  1500.00      1
+ 0.08641686E+02 0.02535259E-01-0.01532829E-05-0.02418416E-08 0.04870000E-12    2
+ 0.03962671E+06-0.02128790E+03 0.02376883E+02 0.01822864E+00-0.01641260E-03    3
+ 0.07937691E-07-0.01590356E-10 0.04179768E+06 0.01215211E+03                   4
+HSICH3             61991H   4C   1SI  1     G  0200.00   2500.00  1500.00      1
+ 0.07578257E+02 0.05000398E-01-0.08706991E-06-0.06516750E-08 0.01344446E-11    2
+ 0.02138075E+06-0.01438961E+03 0.02658293E+02 0.01547950E+00-0.08319889E-04    3
+ 0.02184355E-07-0.02302844E-11 0.02319822E+06 0.01240552E+03                   4
+HSICL             121986SI  1H   1CL  1     G  0200.00   2000.00  1000.00      1
+ 0.04900628E+02 0.01981752E-01-0.03634647E-05-0.02285211E-08 0.07633527E-12    2
+ 0.06914634E+05 0.01377004E+02 0.03072748E+02 0.09057843E-01-0.01159134E-03    3
+ 0.08310477E-07-0.02483000E-10 0.07324210E+05 0.01033490E+03                   4
+HSIN               22790H   1SI  1N   1     G  0200.00   4000.00  1000.00      1
+ 0.05746590E+02 0.01167119E-01-0.01360742E-05-0.05908617E-09 0.01174696E-12    2
+ 0.04484671E+06-0.05931788E+02 0.04865176E+02 0.01775119E-01 0.04890870E-05    3
+ 0.03922383E-08-0.07913276E-11 0.04526353E+06-0.07134509E+01                   4
+HSINH              42489SI  1H   2N   1     G  0200.00   3000.00  1000.00      1
+ 0.06493435E+02 0.02567980E-01-0.03126526E-05-0.02577467E-08 0.06216479E-12    2
+ 0.04035934E+06-0.07830112E+02 0.03566343E+02 0.08446736E-01-0.07699952E-05    3
+-0.05270970E-07 0.02581065E-10 0.04124904E+06 0.07780791E+02                   4
+HSINH2             42489SI  1N   1H   3     G  0200.00   3000.00  1000.00      1
+ 0.06177894E+02 0.04689964E-01-0.03583294E-05-0.04457980E-08 0.09379187E-12    2
+ 0.01091277E+06-0.07006672E+02 0.02716144E+02 0.01204278E+00-0.09827195E-05    3
+-0.07408477E-07 0.03789792E-10 0.01190771E+06 0.01126252E+03                   4
+HSISICL            40992H   1SI  2CL  1     G  0200.00   4000.00  1500.00      1
+ 0.09242357E+02 0.07265211E-02-0.02039730E-05-0.03559737E-10 0.04236577E-13    2
+ 0.03651789E+06-0.01714597E+03 0.05753464E+02 0.01000321E+00-0.01097056E-03    3
+ 0.06117942E-07-0.01351102E-10 0.03773825E+06 0.01395110E+02                   4
+I*C3H7            120186C   3H   7          G  0200.00   5000.00  1000.00      1
+ 0.08063369E+02 0.01574488E+00-0.05182392E-04 0.07477245E-08-0.03854422E-12    2
+ 0.05313871E+05-0.02192647E+03 0.01713300E+02 0.02542616E+00 0.01580808E-04    3
+-0.01821286E-06 0.08827710E-10 0.07535809E+05 0.01297901E+03                   4
+K                  81092K   1               G  0200.00   5000.00  1000.00      1
+ 0.02563720E+02-0.01453656E-02 0.01223794E-05-0.05337797E-09 0.01196251E-12    2
+ 0.09958933E+05 0.04689090E+02 0.02599395E+02-0.06665192E-02 0.01537419E-04    3
+-0.01462701E-07 0.04917226E-11 0.09968534E+05 0.04606125E+02                   4
+K(L)               81092K   1               L  0200.00   2000.00  1000.00      1
+ 0.03274152E+02-0.08858241E-03 0.03862458E-05 0.01524701E-08-0.07158116E-12    2
+-0.05365253E+04-0.09686786E+02 0.04883188E+02-0.05109876E-01 0.08368289E-04    3
+-0.07183867E-07 0.02694974E-10-0.01014822E+05-0.01801753E+03                   4
+K+                 81092K   1E  -1          G  0200.00   5000.00  1000.00      1
+ 0.02500252E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+ 0.06110476E+06 0.04335097E+02 0.02500252E+02 0.00000000E+00 0.00000000E+00    3
+ 0.00000000E+00 0.00000000E+00 0.06110476E+06 0.04335097E+02                   4
+K2                 81092K   2               G  0200.00   5000.00  1000.00      1
+ 0.04493744E+02 0.02561175E-02-0.03738461E-07 0.07392168E-11-0.05314252E-15    2
+ 0.01393386E+06 0.04344696E+02 0.04445378E+02 0.04507960E-02-0.02923572E-05    3
+ 0.01874060E-08-0.04441270E-12 0.01394330E+06 0.04577300E+02                   4
+K2B4O7(S)          81292B   4K   2O   7     S  0200.00   2000.00  1000.00      1
+ 0.02241821E+03 0.01632758E+00-0.03423961E-04-0.01996427E-07 0.07329643E-11    2
+-0.04092750E+07-0.01095459E+04-0.02998519E+02 0.01131803E+01-0.01363625E-02    3
+ 0.07498933E-06-0.01475027E-09-0.04041216E+07 0.01385206E+03                   4
+K2B6O10(S)         81292B   6K   2O  10     S  0200.00   2000.00  1000.00      1
+ 0.03118760E+03 0.02605101E+00-0.07109914E-04-0.01524101E-07 0.08605891E-11    2
+-0.05702715E+07-0.01601394E+04 0.08964822E+02 0.01355307E+01-0.02844741E-02    3
+ 0.03136564E-05-0.01242126E-08-0.05641143E+07-0.05121922E+03                   4
+K2B8O13(S)         81292B   8K   2O  13     S  0200.00   2000.00  1000.00      1
+ 0.04112535E+03 0.02714051E+00 0.01343626E-04-0.04965544E-07 0.09664300E-11    2
+-0.07315279E+07-0.02135898E+04 0.02800687E+03 0.02363518E+00 0.05436592E-03    3
+-0.04802017E-06 0.07622581E-10-0.07248984E+07-0.01332889E+04                   4
+K2CO3(S)           81292C   1K   2O   3     S  0200.00   2000.00  1000.00      1
+ 0.01170935E+03 0.01041619E+00 0.01020812E-04-0.05155670E-08 0.09388472E-12    2
+-0.01424670E+07-0.05154899E+03 0.06680495E+02 0.03154875E+00-0.03258348E-03    3
+ 0.02341080E-06-0.06331882E-10-0.01414994E+07-0.02751031E+03                   4
+K2H2O2             81292H   2K   2O   2     G  0200.00   5000.00  1000.00      1
+ 0.09476007E+02 0.05520012E-01-0.02003512E-04 0.03416984E-08-0.02230089E-12    2
+-0.08204786E+06-0.01665546E+03 0.06069657E+02 0.01657159E+00-0.01641134E-03    3
+ 0.09628012E-07-0.02546013E-10-0.08118152E+06 0.05625929E+01                   4
+K2O(S)             81092K   2O   1          S  0200.00   2000.00  1000.00      1
+ 0.09200109E+02 0.04813529E-01-0.01018656E-04 0.08972973E-08-0.02121417E-11    2
+-0.04671154E+06-0.04264142E+03 0.02640315E+02 0.04577225E+00-0.09349357E-03    3
+ 0.08921012E-06-0.03044898E-09-0.04583697E+06-0.01392763E+03                   4
+K2O2(S)            81092K   2O   2          S  0200.00   2000.00  1000.00      1
+ 0.01094138E+03 0.06102309E-01 0.08639951E-05-0.02383978E-08 0.01021959E-12    2
+-0.06335114E+06-0.05099447E+03 0.08940024E+02 0.01225014E+00-0.08065365E-04    3
+ 0.07182271E-07-0.02627561E-10-0.06277485E+06-0.04066683E+03                   4
+K2SO4              81092K   2O   4S   1     G  0200.00   5000.00  1000.00      1
+ 0.01526056E+03 0.04272701E-01-0.01902870E-04 0.03745009E-08-0.02710228E-12    2
+-0.01368994E+07-0.04548655E+03 0.06620770E+02 0.02753542E+00-0.01909671E-03    3
+-0.04668391E-08 0.03385142E-10-0.01346318E+07-0.01043411E+02                   4
+K2SO4(A)           81092K   2O   4S   1     S  0200.00   1200.00  1000.00      1
+ 0.01112054E+03 0.01688473E+00 0.02694884E-04-0.06810694E-07 0.03326950E-10    2
+-0.01771853E+07-0.04766545E+03 0.05610137E+02 0.05334319E+00-0.08680538E-03    3
+ 0.08485600E-06-0.02978756E-09-0.01763645E+07-0.02358624E+03                   4
+K2SO4(B)           81092K   2O   4S   1     S  0200.00   1500.00  1000.00      1
+ 0.01400625E+03 0.08639256E-01 0.01734839E-04-0.01101018E-07 0.02493181E-11    2
+-0.01758863E+07-0.05931899E+03 0.01384030E+03 0.09154258E-01 0.01580722E-04    3
+-0.01673984E-07 0.06273504E-11-0.01758589E+07-0.05851410E+03                   4
+K3CL6AL(S)         81292AL  1CL  6K   3     S  0200.00   2000.00  1000.00      1
+ 0.02692199E+03 0.01202448E+00 0.05058586E-06-0.02459252E-07 0.06112274E-11    2
+-0.02602720E+07-0.01118533E+04 0.02756025E+03 0.01980910E-01 0.02914285E-03    3
+-0.03306608E-06 0.01153111E-09-0.02601182E+07-0.01132925E+04                   4
+K3CL9AL2(S)        81292AL  2CL  9K   3     S  0200.00   1500.00  1000.00      1
+ 0.04789960E+03-0.03698524E-01 0.01208277E-04 0.06439299E-07-0.01714364E-10    2
+-0.03594776E+07-0.02186357E+04 0.03685728E+03 0.02754220E-01 0.05087779E-03    3
+-0.06808868E-06 0.02773367E-09-0.03554758E+07-0.01561649E+04                   4
+K3F6AL(S)          81292AL  1F   6K   3     S  0200.00   2000.00  1000.00      1
+ 0.02557611E+03 0.01452585E+00-0.02005301E-04-0.01843642E-07 0.05259736E-11    2
+-0.04090259E+07-0.01172057E+04 0.01633462E+03 0.05150368E+00-0.07128115E-03    3
+ 0.06274052E-06-0.02251868E-09-0.04067185E+07-0.07147460E+03                   4
+KBF4               81292B   1F   4K   1     G  0200.00   5000.00  1000.00      1
+ 0.01230182E+03 0.04142506E-01-0.01820830E-04 0.03550730E-08-0.02552394E-12    2
+-0.01910389E+07-0.03449073E+03 0.05358002E+02 0.02295803E+00-0.01721231E-03    3
+ 0.02466718E-07 0.01382599E-10-0.01891819E+07 0.01299769E+02                   4
+KBO2               81292B   1K   1O   2     G  0200.00   5000.00  1000.00      1
+ 0.07506115E+02 0.02663024E-01-0.01134505E-04 0.02165299E-08-0.01532624E-12    2
+-0.08364206E+06-0.08262075E+02 0.04636629E+02 0.01088843E+00-0.09865937E-04    3
+ 0.04481115E-07-0.09043993E-11-0.08286314E+06 0.06500684E+02                   4
+KBO2(S)            81292B   1K   1O   2     S  0200.00   2000.00  1000.00      1
+ 0.07971486E+02 0.06730890E-01-0.01544574E-04-0.09972352E-08 0.04052630E-11    2
+-0.01227148E+07-0.03858371E+03 0.01603821E+02 0.03275175E+00-0.04757948E-03    3
+ 0.03848067E-06-0.01269093E-09-0.01212629E+07-0.07486101E+02                   4
+KBR                81292BR  1K   1          G  0200.00   5000.00  1000.00      1
+ 0.04458711E+02 0.01473836E-02-0.02499466E-06 0.05161851E-10-0.03875234E-14    2
+-0.02300303E+06 0.04657488E+02 0.04270624E+02 0.07398923E-02-0.05320569E-05    3
+-0.05894879E-10 0.01133094E-11-0.02296215E+06 0.05593031E+02                   4
+KBR(L)             81292BR  1K   1          L  0200.00   2500.00  1000.00      1
+ 0.08404630E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+-0.04779214E+06-0.03519115E+03 0.08404630E+02 0.00000000E+00 0.00000000E+00    3
+ 0.00000000E+00 0.00000000E+00-0.04779214E+06-0.03519115E+03                   4
+KBR(S)             81292BR  1K   1          S  0200.00   1500.00  1000.00      1
+-0.05170830E+02 0.01746852E+00 0.01013392E-04-0.07494241E-07 0.02378879E-10    2
+-0.04495981E+06 0.03946532E+03 0.05431605E+02 0.03845234E-01-0.03455247E-04    3
+-0.09685064E-09 0.02470977E-10-0.04912882E+06-0.02040493E+03                   4
+KCL                81092CL  1K   1          G  0200.00   5000.00  1000.00      1
+ 0.04434967E+02 0.01726721E-02-0.03865868E-06 0.07943251E-10-0.05932801E-14    2
+-0.02716306E+06 0.03398542E+02 0.04149517E+02 0.01039142E-01-0.07034589E-05    3
+-0.01200715E-08 0.02112008E-11-0.02709960E+06 0.04826011E+02                   4
+KCL(L)             81092CL  1K   1          L  0200.00   2000.00  1000.00      1
+ 0.08852542E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+-0.05337392E+06-0.04001344E+03 0.08852542E+02 0.00000000E+00 0.00000000E+00    3
+ 0.00000000E+00 0.00000000E+00-0.05337392E+06-0.04001344E+03                   4
+KCL(S)             81092CL  1K   1          S  0200.00   1500.00  1000.00      1
+ 0.01391136E+01 0.07749002E-01 0.02100056E-04-0.01960861E-07 0.03813962E-12    2
+-0.05188544E+06 0.09020889E+02 0.05818812E+02-0.05778791E-02 0.09593293E-04    3
+-0.01468548E-06 0.07916702E-10-0.05429399E+06-0.02336092E+03                   4
+KCL4AL(S)          81292AL  1CL  4K   1     S  0200.00   2000.00  1000.00      1
+ 0.02311946E+03 0.01525936E-01-0.06380630E-06-0.04176163E-08 0.01306884E-11    2
+-0.01521618E+07-0.01113391E+04 0.01753111E+03-0.03647218E-01 0.03673018E-03    3
+-0.03613268E-06 0.09813280E-10-0.01492592E+07-0.07647553E+03                   4
+KCLO4(S)           81092CL  1K   1O   4     S  0200.00   1500.00  1000.00      1
+ 0.01704025E+03 0.06660737E-01-0.06016704E-05 0.09785776E-08-0.05059647E-11    2
+-0.05676480E+06-0.08085843E+03-0.08468085E+02 0.01228758E+01-0.02129487E-02    3
+ 0.01790606E-05-0.05694776E-09-0.05181381E+06 0.04005509E+03                   4
+KCN                81092C   1K   1N   1     G  0200.00   5000.00  1000.00      1
+ 0.05842749E+02 0.01653475E-01-0.06722096E-05 0.01241081E-08-0.08573718E-13    2
+ 0.07711161E+05-0.03406482E+02 0.05315387E+02 0.03936776E-01-0.05387426E-04    3
+ 0.04814072E-07-0.01739264E-10 0.07842257E+05-0.08199391E+01                   4
+KCN(L)             81092C   1K   1N   1     L  0200.00   3000.00  1000.00      1
+ 0.09058883E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+-0.01522798E+06-0.03545687E+03 0.09058883E+02 0.00000000E+00 0.00000000E+00    3
+ 0.00000000E+00 0.00000000E+00-0.01522798E+06-0.03545687E+03                   4
+KCN(S)             81092C   1K   1N   1     S  0200.00   2000.00  1000.00      1
+ 0.07894013E+02 0.02150449E-02-0.01621315E-05 0.06831993E-09-0.01060712E-12    2
+-0.01600422E+06-0.02964975E+03 0.08115453E+02-0.08847082E-02 0.01981085E-04    3
+-0.01804607E-07 0.05974163E-11-0.01604356E+06-0.03067895E+03                   4
+KF                 81292F   1K   1          G  0200.00   5000.00  1000.00      1
+ 0.04357120E+02 0.02586241E-02-0.08236973E-06 0.01676907E-09-0.01243132E-13    2
+-0.04063861E+06 0.02285054E+02 0.03798984E+02 0.01885430E-01-0.01210870E-04    3
+-0.03741075E-08 0.04494632E-11-0.04051013E+06 0.05095577E+02                   4
+KF(L)              81292F   1K   1          L  0200.00   3000.00  1000.00      1
+ 0.08656265E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+-0.06927377E+06-0.04118344E+03 0.08656265E+02 0.00000000E+00 0.00000000E+00    3
+ 0.00000000E+00 0.00000000E+00-0.06927377E+06-0.04118343E+03                   4
+KF(S)              81292F   1K   1          S  0200.00   2000.00  1000.00      1
+ 0.03272299E+01 0.08993195E-01-0.03094381E-06-0.02624963E-07 0.07101532E-11    2
+-0.06804909E+06 0.05309298E+02 0.06190467E+02-0.05622034E-01 0.02294401E-03    3
+-0.02818213E-06 0.01204436E-09-0.07014057E+06-0.02637925E+03                   4
+KH                 81092H   1K   1          G  0200.00   5000.00  1000.00      1
+ 0.03968138E+02 0.07086924E-02-0.02618517E-05 0.05096044E-09-0.03655452E-13    2
+ 0.01350120E+06 0.08027413E+01 0.02900121E+02 0.03518317E-01-0.02544774E-04    3
+ 0.04599961E-08 0.01286229E-11 0.01379667E+06 0.06342766E+02                   4
+KH(S)              81092H   1K   1          S  0200.00   1500.00  1000.00      1
+ 0.05864564E+02 0.01204909E-01 0.02825877E-06 0.03559937E-08-0.02515747E-11    2
+-0.09079129E+05-0.02848776E+03 0.05248775E+01 0.02016870E+00-0.02768125E-03    3
+ 0.02024240E-06-0.06052568E-10-0.07796234E+05-0.01890097E+02                   4
+KI                 81092I   1K   1          G  0200.00   5000.00  1000.00      1
+ 0.04470767E+02 0.01359027E-02-0.01768799E-06 0.03648327E-10-0.02733674E-14    2
+-0.01644198E+06 0.05528315E+02 0.04327901E+02 0.05945793E-02-0.04409470E-05    3
+ 0.04559572E-09 0.06522621E-12-0.01641095E+06 0.06237795E+02                   4
+KI(L)              81092I   1K   1          L  0200.00   2500.00  1000.00      1
+ 0.08706593E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+-0.04022598E+06-0.03588112E+03 0.08706593E+02 0.00000000E+00 0.00000000E+00    3
+ 0.00000000E+00 0.00000000E+00-0.04022598E+06-0.03588112E+03                   4
+KI(S)              81092I   1K   1          S  0200.00   2000.00  1000.00      1
+ 0.01442913E+02 0.09802845E-01-0.01380615E-04-0.02325573E-07 0.07600708E-11    2
+-0.03988335E+06 0.02717618E+02 0.05114120E+02 0.08508960E-01-0.02212545E-03    3
+ 0.02836093E-06-0.01155892E-09-0.04120049E+06-0.01812497E+03                   4
+KO                 81092K   1O   1          G  0200.00   5000.00  1000.00      1
+ 0.04400291E+02 0.02386787E-02-0.05880047E-06 0.01206713E-09-0.09006961E-14    2
+ 0.07217110E+05 0.03434775E+02 0.03985333E+02 0.01469353E-01-0.09479054E-05    3
+-0.02419141E-08 0.03264700E-11 0.07311120E+05 0.05517902E+02                   4
+KO-                81092K   1O   1E   1     G  0200.00   5000.00  1000.00      1
+ 0.04394805E+02 0.02418371E-02-0.06146423E-06 0.01255348E-09-0.09326869E-14    2
+-0.01794565E+06 0.02053687E+02 0.03961007E+02 0.01526099E-01-0.09806386E-05    3
+-0.02666917E-08 0.03470232E-11-0.01784737E+06 0.04231682E+02                   4
+KO2(S)             81092K   1O   2          S  0200.00   1500.00  1000.00      1
+ 0.01049310E+03 0.01397618E-01-0.06976643E-05 0.03477427E-08-0.01222708E-11    2
+-0.03767516E+06-0.04607321E+03 0.04023244E+02 0.02903561E+00-0.04812416E-03    3
+ 0.03816613E-06-0.01168231E-09-0.03635805E+06-0.01502191E+03                   4
+KOH                81092H   1K   1O   1     G  0200.00   2000.00  1000.00      1
+ 0.09996477E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+-0.05262511E+06-0.04533806E+03 0.09996477E+02 0.00000000E+00 0.00000000E+00    3
+ 0.00000000E+00 0.00000000E+00-0.05262511E+06-0.04533805E+03                   4
+KOH+               81092H   1K   1O   1E  -1G  0200.00   5000.00  1000.00      1
+ 0.05583889E+02 0.01372118E-01-0.04239710E-05 0.06231942E-09-0.03548772E-13    2
+ 0.05821436E+06-0.02017959E+02 0.05036081E+02 0.04278173E-01-0.04213406E-04    3
+ 0.01114253E-07 0.03757057E-11 0.05823345E+06 0.03093667E+01                   4
+ME2GAET            62987GA  1C   4H  11     G  0200.00   1500.00  0600.00      1
+ 0.07174541E+02 0.03235532E+00 0.01495199E-04-0.01048226E-06 0.03053962E-10    2
+-0.06383914E+05-0.02026765E+02-0.03218207E+02 0.06398884E+00 0.01554552E-03    3
+-0.01284710E-05 0.09441259E-09-0.04451897E+05 0.04848091E+03                   4
+MEGAET             62987GA  1C   3H   8     G  0200.00   1500.00  0600.00      1
+ 0.06600990E+02 0.02284791E+00 0.01013375E-04-0.07318046E-07 0.02140197E-10    2
+ 0.04071593E+05 0.05239052E+01-0.08169937E+01 0.04554296E+00 0.01053133E-03    3
+-0.09079987E-06 0.06700564E-09 0.05448005E+05 0.03655502E+03                   4
+MEGAET2            62987GA  1C   5H  13     G  0200.00   1500.00  0600.00      1
+ 0.08123156E+02 0.03978908E+00 0.01690979E-04-0.01308415E-06 0.03852599E-10    2
+-0.08091057E+05-0.05039992E+02-0.05607499E+02 0.08187357E+00 0.01920530E-03    3
+-0.01678979E-05 0.01243354E-08-0.05546688E+05 0.06163371E+03                   4
+MG                 81292MG  1               G  0200.00   5000.00  1000.00      1
+ 0.02392633E+02 0.02085925E-02-0.01269898E-05 0.02553204E-09-0.04502495E-14    2
+ 0.01704914E+06 0.04211876E+02 0.02416375E+02 0.05325518E-02-0.01135514E-04    3
+ 0.09757325E-08-0.02898280E-11 0.01701992E+06 0.03983786E+02                   4
+MG(L)              81292MG  1               L  0200.00   2500.00  1000.00      1
+ 0.02664314E+02 0.01304526E-01-0.07547418E-07 0.06776047E-10-0.01436523E-13    2
+ 0.02234430E+04-0.01047801E+03 0.02161491E+02 0.04242991E-01-0.06464607E-04    3
+ 0.06116790E-07-0.02090033E-10 0.02996028E+04-0.08229090E+02                   4
+MG(S)              81292MG  1               S  0200.00   2000.00  1000.00      1
+ 0.02318547E+02 0.01929427E-01-0.01682130E-05 0.04131403E-09-0.01669293E-13    2
+-0.07634172E+04-0.09802473E+02 0.01505637E+02 0.09217769E-01-0.01955590E-03    3
+ 0.02020331E-06-0.07251403E-10-0.07226661E+04-0.06689818E+02                   4
+MG+                81292MG  1E  -1          G  0200.00   5000.00  1000.00      1
+ 0.02504405E+02-0.08920014E-04 0.06671727E-07-0.02081615E-10 0.02311490E-14    2
+ 0.01064936E+07 0.04292208E+02 0.02498282E+02 0.01465863E-03-0.03808341E-06    3
+ 0.04118195E-09-0.01573362E-12 0.01064953E+07 0.04322873E+02                   4
+MG2                81292MG  2               G  0200.00   5000.00  1000.00      1
+ 0.03671278E+02-0.02125120E-02 0.01013096E-05-0.02144628E-09 0.01719351E-13    2
+ 0.03362331E+06 0.08548934E+02 0.04345606E+02-0.02080614E-01 0.01110301E-04    3
+ 0.08675645E-08-0.07025087E-11 0.03346530E+06 0.05134171E+02                   4
+MG2BR4             81292BR  4MG  2          G  0200.00   5000.00  1000.00      1
+ 0.01577579E+03 0.02832096E-02-0.01343784E-05 0.02764443E-09-0.02066139E-13    2
+-0.09710095E+06-0.03457961E+03 0.01476089E+03 0.03361559E-01-0.02433120E-04    3
+-0.05502974E-08 0.08111758E-11-0.09687714E+06-0.02950851E+03                   4
+MG2C3(S)           81292C   3MG  2          S  0200.00   2500.00  1000.00      1
+ 0.01239169E+03 0.04624400E-01-0.02484800E-04 0.08656213E-08-0.01151950E-11    2
+ 0.05393315E+05-0.06051988E+03-0.01026610E+02 0.07016433E+00-0.01240220E-02    3
+ 0.01009934E-05-0.03082738E-09 0.07664551E+05 0.01701243E+02                   4
+MG2F4              81292F   4MG  2          G  0200.00   5000.00  1000.00      1
+ 0.01441927E+03 0.01917749E-01-0.08894670E-05 0.01801607E-08-0.01331627E-12    2
+-0.02113316E+07-0.04283410E+03 0.08770948E+02 0.01784847E+00-0.01109718E-03    3
+-0.04603306E-07 0.04695460E-10-0.02099919E+07-0.01422645E+03                   4
+MGAL2O4(S)         81292AL  2MG  1O   4     S  0200.00   2800.00  1000.00      1
+ 0.01495895E+03 0.08818509E-01-0.03160711E-04 0.01013391E-07-0.01228526E-11    2
+-0.02817956E+07-0.07811436E+03-0.04868005E+02 0.01055641E+01-0.01821902E-02    3
+ 0.01481432E-05-0.04514191E-09-0.02784436E+07 0.01382603E+03                   4
+MGB2(S)            81292B   2MG  1          S  0200.00   2000.00  1000.00      1
+ 0.06619755E+02 0.01322195E-01 0.04697857E-05 0.03681802E-08-0.01739753E-11    2
+-0.01346401E+06-0.03460640E+03 0.04176086E+02 0.06396544E-01-0.05616456E-04    3
+ 0.07092297E-07-0.03442529E-10-0.01255609E+06-0.02118159E+03                   4
+MGBR               81292BR  1MG  1          G  0200.00   5000.00  1000.00      1
+ 0.04385933E+02 0.01975075E-02-0.06117347E-06 0.01027103E-09-0.03876260E-14    2
+-0.05584836E+05 0.04357095E+02 0.03932960E+02 0.01518559E-01-0.09413456E-05    3
+-0.03806534E-08 0.04026288E-11-0.05481871E+05 0.06634707E+02                   4
+MGBR2              81292BR  2MG  1          G  0200.00   5000.00  1000.00      1
+ 0.07282371E+02 0.02671005E-02-0.01246470E-05 0.02534839E-09-0.01878437E-13    2
+-0.03865522E+06-0.05463838E+02 0.06436183E+02 0.02723204E-01-0.01828290E-04    3
+-0.05509276E-08 0.06681264E-11-0.03845914E+06-0.01198273E+02                   4
+MGBR2+             81292BR  2MG  1E  -1     G  0200.00   5000.00  1000.00      1
+ 0.07317323E+02 0.02252288E-02-0.01039562E-05 0.02025280E-09-0.01333602E-13    2
+ 0.08575141E+06-0.03144653E+02 0.06600891E+02 0.02322271E-01-0.01575443E-04    3
+-0.04621806E-08 0.05719750E-11 0.08591576E+06 0.04604670E+01                   4
+MGC2(S)            81292C   2MG  1          S  0200.00   2500.00  1000.00      1
+ 0.07427011E+02 0.02786444E-01-0.01500518E-04 0.05235992E-08-0.06981197E-12    2
+ 0.08069270E+05-0.03697419E+03-0.06510206E+01 0.04230993E+00-0.07491559E-03    3
+ 0.06109534E-06-0.01867195E-09 0.09434739E+05 0.04708862E+01                   4
+MGCL               81292CL  1MG  1          G  0200.00   5000.00  1000.00      1
+ 0.04335941E+02 0.02574531E-02-0.09346352E-06 0.01898185E-09-0.01405830E-13    2
+-0.06564693E+05 0.03214818E+02 0.03708081E+02 0.02069048E-01-0.01328293E-04    3
+-0.04347061E-08 0.05033764E-11-0.06418555E+05 0.06382778E+02                   4
+MGCL2              81292CL  2MG  1          G  0200.00   5000.00  1000.00      1
+ 0.07176871E+02 0.03917414E-02-0.01814155E-05 0.03670114E-09-0.02710187E-13    2
+-0.04941693E+06-0.07830507E+02 0.06000831E+02 0.03745347E-01-0.02447708E-04    3
+-0.07873749E-08 0.09100925E-11-0.04913880E+06-0.01880677E+02                   4
+MGCL2(S)           81292CL  2MG  1          S  0200.00   2000.00  1000.00      1
+ 0.08460549E+02 0.02204761E-01-0.06316590E-05 0.02617815E-08-0.05082748E-12    2
+-0.07983216E+06-0.03816537E+03 0.04852236E+02 0.02102714E+00-0.03667994E-03    3
+ 0.03032449E-06-0.09279303E-10-0.07928891E+06-0.02175204E+03                   4
+MGCO3(S)           81292C   1MG  1O   3     S  0200.00   1000.00  1000.00      1
+ 0.01585340E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+-0.01402924E+07-0.08639698E+03 0.01344667E+02 0.03695912E+00-0.04452165E-03    3
+ 0.03181716E-06-0.09745892E-10-0.01354278E+07-0.09041713E+02                   4
+MGF                81292F   1MG  1          G  0200.00   5000.00  1000.00      1
+ 0.04166004E+02 0.04434929E-02-0.01720072E-05 0.03280565E-09-0.02190876E-13    2
+-0.02980270E+06 0.02577443E+02 0.03172942E+02 0.03157075E-01-0.02008009E-04    3
+-0.04636928E-08 0.06097890E-11-0.02955269E+06 0.07654193E+02                   4
+MGF2               81292F   2MG  1          G  0200.00   5000.00  1000.00      1
+ 0.06314408E+02 0.08013760E-02-0.03622602E-05 0.07202929E-09-0.05250556E-13    2
+-0.08944590E+06-0.05637362E+02 0.04365511E+02 0.06150098E-01-0.04077014E-04    3
+-0.07490467E-08 0.01130754E-10-0.08895505E+06 0.04323487E+02                   4
+MGF2(S)            81292F   2MG  1          S  0200.00   2000.00  1000.00      1
+ 0.08170168E+02 0.02353222E-01-0.01060785E-04 0.02392788E-08-0.01594861E-12    2
+-0.01379692E+07-0.04083052E+03 0.01762995E+02 0.03056669E+00-0.04933989E-03    3
+ 0.03778577E-06-0.01108964E-09-0.01367476E+07-0.01039233E+03                   4
+MGF2+              81292F   2MG  1E  -1     G  0200.00   5000.00  1000.00      1
+ 0.06819974E+02 0.08267521E-02-0.03871799E-05 0.07864547E-09-0.05589085E-13    2
+ 0.06903427E+06-0.08313943E+02 0.04782002E+02 0.06580736E-01-0.04470059E-04    3
+-0.08656625E-08 0.01305586E-10 0.06953005E+06 0.02038302E+02                   4
+MGH                81292H   1MG  1          G  0200.00   5000.00  1000.00      1
+ 0.03501857E+02 0.01196289E-01-0.04870483E-05 0.09616032E-09-0.06566165E-13    2
+ 0.01915847E+06 0.02762077E+02 0.02929127E+02 0.02881565E-01-0.03702138E-04    3
+ 0.03761425E-07-0.01569289E-10 0.01935649E+06 0.05809553E+02                   4
+MGH2(S)            81292H   2MG  1          S  0200.00   2000.00  1000.00      1
+ 0.04503751E+02 0.05009365E-01-0.07076169E-05-0.09321345E-08 0.03016174E-11    2
+-0.01106837E+06-0.02418625E+03-0.09052193E+00 0.01938007E+00-0.01936573E-03    3
+ 0.01164904E-06-0.03397887E-10-0.09845471E+05-0.07606392E+01                   4
+MGH2O2             81292H   2MG  1O   2     G  0200.00   5000.00  1000.00      1
+ 0.08302454E+02 0.03712996E-01-0.01279645E-04 0.02102831E-08-0.01337217E-12    2
+-0.07153173E+06-0.01640682E+03 0.04724303E+02 0.01611746E+00-0.01291007E-03    3
+ 0.05703660E-08 0.02430663E-10-0.07085783E+06 0.09898885E+01                   4
+MGH2O2(S)          81292H   2MG  1O   2     S  0200.00   1000.00  1000.00      1
+ 0.01381001E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+-0.01162998E+07-0.07323205E+03-0.04220693E+02 0.07726916E+00-0.01383568E-02    3
+ 0.01155986E-05-0.03648025E-09-0.01123883E+07 0.01381610E+03                   4
+MGN                81292MG  1N   1          G  0200.00   5000.00  1000.00      1
+ 0.04177825E+02 0.04387980E-02-0.01726040E-05 0.03444124E-09-0.02516521E-13    2
+ 0.03340716E+06 0.02969357E+02 0.03200092E+02 0.03139739E-01-0.02045035E-04    3
+-0.04125930E-08 0.05937391E-11 0.03365107E+06 0.07958522E+02                   4
+MGO(S)             81292MG  1O   1          S  0200.00   4000.00  1000.00      1
+ 0.04857470E+02 0.01952289E-01-0.08605956E-05 0.02101340E-08-0.01886027E-12    2
+-0.07394488E+06-0.02524503E+03 0.01971740E+02 0.01095483E+00-0.08169910E-04    3
+-0.06359402E-08 0.02019714E-10-0.07332016E+06-0.01088662E+03                   4
+MGOH               81292H   1MG  1O   1     G  0200.00   5000.00  1000.00      1
+ 0.05156858E+02 0.01849251E-01-0.06339213E-05 0.01026031E-08-0.06282974E-13    2
+-0.02145938E+06-0.02774689E+02 0.03347871E+02 0.08101305E-01-0.06443066E-04    3
+ 0.02006805E-08 0.01261718E-10-0.02111816E+06 0.06024177E+02                   4
+MGOH+              81292H   1MG  1O   1E  -1G  0200.00   5000.00  1000.00      1
+ 0.05171484E+02 0.01835998E-01-0.06314934E-05 0.01036229E-08-0.06583402E-13    2
+ 0.06865354E+06-0.03526109E+02 0.03383351E+02 0.08055572E-01-0.06452790E-04    3
+ 0.02400212E-08 0.01246873E-10 0.06898753E+06 0.05158118E+02                   4
+MGS                81292MG  1S   1          G  0200.00   5000.00  1000.00      1
+ 0.01071331E+03-0.06086042E-01 0.02390833E-04-0.04174042E-08 0.02737530E-12    2
+ 0.01317442E+06-0.03521998E+03 0.03789723E+02-0.03985028E-01 0.02217192E-03    3
+-0.01858825E-06 0.03239714E-10 0.01635406E+06 0.05868810E+02                   4
+MGS(S)             81292MG  1S   1          S  0200.00   3000.00  1000.00      1
+ 0.05581918E+02 0.08031267E-02-0.01812239E-05 0.04113088E-09-0.02798069E-13    2
+-0.04331716E+06-0.02607368E+03 0.04076152E+02 0.07088011E-01-0.09604458E-04    3
+ 0.06056009E-07-0.01373560E-10-0.04304232E+06-0.01890776E+03                   4
+MGSO4(S)           81292MG  1O   4S   1     S  0200.00   2500.00  1000.00      1
+ 0.08845820E+02 0.01221900E+00-0.02141897E-04-0.09580988E-08 0.02954552E-11    2
+-0.01549512E+07-0.04302983E+03 0.02258418E+02 0.04788929E+00-0.07110586E-03    3
+ 0.05630850E-06-0.01709008E-09-0.01540505E+07-0.01345647E+03                   4
+N                 120186N   1               G  0200.00   5000.00  1000.00      1
+ 0.02450268E+02 0.01066146E-02-0.07465337E-06 0.01879652E-09-0.01025984E-13    2
+ 0.05611604E+06 0.04448758E+02 0.02503071E+02-0.02180018E-03 0.05420529E-06    3
+-0.05647560E-09 0.02099904E-12 0.05609890E+06 0.04167566E+02                   4
+N*C3H7            120186C   3H   7          G  0200.00   5000.00  1000.00      1
+ 0.07978291E+02 0.01576113E+00-0.05173243E-04 0.07443892E-08-0.03824978E-12    2
+ 0.07579402E+05-0.01935611E+03 0.01922537E+02 0.02478927E+00 0.01810249E-04    3
+-0.01783266E-06 0.08582996E-10 0.09713281E+05 0.01399271E+03                   4
+N2                121286N   2               G  0200.00   5000.00  1000.00      1
+ 0.02926640E+02 0.01487977E-01-0.05684761E-05 0.01009704E-08-0.06753351E-13    2
+-0.09227977E+04 0.05980528E+02 0.03298677E+02 0.01408240E-01-0.03963222E-04    3
+ 0.05641515E-07-0.02444855E-10-0.01020900E+05 0.03950372E+02                   4
+N2H2              121286N   2H   2          G  0200.00   5000.00  1000.00      1
+ 0.03371185E+02 0.06039968E-01-0.02303854E-04 0.04062789E-08-0.02713144E-12    2
+ 0.02418172E+06 0.04980585E+02 0.01617999E+02 0.01306312E+00-0.01715712E-03    3
+ 0.01605608E-06-0.06093639E-10 0.02467526E+06 0.01379467E+03                   4
+N2H3              120186N   2H   3          G  0200.00   5000.00  1000.00      1
+ 0.04441846E+02 0.07214271E-01-0.02495684E-04 0.03920565E-08-0.02298950E-12    2
+ 0.01664221E+06-0.04275205E+01 0.03174204E+02 0.04715907E-01 0.01334867E-03    3
+-0.01919685E-06 0.07487564E-10 0.01727270E+06 0.07557224E+02                   4
+N2H4              121286N   2H   4          G  0200.00   5000.00  1000.00      1
+ 0.04977317E+02 0.09595519E-01-0.03547639E-04 0.06124299E-08-0.04029795E-12    2
+ 0.09341219E+05-0.02962990E+02 0.06442606E+00 0.02749730E+00-0.02899451E-03    3
+ 0.01745240E-06-0.04422282E-10 0.01045192E+06 0.02127789E+03                   4
+N2H4(L)            90589H   4N   2          L  0200.00   0600.00  0450.00      1
+ 0.08890683E+02 0.08330343E-01 0.04945549E-04-0.04909251E-08-0.03355824E-10    2
+ 0.03032250E+05-0.03871433E+03 0.09047444E+02 0.09241592E-01 0.02263547E-04    3
+-0.08952247E-07 0.01486863E-09 0.02970393E+05-0.03974034E+03                   4
+N2O               121286N   2O   1          G  0200.00   5000.00  1000.00      1
+ 0.04718977E+02 0.02873714E-01-0.01197496E-04 0.02250552E-08-0.01575337E-12    2
+ 0.08165811E+05-0.01657250E+02 0.02543058E+02 0.09492193E-01-0.09792775E-04    3
+ 0.06263845E-07-0.01901826E-10 0.08765100E+05 0.09511222E+02                   4
+N2O+              121286N   2O   1E  -1     G  0200.00   5000.00  1000.00      1
+ 0.05398516E+02 0.02249478E-01-0.09577057E-05 0.01823193E-08-0.01284422E-12    2
+ 0.01584851E+07-0.03733146E+02 0.03187228E+02 0.08350714E-01-0.07894549E-04    3
+ 0.04597445E-07-0.01381075E-10 0.01591279E+07 0.07779426E+02                   4
+N2O4              121286N   2O   4          G  0200.00   5000.00  1000.00      1
+ 0.01048220E+03 0.05972272E-01-0.02564044E-04 0.04916885E-08-0.03490969E-12    2
+-0.02849989E+05-0.02612289E+03 0.03624593E+02 0.02474708E+00-0.02172875E-03    3
+ 0.09927104E-07-0.02222817E-10-0.09128241E+04 0.09457174E+02                   4
+N3                121286N   3               G  0200.00   5000.00  1000.00      1
+ 0.05208505E+02 0.02444507E-01-0.01038941E-04 0.01977417E-08-0.01395644E-12    2
+ 0.04796178E+06-0.03612756E+02 0.02882219E+02 0.08930338E-01-0.08539038E-04    3
+ 0.05045585E-07-0.01521248E-10 0.04863468E+06 0.08481757E+02                   4
+NA                 80792NA  1               G  0200.00   5000.00  1000.00      1
+ 0.02574480E+02-0.01605880E-02 0.01250641E-05-0.04516576E-09 0.06941745E-13    2
+ 0.01219129E+06 0.03830900E+02 0.02591348E+02-0.05961520E-02 0.01327651E-04    3
+-0.01211123E-07 0.03890067E-11 0.01220642E+06 0.03841789E+02                   4
+NA(L)              81092NA  1               L  0200.00   2000.00  1000.00      1
+ 0.04030581E+02-0.01320419E-01 0.04136604E-05 0.05486936E-08-0.01916626E-11    2
+-0.07899189E+04-0.01548589E+03 0.04682137E+02-0.03624112E-01 0.04776195E-04    3
+-0.03871514E-07 0.01518150E-10-0.09807172E+04-0.01881830E+03                   4
+NA+                80792NA  1E  -1          G  0200.00   5000.00  1000.00      1
+ 0.02500252E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+ 0.07260903E+06 0.03538490E+02 0.02500252E+02 0.00000000E+00 0.00000000E+00    3
+ 0.00000000E+00 0.00000000E+00 0.07260904E+06 0.03538490E+02                   4
+NA2                80792NA  2               G  0200.00   5000.00  1000.00      1
+ 0.04480669E+02 0.02178011E-02-0.01102830E-06 0.02208498E-10-0.01614866E-14    2
+ 0.01519313E+06 0.02073203E+02 0.04369675E+02 0.05850265E-02-0.03825359E-05    3
+ 0.08752245E-09 0.02980178E-12 0.01521703E+06 0.02622521E+02                   4
+NA2B4O7(S)         81292B   4NA  2O   7     S  0200.00   2000.00  1000.00      1
+ 0.02061542E+03 0.01728323E+00-0.04016503E-04-0.07600982E-08 0.05580242E-11    2
+-0.04014288E+07-0.01006093E+04 0.01430907E+02 0.01167214E+01-0.02000861E-02    3
+ 0.01698028E-05-0.05418888E-09-0.03982982E+07-0.01265829E+03                   4
+NA2B6O10(S)        81292B   6NA  2O  10     S  0200.00   2000.00  1000.00      1
+ 0.02989617E+03 0.03053411E+00-0.02146684E-04-0.04458443E-07 0.09406424E-11    2
+-0.05638429E+07-0.01571271E+04 0.09347958E+02 0.08948274E+00-0.01024848E-02    3
+ 0.01015647E-05-0.04314482E-09-0.05570116E+07-0.04828430E+03                   4
+NA2C2N2            81292C   2N   2NA  2     G  0200.00   5000.00  1000.00      1
+ 0.01253426E+03 0.03485206E-01-0.01426483E-04 0.02648455E-08-0.01838071E-12    2
+-0.05033986E+05-0.03087649E+03 0.01092445E+03 0.09724206E-01-0.01190420E-03    3
+ 0.08942515E-07-0.02847524E-10-0.04654688E+05-0.02294170E+03                   4
+NA2F2              80792F   2NA  2          G  0200.00   5000.00  1000.00      1
+ 0.09265403E+02 0.09044011E-02-0.04233919E-05 0.08630666E-09-0.06408558E-13    2
+-0.01047310E+07-0.01880290E+03 0.06422050E+02 0.09031559E-01-0.05593408E-04    3
+-0.02581729E-07 0.02547837E-10-0.01040718E+07-0.04453081E+02                   4
+NA2H2O2            80792H   2NA  2O   2     G  0200.00   5000.00  1000.00      1
+ 0.09347846E+02 0.05678318E-01-0.02077824E-04 0.03568716E-08-0.02342868E-12    2
+-0.07634945E+06-0.01850110E+03 0.05441492E+02 0.01814821E+00-0.01733029E-03    3
+ 0.09077551E-07-0.02055174E-10-0.07536770E+06 0.01240430E+02                   4
+NA2O(L)            81092NA  2O   1          L  0200.00   3000.00  1000.00      1
+ 0.01258178E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+-0.04859891E+06-0.06066678E+03 0.01258178E+03 0.00000000E+00 0.00000000E+00    3
+ 0.00000000E+00 0.00000000E+00-0.04859891E+06-0.06066677E+03                   4
+NA2O(S)            81092NA  2O   1          S  0200.00   2000.00  1000.00      1
+ 0.08804423E+02 0.03253428E-01-0.03530522E-05-0.04324117E-08 0.01394574E-11    2
+-0.05257507E+06-0.04209654E+03 0.04776964E+02 0.01483269E+00-0.01052247E-03    3
+ 0.01278469E-07 0.01046187E-10-0.05155651E+06-0.02156737E+03                   4
+NA2O2              81092NA  2O   2          S  0200.00   2500.00  1000.00      1
+ 0.01382402E+03-0.03556455E-02 0.02837263E-05-0.09701692E-09 0.01205762E-12    2
+-0.06583802E+06-0.06789536E+03 0.08035418E+02 0.05983777E-01 0.01935571E-03    3
+-0.03410482E-06 0.01439706E-09-0.06395152E+06-0.03604480E+03                   4
+NA2SO4             80792NA  2O   4S   1     G  0200.00   5000.00  1000.00      1
+ 0.01506456E+03 0.04508233E-01-0.02011474E-04 0.03963989E-08-0.02871466E-12    2
+-0.01296053E+07-0.04683857E+03 0.05752581E+02 0.02964118E+00-0.02035211E-03    3
+-0.01073243E-07 0.03960597E-10-0.01271767E+07 0.01016246E+02                   4
+NA2SO4(D)          81092NA  2O   4S   1     S  0200.00   1500.00  1000.00      1
+ 0.01062092E+03 0.01179912E+00 0.03608537E-04-0.03424054E-09-0.09650399E-11    2
+-0.01684493E+07-0.04191208E+03 0.01187237E+03 0.04287018E+00-0.09072926E-03    3
+ 0.09042235E-06-0.02940634E-09-0.01707163E+07-0.05750085E+03                   4
+NA2SO4(i)          81092NA  2O   4S   1     S  0200.00   1500.00  1000.00      1
+ 0.01711668E+03 0.05878399E-01 0.01196697E-04 0.01676018E-08-0.02640822E-11    2
+-0.01714447E+07-0.07997372E+03 0.01674756E+03 0.01133662E+00-0.01526634E-03    3
+ 0.01819548E-06-0.06918027E-10-0.01714932E+07-0.07899648E+03                   4
+NA2SO4(iii)        81092NA  2O   4S   1     S  0200.00   1000.00  1000.00      1
+ 0.03701786E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+-0.01854858E+07-0.02084472E+04 0.01413394E+03-0.01694491E+00 0.09403022E-03    3
+-0.07815722E-06 0.02395583E-09-0.01707247E+07-0.06037737E+03                   4
+NA2SO4(iv)         81092NA  2O   4S   1     S  0200.00   1000.00  1000.00      1
+ 0.02590382E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+-0.01779857E+07-0.01365608E+04 0.05917499E+02 0.04507074E+00-0.05672574E-03    3
+ 0.04596655E-06-0.01432523E-09-0.01702527E+07-0.02694892E+03                   4
+NA2SO4(v)          81092NA  2O   4S   1     S  0200.00   1000.00  1000.00      1
+ 0.02590382E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+-0.01780169E+07-0.01366284E+04 0.05917499E+02 0.04507074E+00-0.05672574E-03    3
+ 0.04596655E-06-0.01432523E-09-0.01702840E+07-0.02701654E+03                   4
+NA3CL6AL(S)        81292AL  1CL  6NA  3     S  0200.00   2000.00  1000.00      1
+ 0.02863182E+03 0.08169580E-01 0.01787040E-05-0.09984084E-08 0.01787581E-11    2
+-0.02473307E+07-0.01246570E+04 0.02610594E+03 0.09148861E-01 0.09743193E-04    3
+-0.01296166E-06 0.04124132E-10-0.02462808E+07-0.01099689E+04                   4
+NA3F6AL(S)         81292AL  1F   6NA  3     S  0200.00   1200.00  1000.00      1
+ 0.01867366E+03 0.02426805E+00 0.01311169E-04-0.01223061E-06 0.06326451E-10    2
+-0.04056682E+07-0.08492075E+03 0.01182130E+03 0.07831376E+00-0.01387551E-02    3
+ 0.01331742E-05-0.04620547E-09-0.04049948E+07-0.05693419E+03                   4
+NABH4(S)           81292B   1H   4NA  1     S  0200.00   2000.00  1000.00      1
+ 0.08204329E+02 0.01008304E+00-0.01032261E-04-0.02815504E-07 0.09005147E-11    2
+-0.02614390E+06-0.03790153E+03 0.08076391E+02 0.05407829E-01 0.01208139E-03    3
+-0.01450540E-06 0.04279918E-10-0.02580298E+06-0.03584760E+03                   4
+NABO2              81092B   1NA  1O   2     G  0200.00   5000.00  1000.00      1
+ 0.07449052E+02 0.02730088E-01-0.01165145E-04 0.02226924E-08-0.01578063E-12    2
+-0.08056425E+06-0.09194809E+02 0.04413702E+02 0.01144045E+00-0.01021892E-03    3
+ 0.04340556E-07-0.07548787E-11-0.07974780E+06 0.06401325E+02                   4
+NABO2(S)           81292B   1NA  1O   2     S  0200.00   2000.00  1000.00      1
+ 0.07820448E+02 0.06702746E-01-0.01488126E-04-0.01033983E-07 0.04130615E-11    2
+-0.01203511E+07-0.03848530E+03 0.01695994E+02 0.03131723E+00-0.04453876E-03    3
+ 0.03572163E-06-0.01178195E-09-0.01189335E+07-0.08471359E+02                   4
+NABR               81092BR  1NA  1          G  0200.00   5000.00  1000.00      1
+ 0.04424304E+02 0.01887477E-02-0.04500799E-06 0.09226701E-10-0.06871650E-14    2
+-0.01865205E+06 0.03707466E+02 0.04097639E+02 0.01170972E-01-0.07798224E-05    3
+-0.01611608E-08 0.02489549E-11-0.01857889E+06 0.05343556E+02                   4
+NABR(L)            81292BR  1NA  1          L  0200.00   2500.00  1000.00      1
+ 0.07498742E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+-0.04305332E+06-0.03017306E+03 0.07498742E+02 0.00000000E+00 0.00000000E+00    3
+ 0.00000000E+00 0.00000000E+00-0.04305333E+06-0.03017306E+03                   4
+NABR(S)            81292BR  1NA  1          S  0200.00   2000.00  1000.00      1
+ 0.05741811E+02 0.01766697E-01-0.01899553E-05 0.01473021E-09 0.01715605E-12    2
+-0.04526151E+06-0.02279248E+03 0.04706446E+02 0.08010188E-01-0.01346175E-03    3
+ 0.01196933E-06-0.03873765E-10-0.04513442E+06-0.01826015E+03                   4
+NACH               80792C   1N   1NA  1     G  0200.00   5000.00  1000.00      1
+ 0.05791865E+02 0.01708993E-01-0.06965832E-05 0.01288980E-08-0.08921502E-13    2
+ 0.09496355E+05-0.04320624E+02 0.05123989E+02 0.04411283E-01-0.05682223E-04    3
+ 0.04664804E-07-0.01593603E-10 0.09657925E+05-0.01032367E+02                   4
+NACL               81092CL  1NA  1          G  0200.00   5000.00  1000.00      1
+ 0.04393820E+02 0.02153336E-02-0.06198756E-06 0.01266879E-09-0.09427806E-14    2
+-0.02315864E+06 0.02486064E+02 0.03953003E+02 0.01514187E-01-0.09819465E-05    3
+-0.02807090E-08 0.03543574E-11-0.02305831E+06 0.04701214E+02                   4
+NACL(S)            81092CL  1NA  1          S  0200.00   1500.00  1000.00      1
+ 0.07639640E+02-0.03933726E-01 0.02071020E-04 0.04233998E-07-0.02204761E-10    2
+-0.05163684E+06-0.03397957E+03 0.04982695E+02 0.05432908E-01-0.07698454E-04    3
+ 0.06300821E-07-0.01211800E-10-0.05112201E+06-0.02104512E+03                   4
+NACL4AL(S)         81292AL  1CL  4NA  1     S  0200.00   2000.00  1000.00      1
+ 0.02138498E+03 0.03252454E-01-0.01769716E-05-0.07072990E-08 0.01928080E-11    2
+-0.01447874E+07-0.01021539E+04 0.01588411E+03 0.04527768E-01 0.02409928E-03    3
+-0.03108224E-06 0.01051706E-09-0.01424874E+07-0.07002475E+03                   4
+NACN               81092C   1N   1NA  1     G  0200.00   5000.00  1000.00      1
+ 0.05791865E+02 0.01708993E-01-0.06965832E-05 0.01288980E-08-0.08921502E-13    2
+ 0.09496355E+05-0.04320624E+02 0.05123989E+02 0.04411283E-01-0.05682223E-04    3
+ 0.04664804E-07-0.01593603E-10 0.09657925E+05-0.01032367E+02                   4
+NACN(S)            81292C   1N   1NA  1     S  0200.00   2000.00  1000.00      1
+ 0.08137501E+02 0.03044670E-02-0.01811052E-05 0.08281245E-09-0.01435891E-12    2
+-0.01334049E+06-0.03217693E+03 0.08239171E+02-0.05281579E-03 0.03829305E-05    3
+-0.03800801E-08 0.01401136E-11-0.01336670E+06-0.03268830E+03                   4
+NAF                80792F   1NA  1          G  0200.00   5000.00  1000.00      1
+ 0.04289078E+02 0.03377828E-02-0.01184403E-05 0.02398348E-09-0.01772778E-13    2
+-0.03626513E+06 0.01538309E+02 0.03532346E+02 0.02495132E-01-0.01587195E-04    3
+-0.04836335E-08 0.05739804E-11-0.03608573E+06 0.05367920E+02                   4
+NAF2-              81092F   2NA  1E   1     G  0200.00   5000.00  1000.00      1
+ 0.07032279E+02 0.05655084E-02-0.02615340E-05 0.05285863E-09-0.03900402E-13    2
+-0.08272088E+06-0.01028459E+03 0.05382830E+02 0.05231638E-01-0.03350411E-04    3
+-0.01169983E-07 0.01291137E-10-0.08232816E+06-0.01928436E+02                   4
+NAF4AL             81092AL  1F   4NA  1     G  0200.00   5000.00  1000.00      1
+ 0.01407161E+03 0.02285303E-01-0.01043457E-04 0.02090484E-08-0.01532874E-12    2
+-0.02260449E+07-0.04013149E+03 0.08103421E+02 0.01881143E+00-0.01205279E-03    3
+-0.03477927E-07 0.04123038E-10-0.02245760E+07-0.09731781E+02                   4
+NAH                80792H   1NA  1          G  0200.00   5000.00  1000.00      1
+ 0.03818649E+02 0.08597439E-02-0.03202059E-05 0.06146711E-09-0.04364567E-13    2
+ 0.01368120E+06 0.04367959E+01 0.02864363E+02 0.03308582E-01-0.02753919E-04    3
+ 0.01399522E-07-0.04032581E-11 0.01396756E+06 0.05450493E+02                   4
+NAI(S)             81292I   1NA  1          S  0200.00   2000.00  1000.00      1
+ 0.05987605E+02 0.01342139E-01-0.03807255E-06 0.01660138E-09-0.06066889E-13    2
+-0.03648630E+06-0.02270427E+03 0.05407032E+02 0.04235908E-01-0.05679955E-04    3
+ 0.04941357E-07-0.01602135E-10-0.03638396E+06-0.02000921E+03                   4
+NAO                80792NA  1O   1          G  0200.00   5000.00  1000.00      1
+ 0.04349803E+02 0.02849959E-02-0.08615992E-06 0.01754054E-09-0.01301677E-13    2
+ 0.08731694E+05 0.02618339E+02 0.03765728E+02 0.01980031E-01-0.01256303E-04    3
+-0.03909831E-08 0.04664039E-11 0.08866889E+05 0.05562273E+02                   4
+NAO-               80792NA  1O   1E   1     G  0200.00   5000.00  1000.00      1
+ 0.04343846E+02 0.02955424E-02-0.08923111E-06 0.01813572E-09-0.01343290E-13    2
+-0.01592823E+06 0.01245911E+02 0.03740064E+02 0.02044313E-01-0.01291719E-04    3
+-0.04080754E-08 0.04823669E-11-0.01578820E+06 0.04290303E+02                   4
+NAO2(S)            81092NA  1O   2          S  0200.00   2000.00  1000.00      1
+ 0.07379480E+02 0.04377048E-01 0.06355202E-05-0.03238946E-08 0.06014399E-12    2
+-0.03376432E+06-0.02946090E+03 0.07236605E+02 0.04751740E-01 0.03458707E-05    3
+-0.02971627E-08 0.09124652E-12-0.03372514E+06-0.02872050E+03                   4
+NAO2AL(S)          81292AL  1NA  1O   2     S  0200.00   3000.00  1000.00      1
+ 0.09963634E+02 0.02329677E-01-0.08188510E-07 0.02070425E-09-0.02306699E-12    2
+-0.01394255E+07-0.04932653E+03 0.03669741E+02 0.02226343E+00-0.01558734E-03    3
+-0.03446683E-07 0.05383614E-10-0.01381199E+07-0.01818990E+03                   4
+NAOH               80792H   1NA  1O   1     G  0200.00   5000.00  1000.00      1
+ 0.05527852E+02 0.01420623E-01-0.04439615E-05 0.06635639E-09-0.03866820E-13    2
+-0.02545869E+06-0.04374785E+02 0.04727895E+02 0.05001262E-01-0.04534391E-04    3
+ 0.07051240E-08 0.06671123E-11-0.02537947E+06-0.07649678E+01                   4
+NAOH(L)            81092H   1NA  1O   1     L  0200.00   2500.00  1000.00      1
+ 0.01061400E+03-0.03116447E-02-0.02964198E-05 0.05475463E-09 0.01021178E-12    2
+-0.05327943E+06-0.05120959E+03 0.01079389E+03-0.08545728E-02 0.03780039E-05    3
+-0.03848777E-08 0.01384542E-11-0.05332840E+06-0.05213201E+03                   4
+NAOH+              80792H   1NA  1O   1E  -1G  0200.00   5000.00  1000.00      1
+ 0.05570452E+02 0.01387979E-01-0.04311444E-05 0.06372652E-09-0.03648954E-13    2
+ 0.07985595E+06-0.02878876E+02 0.04974624E+02 0.04424591E-01-0.04296418E-04    3
+ 0.01067747E-07 0.04168198E-11 0.07988680E+06-0.03068088E+01                   4
+NCN               103190C   1N   2          G  0200.00   4000.00  1500.00      1
+ 0.06652121E+02 0.06108034E-02-0.01389727E-05 0.02695549E-10 0.01669944E-13    2
+ 0.05172403E+06-0.01138517E+03 0.03101270E+02 0.09981674E-01-0.09920701E-04    3
+ 0.04758919E-07-0.08968626E-11 0.05285757E+06 0.07317579E+02                   4
+NCO               110193C   1N   1O   1     G  0200.00   4000.00  1400.00      1
+ 0.06072346E+02 0.09227829E-02-0.09845574E-06-0.04764123E-09 0.09090445E-13    2
+ 0.01359820E+06-0.08507293E+02 0.03359593E+02 0.05393239E-01-0.08144585E-05    3
+-0.01912868E-07 0.07836794E-11 0.01462809E+06 0.06549694E+02                   4
+NF                121286N   1F   1          G  0200.00   5000.00  1000.00      1
+ 0.03862177E+02 0.07551806E-02-0.03044943E-05 0.05874447E-09-0.04187479E-13    2
+ 0.02867243E+06 0.03457233E+02 0.02871947E+02 0.03312193E-01-0.02691159E-04    3
+ 0.01121951E-07-0.02475131E-11 0.02896257E+06 0.08640247E+02                   4
+NFO               121286N   1F   1O   1     G  0200.00   5000.00  1000.00      1
+ 0.05174520E+02 0.01938472E-01-0.08222701E-05 0.01564291E-08-0.01104497E-12    2
+-0.09670935E+05-0.05352461E+01 0.03352307E+02 0.07229966E-01-0.06951137E-04    3
+ 0.03828526E-07-0.01023558E-10-0.09167035E+05 0.08854189E+02                   4
+NFO2              121286N   1F   1O   2     G  0200.00   5000.00  1000.00      1
+ 0.06816857E+02 0.03462640E-01-0.01492216E-04 0.02869665E-08-0.02041857E-12    2
+-0.01560262E+06-0.09320129E+02 0.02447529E+02 0.01544110E+00-0.01300595E-03    3
+ 0.04856383E-07-0.06852266E-11-0.01439400E+06 0.01328360E+03                   4
+NH                 31387H   1N   1          G  0200.00   5000.00  1000.00      1
+ 0.02760249E+02 0.01375346E-01-0.04451914E-05 0.07692792E-09-0.05017592E-13    2
+ 0.04207828E+06 0.05857199E+02 0.03339758E+02 0.01253009E-01-0.03491646E-04    3
+ 0.04218812E-07-0.01557618E-10 0.04185047E+06 0.02507181E+02                   4
+NH2               121686N   1H   2          G  0200.00   5000.00  1000.00      1
+ 0.02961311E+02 0.02932699E-01-0.09063600E-05 0.01617257E-08-0.01204200E-12    2
+ 0.02191977E+06 0.05777878E+02 0.03432493E+02 0.03299540E-01-0.06613600E-04    3
+ 0.08590947E-07-0.03572047E-10 0.02177228E+06 0.03090111E+02                   4
+NH3               121386N   1H   3          G  0200.00   5000.00  1000.00      1
+ 0.02461904E+02 0.06059166E-01-0.02004977E-04 0.03136003E-08-0.01938317E-12    2
+-0.06493270E+05 0.07472097E+02 0.02204352E+02 0.01011476E+00-0.01465265E-03    3
+ 0.01447235E-06-0.05328509E-10-0.06525488E+05 0.08127138E+02                   4
+NNH               120186N   2H   1          G  0250.00   4000.00  1000.00      1
+ 0.04415342E+02 0.01614388E-01-0.01632894E-05-0.08559846E-09 0.01614791E-12    2
+ 0.02788029E+06 0.09042888E+01 0.03501344E+02 0.02053587E-01 0.07170410E-05    3
+ 0.04921348E-08-0.09671170E-11 0.02833347E+06 0.06391837E+02                   4
+NO                121286N   1O   1          G  0200.00   5000.00  1000.00      1
+ 0.03245435E+02 0.01269138E-01-0.05015890E-05 0.09169283E-09-0.06275419E-13    2
+ 0.09800840E+05 0.06417294E+02 0.03376542E+02 0.01253063E-01-0.03302751E-04    3
+ 0.05217810E-07-0.02446263E-10 0.09817961E+05 0.05829590E+02                   4
+NO+               121286N   1O   1E  -1     G  0200.00   5000.00  1000.00      1
+ 0.02914889E+02 0.01499335E-01-0.05727972E-05 0.01017777E-08-0.06825390E-13    2
+ 0.01181869E+07 0.06844346E+02 0.03297349E+02 0.01422890E-01-0.04007441E-04    3
+ 0.05670551E-07-0.02446972E-10 0.01180834E+07 0.04749948E+02                   4
+NO2               121286N   1O   2          G  0200.00   5000.00  1000.00      1
+ 0.04682859E+02 0.02462429E-01-0.01042259E-04 0.01976902E-08-0.01391717E-12    2
+ 0.02261292E+05 0.09885985E+01 0.02670600E+02 0.07838501E-01-0.08063865E-04    3
+ 0.06161715E-07-0.02320150E-10 0.02896291E+05 0.01161207E+03                   4
+NO2-              121286N   1O   2E   1     G  0200.00   5000.00  1000.00      1
+ 0.05043114E+02 0.02166428E-01-0.09455454E-05 0.01816314E-08-0.01238394E-12    2
+-0.02621554E+06-0.01445905E+02 0.02448586E+02 0.08982507E-01-0.07853431E-04    3
+ 0.03927277E-07-0.01071694E-10-0.02545097E+06 0.01213060E+03                   4
+NO3               121286N   1O   3          G  0200.00   5000.00  1000.00      1
+ 0.07120307E+02 0.03246228E-01-0.01431613E-04 0.02797053E-08-0.02013008E-12    2
+ 0.05864479E+05-0.01213730E+03 0.01221076E+02 0.01878797E+00-0.01344321E-03    3
+ 0.01274601E-07 0.01354060E-10 0.07473144E+05 0.01840203E+03                   4
+O                 120186O   1               G  0200.00   5000.00  1000.00      1
+ 0.02542060E+02-0.02755062E-03-0.03102803E-07 0.04551067E-10-0.04368052E-14    2
+ 0.02923080E+06 0.04920308E+02 0.02946429E+02-0.01638166E-01 0.02421032E-04    3
+-0.01602843E-07 0.03890696E-11 0.02914764E+06 0.02963995E+02                   4
+O+                121286O   1E  -1          G  0200.00   5000.00  1000.00      1
+ 0.02501869E+02-0.06107262E-04 0.07324307E-07-0.03438353E-10 0.05506408E-14    2
+ 0.01879553E+07 0.04372827E+02 0.02499273E+02 0.05820598E-04-0.01120922E-06    3
+ 0.08232109E-10-0.01916378E-13 0.01879557E+07 0.04384826E+02                   4
+O-                 90589O   1E   1          G  0200.00   5000.00  1000.00      1
+ 0.02559581E+02-0.07147888E-03 0.03301804E-06-0.06660944E-10 0.04900727E-14    2
+ 0.01148935E+06 0.04426187E+02 0.02747263E+02-0.05724860E-02 0.02712548E-05    3
+ 0.02691512E-08-0.02002357E-11 0.01144395E+06 0.03469852E+02                   4
+O2                121386O   2               G  0200.00   5000.00  1000.00      1
+ 0.03697578E+02 0.06135197E-02-0.01258842E-05 0.01775281E-09-0.01136435E-13    2
+-0.01233930E+05 0.03189166E+02 0.03212936E+02 0.01127486E-01-0.05756150E-05    3
+ 0.01313877E-07-0.08768554E-11-0.01005249E+05 0.06034738E+02                   4
+O2-               121286O   2E   1          G  0200.00   5000.00  1000.00      1
+ 0.03883013E+02 0.07407872E-02-0.02961776E-05 0.05724305E-09-0.04086548E-13    2
+-0.07121644E+05 0.02658212E+02 0.02872292E+02 0.03359716E-01-0.02664886E-04    3
+ 0.09807524E-08-0.01670957E-11-0.06829094E+05 0.07938373E+02                   4
+O3                121286O   3               G  0200.00   5000.00  1000.00      1
+ 0.05429371E+02 0.01820380E-01-0.07705607E-05 0.01499293E-08-0.01075563E-12    2
+ 0.01523527E+06-0.03266387E+02 0.02462609E+02 0.09582781E-01-0.07087359E-04    3
+ 0.01363368E-07 0.02969647E-11 0.01606152E+06 0.01214187E+03                   4
+OC(OH)2           103190C   1H   2O   3     G  0200.00   4000.00  1500.00      1
+ 0.01143196E+03 0.02555103E-01-0.04326538E-05-0.05781341E-09 0.01545461E-12    2
+-0.07904865E+06-0.03657201E+03 0.03540332E+01 0.03042528E+00-0.02939616E-03    3
+ 0.01452934E-06-0.02906245E-10-0.07522630E+06 0.02250923E+03                   4
+OCHCHO            103190C   2H   2O   2     G  0200.00   4000.00  1500.00      1
+ 0.01056843E+03 0.02907353E-01-0.03452401E-05-0.01037593E-08 0.02042135E-12    2
+-0.02952623E+06-0.03104084E+03 0.01863564E+02 0.02298297E+00-0.01917997E-03    3
+ 0.08558604E-07-0.01612346E-10-0.02634847E+06 0.01601674E+03                   4
+OCHNNHO           103190C   1H   2N   2O   2G  0200.00   4000.00  1500.00      1
+ 0.01241397E+03 0.04091551E-01-0.04547841E-05-0.01752324E-08 0.03271472E-12    2
+-0.06754774E+05-0.04078722E+03 0.01405275E+02 0.02776281E+00-0.02088466E-03    3
+ 0.08550259E-07-0.01543486E-10-0.02537631E+05 0.01937723E+03                   4
+OH                121286O   1H   1          G  0200.00   5000.00  1000.00      1
+ 0.02882730E+02 0.01013974E-01-0.02276877E-05 0.02174684E-09-0.05126305E-14    2
+ 0.03886888E+05 0.05595712E+02 0.03637266E+02 0.01850910E-02-0.01676165E-04    3
+ 0.02387203E-07-0.08431442E-11 0.03606782E+05 0.01358860E+02                   4
+OH+               121286O   1H   1E  -1     G  0200.00   5000.00  1000.00      1
+ 0.02719059E+02 0.01508571E-01-0.05029369E-05 0.08261952E-09-0.04947453E-13    2
+ 0.01576341E+07 0.06234536E+02 0.03326979E+02 0.01345786E-01-0.03777168E-04    3
+ 0.04687750E-07-0.01780982E-10 0.01574029E+07 0.02744042E+02                   4
+OH-               121286O   1H   1E   1     G  0200.00   5000.00  1000.00      1
+ 0.02846205E+02 0.01041835E-01-0.02416851E-05 0.02483215E-09-0.07775605E-14    2
+-0.01807280E+06 0.04422712E+02 0.03390038E+02 0.07922381E-02-0.01943430E-04    3
+ 0.02001770E-07-0.05702087E-11-0.01830494E+06 0.01249892E+02                   4
+ONHNHO            103190H   2N   2O   2     G  0200.00   4000.00  1500.00      1
+ 0.01005510E+03 0.03525461E-01-0.03868362E-05-0.01298654E-08 0.02398500E-12    2
+ 0.07381692E+05-0.02950581E+03 0.07815142E+01 0.02605711E+00-0.02264714E-03    3
+ 0.01049925E-06-0.02012847E-10 0.01062778E+06 0.02017946E+03                   4
+ONHNOH            103190H   2N   2O   2     G  0200.00   4000.00  1500.00      1
+ 0.01120874E+03 0.02650303E-01-0.03760644E-05-0.06355768E-09 0.01466251E-12    2
+-0.05721250E+05-0.03476475E+03 0.01053271E+02 0.02809676E+00-0.02637380E-03    3
+ 0.01270757E-06-0.02478550E-10-0.02244769E+05 0.01937011E+03                   4
+S                 121286S   1               G  0200.00   5000.00  1000.00      1
+ 0.02902148E+02-0.05484546E-02 0.02764576E-05-0.05017115E-09 0.03150685E-13    2
+ 0.03249423E+06 0.03838471E+02 0.03187329E+02-0.01595776E-01 0.02005531E-04    3
+-0.01507081E-07 0.04931282E-11 0.03242259E+06 0.02414441E+02                   4
+S(L)              120186S   1               L  0388.36   2000.00  1000.00      1
+ 0.03603667E+02 0.09903341E-02-0.01011441E-04 0.04053633E-08-0.05667914E-12    2
+-0.08453839E+04-0.01634471E+03-0.01270631E+03 0.09072521E+00-0.01695179E-02    3
+ 0.01307064E-05-0.03527615E-09 0.01234607E+05 0.05621016E+03                   4
+S(S)              120186S   1               S  0200.00   0388.36  0388.36      1
+ 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+ 0.00000000E+00 0.00000000E+00-0.05063703E+02 0.02881935E-01-0.02133020E-03    3
+ 0.08478786E-05-0.01734497E-07 0.07148263E+04 0.02871407E+03                   4
+S+                121286S   1E  -1          G  0200.00   5000.00  1000.00      1
+ 0.02404600E+02 0.02410909E-02-0.02041780E-05 0.06592945E-09-0.05756939E-13    2
+ 0.01535223E+07 0.05924256E+02 0.02366101E+02 0.09130767E-02-0.02140284E-04    3
+ 0.02076178E-07-0.07133859E-11 0.01535091E+07 0.05993094E+02                   4
+S-TRIAZINE         41687C   3N   3H   3     G  0200.00   4000.00  1000.00      1
+ 0.01303617E+03 0.07711820E-01-0.07724374E-05-0.04385191E-08 0.08298992E-12    2
+ 0.02251663E+06-0.04777676E+03 0.04493492E+01 0.02728306E+00 0.02309305E-04    3
+-0.01496844E-06 0.04546753E-10 0.02703032E+06 0.02178518E+03                   4
+S2                121386S   2               G  0200.00   5000.00  1000.00      1
+ 0.03904443E+02 0.06925733E-02-0.01233097E-05 0.08783809E-11 0.01374662E-13    2
+ 0.01425693E+06 0.04956834E+02 0.03157673E+02 0.03099480E-01-0.01560746E-04    3
+-0.01357891E-07 0.01137444E-10 0.01439187E+06 0.08596062E+02                   4
+SH                121286S   1H   1          G  0200.00   5000.00  1000.00      1
+ 0.03053810E+02 0.01258884E-01-0.04249169E-05 0.06929591E-09-0.04281691E-13    2
+ 0.01588225E+06 0.05973551E+02 0.04133327E+02-0.03787893E-02-0.02777854E-04    3
+ 0.05370112E-07-0.02394006E-10 0.01555862E+06 0.01611535E+01                   4
+SI                 32989SI  1               G  0200.00   4000.00  1000.00      1
+ 0.02775846E+02-0.06213257E-02 0.04843696E-05-0.01275615E-08 0.01134482E-12    2
+ 0.05339791E+06 0.04543298E+02 0.03113515E+02-0.02330991E-01 0.03518531E-04    3
+-0.02417573E-07 0.06391902E-11 0.05335062E+06 0.03009719E+02                   4
+SI(CH3)2           61991H   6C   2SI  1     G  0200.00   2500.00  1500.00      1
+ 0.01092572E+03 0.07986807E-01-0.09096208E-06-0.01014552E-07 0.02037989E-11    2
+ 0.01132561E+06-0.02834187E+03 0.02308663E+02 0.02773810E+00-0.01799333E-03    3
+ 0.06733023E-07-0.01154743E-10 0.01442892E+06 0.01819319E+03                   4
+SI(CH3)3           61991H   9C   3SI  1     G  0200.00   2500.00  1500.00      1
+ 0.01536389E+03 0.01242119E+00-0.01189769E-05-0.01630302E-07 0.03308576E-11    2
+-0.05218398E+05-0.05088962E+03 0.03907073E+02 0.03734813E+00-0.02072025E-03    3
+ 0.06180575E-07-0.08429605E-11-0.01002462E+05 0.01138100E+03                   4
+SI(CH3)3CH2        61991H  11C   4SI  1     G  0200.00   2500.00  1500.00      1
+ 0.02061565E+03 0.01408136E+00-0.01497876E-05-0.01748111E-07 0.03468780E-11    2
+-0.01240235E+06-0.07596671E+03 0.05258771E+02 0.04995369E+00-0.03393958E-03    3
+ 0.01367592E-06-0.02513506E-10-0.06886708E+05 0.06814728E+02                   4
+SI(CH3)4           61991H  12C   4SI  1     G  0200.00   2500.00  1500.00      1
+ 0.02023461E+03 0.01648004E+00-0.01486572E-05-0.02161245E-07 0.04377236E-11    2
+-0.03702410E+06-0.07661021E+03 0.05009315E+02 0.04952953E+00-0.02745875E-03    3
+ 0.08231031E-07-0.01137614E-10-0.03140314E+06 0.06187860E+02                   4
+SI(L)              90589SI  1               L  0200.00   4500.00  1000.00      1
+ 0.03271263E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
+ 0.04855058E+05-0.01329054E+03 0.03271263E+02 0.00000000E+00 0.00000000E+00    3
+ 0.00000000E+00 0.00000000E+00 0.04855059E+05-0.01329054E+03                   4
+SI(NH2)3           42489SI  1N   3H   6     G  0200.00   3000.00  1000.00      1
+ 0.01406550E+03 0.07581744E-01-0.05168510E-05-0.06743626E-08 0.01397926E-11    2
+-0.01414403E+06-0.04063874E+03 0.07598413E+02 0.02435266E+00-0.04296202E-04    3
+-0.01756007E-06 0.01050102E-09-0.01265343E+06-0.07808647E+02                   4
+SI(NH2)4           22790SI  1N   4H   8     G  0200.00   4000.00  1000.00      1
+ 0.02032107E+03 0.08289798E-01-0.07077612E-05-0.04340724E-08 0.07747068E-12    2
+-0.05389855E+06-0.07730464E+03 0.08454529E+02 0.03465772E+00-0.04266782E-04    3
+-0.02495363E-06 0.01365466E-09-0.05061518E+06-0.01514301E+03                   4
+SI(S)              90589SI  1               S  0200.00   2500.00  1000.00      1
+ 0.02530275E+02 0.08522433E-02-0.03223469E-05 0.01280821E-08-0.01850849E-12    2
+-0.08395197E+04-0.01251478E+03 0.05746418E+01 0.01026485E+00-0.01775346E-03    3
+ 0.01457500E-06-0.04491292E-10-0.04969951E+04-0.03400243E+02                   4
+SI2               111191SI  2               G  0200.00   4000.00  1500.00      1
+ 0.04402888E+02 0.01154530E-02-0.06005177E-06 0.01469072E-09-0.01357408E-13    2
+ 0.07199220E+06 0.02340066E+02 0.03439839E+02 0.03440171E-01-0.04437681E-04    3
+ 0.02559961E-07-0.05474618E-11 0.07222934E+06 0.07148545E+02                   4
+SI2C              112989C   1SI  2          G  0200.00   5000.00  1000.00      1
+ 0.06334110E+02 0.01210252E-01-0.06798289E-05 0.02244433E-08-0.02280178E-12    2
+ 0.06227189E+06-0.07770097E+02 0.04157246E+02 0.07031825E-01-0.07263033E-04    3
+ 0.04633583E-07-0.01493448E-10 0.06292421E+06 0.03635126E+02                   4
+SI2CL5             40992SI  2CL  5          G  0200.00   4000.00  1500.00      1
+ 0.01800427E+03 0.05920529E-02-0.03159743E-05 0.07962538E-09-0.07553642E-13    2
+-0.08208587E+06-0.04815622E+03 0.01218195E+03 0.02086930E+00-0.02723261E-03    3
+ 0.01583266E-06-0.03404617E-10-0.08066122E+06-0.01913372E+03                   4
+SI2CL5H            40992H   1SI  2CL  5     G  0200.00   4000.00  1500.00      1
+ 0.01977366E+03 0.01346980E-01-0.04241463E-05 0.05994784E-09-0.03079337E-13    2
+-0.01018307E+07-0.05982624E+03 0.01104810E+03 0.02909474E+00-0.03536307E-03    3
+ 0.01998957E-06-0.04259074E-10-0.09941194E+06-0.01536396E+03                   4
+SI2CL6             40992SI  2CL  6          G  0200.00   4000.00  1500.00      1
+ 0.02095456E+03 0.06904584E-02-0.03881968E-05 0.01014163E-08-0.09844696E-13    2
+-0.01238540E+07-0.06426893E+03 0.01372380E+03 0.02622361E+00-0.03460508E-03    3
+ 0.02024950E-06-0.04371480E-10-0.01221143E+07-0.02834094E+03                   4
+SI2F6              42489SI  2F   6          G  0200.00   3000.00  1000.00      1
+ 0.01830048E+03 0.02868753E-01-0.04545577E-05-0.02497900E-08 0.06630658E-12    2
+-0.02928185E+07-0.05760425E+03 0.09998134E+02 0.02170314E+00-0.03875092E-04    3
+-0.01670252E-06 0.09407529E-10-0.02905483E+07-0.01422886E+03                   4
+SI2H2             111191H   2SI  2          G  0200.00   4000.00  1500.00      1
+ 0.08099063E+02 0.01294220E-01-0.02447198E-05-0.01449512E-09 0.05867240E-13    2
+ 0.04476428E+06-0.01877323E+03 0.09668390E+01 0.01932959E+00-0.01825422E-03    3
+ 0.08404012E-07-0.01537228E-10 0.04712241E+06 0.01907609E+03                   4
+SI2H3              90589SI  2H   3          G  0200.00   2000.00  1000.00      1
+ 0.07257627E+02 0.05123860E-01-0.07633465E-05-0.06662471E-08 0.02053053E-11    2
+ 0.05062055E+06-0.01031413E+03 0.03335404E+02 0.02155615E+00-0.02933937E-03    3
+ 0.02287785E-06-0.07272827E-10 0.05146157E+06 0.08656853E+02                   4
+SI2H5              90589SI  2H   5          G  0200.00   2000.00  1000.00      1
+ 0.08451010E+02 0.09286371E-01-0.01091183E-04-0.01442367E-07 0.04250825E-11    2
+ 0.02472719E+06-0.01710331E+03 0.01578848E+02 0.03549383E+00-0.04267511E-03    3
+ 0.03059177E-06-0.09360425E-10 0.02630550E+06 0.01672073E+03                   4
+SI2H6              90589SI  2H   6          G  0200.00   2000.00  1000.00      1
+ 0.08882090E+02 0.01151395E+00-0.01216216E-04-0.01905086E-07 0.05542379E-11    2
+ 0.05967242E+05-0.02265611E+03 0.05301921E+01 0.04184056E+00-0.04685249E-03    3
+ 0.03179525E-06-0.09484526E-10 0.07950598E+05 0.01880453E+03                   4
+SI3                32989SI  3               G  0200.00   4000.00  1000.00      1
+ 0.07021585E+02 0.06981538E-02-0.04818729E-05 0.01720754E-08-0.01927025E-12    2
+ 0.07429956E+06-0.08179233E+02 0.05312161E+02 0.05920181E-01-0.05075225E-04    3
+ 0.05303866E-08 0.07031630E-11 0.07469502E+06 0.04036452E+01                   4
+SI3H8              90589SI  3H   8          G  0200.00   2000.00  1000.00      1
+ 0.01342277E+03 0.01563632E+00-0.01936565E-04-0.02388330E-07 0.07120030E-11    2
+ 0.09165887E+05-0.04163000E+03 0.06319791E+01 0.06412995E+00-0.07772444E-03    3
+ 0.05486969E-06-0.01646097E-09 0.01209258E+06 0.02133318E+03                   4
+SI3N4(A)           42589N   4SI  3          S  0200.00   3000.00  1000.00      1
+ 0.09667453E+02 0.01192721E+00-0.01709282E-04-0.01084607E-07 0.02713018E-11    2
+-0.09324734E+06-0.04556492E+03 0.06631384E+02 0.02293929E+00-0.02152876E-03    3
+ 0.01766237E-06-0.06632215E-10-0.09241684E+06-0.03021795E+03                   4
+SIC               112989C   1SI  1          G  0200.00   5000.00  1000.00      1
+ 0.05024270E+02-0.04920894E-02 0.03109315E-05-0.06901344E-09 0.05215735E-13    2
+ 0.08531026E+06-0.02478798E+02 0.02427812E+02 0.09551934E-01-0.02796633E-04    3
+-0.01360012E-06 0.09196323E-10 0.08546512E+06 0.09179253E+02                   4
+SIC(B)            112989C   1SI  1          S  0200.00   4000.00  1000.00      1
+ 0.03548057E+02 0.03636817E-01-0.01734873E-04 0.03912869E-08-0.03337953E-12    2
+-0.01018858E+06-0.01967253E+03-0.03551396E+01 0.01599881E+00-0.01393327E-03    3
+ 0.03314914E-07 0.07825957E-11-0.09294352E+05-0.01515388E+01                   4
+SIC2              112989C   2SI  1          G  0200.00   5000.00  1000.00      1
+ 0.05753726E+02 0.02067546E-01-0.01132535E-04 0.03106456E-08-0.02799937E-12    2
+ 0.07200461E+06-0.05294927E+02 0.03647725E+02 0.08765100E-01-0.01079869E-03    3
+ 0.07974287E-07-0.02617042E-10 0.07258578E+06 0.05481050E+02                   4
+SICCH              61991H   1C   2SI  1     G  0200.00   2500.00  1500.00      1
+ 0.08229114E+02 0.01220783E-01-0.01179375E-05-0.03293923E-09 0.02957217E-13    2
+ 0.06029046E+06-0.01793033E+03 0.03946147E+02 0.01353938E+00-0.01476061E-03    3
+ 0.08141935E-07-0.01743041E-10 0.06163490E+06 0.04400106E+02                   4
+SICH               61991H   1C   1SI  1     G  0200.00   2500.00  1500.00      1
+ 0.06212049E+02 0.05590981E-02-0.07015929E-06 0.03497540E-09-0.01203199E-12    2
+ 0.06044180E+06-0.08520574E+02 0.03822068E+02 0.07938745E-01-0.09707239E-04    3
+ 0.05877454E-07-0.01338338E-10 0.06118631E+06 0.03835953E+02                   4
+SICH2              61991H   2C   1SI  1     G  0200.00   2500.00  1500.00      1
+ 0.06246250E+02 0.02147775E-01-0.06406396E-06-0.02067218E-08 0.03841890E-12    2
+ 0.03490992E+06-0.08995611E+02 0.02794283E+02 0.01138805E+00-0.01041700E-03    3
+ 0.05368052E-07-0.01132779E-10 0.03606279E+06 0.09246714E+02                   4
+SICH3              61991H   3C   1SI  1     G  0200.00   2500.00  1500.00      1
+ 0.06681751E+02 0.03837387E-01-0.06162348E-06-0.04678285E-08 0.09346313E-12    2
+ 0.03472013E+06-0.01022379E+03 0.02444652E+02 0.01367883E+00-0.09266249E-04    3
+ 0.03704818E-07-0.06763833E-11 0.03624755E+06 0.01263619E+03                   4
+SICL              121986SI  1CL  1          G  0200.00   2000.00  1000.00      1
+ 0.04258460E+02 0.04020317E-02-0.02888145E-05 0.01009777E-08-0.01411012E-12    2
+ 0.01775614E+06 0.04134521E+02 0.03096406E+02 0.05738623E-01-0.09740903E-04    3
+ 0.07643597E-07-0.02279179E-10 0.01796795E+06 0.09603212E+02                   4
+SICL2             121986SI  1CL  2          G  0200.00   2000.00  1000.00      1
+ 0.06491205E+02 0.08242384E-02-0.05767737E-05 0.01972405E-08-0.02713757E-12    2
+-0.02232408E+06-0.03570531E+02 0.03826666E+02 0.01308296E+00-0.02234087E-03    3
+ 0.01760742E-06-0.05267404E-10-0.02183869E+06 0.08965448E+02                   4
+SICL2H2           121986SI  1H   2CL  2     G  0200.00   2000.00  1000.00      1
+ 0.07727079E+02 0.05034189E-01-0.01095746E-04-0.04419587E-08 0.01631124E-11    2
+-0.04028605E+06-0.01170816E+03 0.01100209E+02 0.03262362E+00-0.04691995E-03    3
+ 0.03494565E-06-0.01036285E-09-0.03892087E+06 0.02022693E+03                   4
+SICL3             121986SI  1CL  3          G  0200.00   2000.00  1000.00      1
+ 0.09098097E+02 0.01405353E-01-0.09317005E-05 0.02982296E-08-0.03822011E-12    2
+-0.04140193E+06-0.01455012E+03 0.04485691E+02 0.02241754E+00-0.03794196E-03    3
+ 0.02973183E-06-0.08861335E-10-0.04055264E+06 0.07198771E+02                   4
+SICL3CH2CH         10891C   2CL  3H   5SI  1G  0200.00   4000.00  1500.00      1
+ 0.02087242E+03 0.05492755E-01-0.06829558E-05-0.01876697E-08 0.03787112E-12    2
+-0.07972510E+06-0.07741949E+03 0.04624781E+02 0.04378379E+00-0.03850522E-03    3
+ 0.01844376E-06-0.03709272E-10-0.07377043E+06 0.01029869E+03                   4
+SICL3H            121986SI  1H   1CL  3     G  0200.00   2000.00  1000.00      1
+ 0.09663121E+02 0.03563368E-01-0.01214911E-04-0.01609009E-09 0.05641710E-12    2
+-0.06295557E+06-0.01894777E+03 0.02883770E+02 0.03308241E+00-0.05169241E-03    3
+ 0.03949918E-06-0.01172104E-09-0.06163323E+06 0.01337466E+03                   4
+SICL4             121986SI  1CL  4          G  0200.00   2000.00  1000.00      1
+ 0.01170938E+03 0.01972092E-01-0.01269077E-04 0.03900188E-08-0.04756468E-12    2
+-0.08347808E+06-0.02791153E+03 0.05252110E+02 0.03122067E+00-0.05254593E-03    3
+ 0.04102707E-06-0.01219907E-09-0.08228177E+06 0.02575727E+02                   4
+SICLH3            121986SI  1H   3CL  1     G  0200.00   2000.00  1000.00      1
+ 0.05964238E+02 0.06278087E-01-0.08205635E-05-0.09280558E-08 0.02796643E-11    2
+-0.01854309E+06-0.06395305E+02 0.05057173E+01 0.02703378E+00-0.03301474E-03    3
+ 0.02302732E-06-0.06778703E-10-0.01730819E+06 0.02043167E+03                   4
+SIF                42489SI  1F   1          G  0200.00   3000.00  1000.00      1
+ 0.04120067E+02 0.03548821E-02-0.07200222E-06-0.02190434E-09 0.06764591E-13    2
+-0.07561378E+05 0.02784246E+02 0.03144948E+02 0.02588557E-01-0.05795912E-05    3
+-0.01807279E-07 0.01041172E-10-0.07294439E+05 0.07876774E+02                   4
+SIF(NH2)2          22790SI  1F   1N   2H   4G  0200.00   4000.00  1000.00      1
+ 0.01287944E+03 0.04598535E-01-0.04004441E-05-0.02374189E-08 0.04255211E-12    2
+-0.05238279E+06-0.03653418E+03 0.07210094E+02 0.01764698E+00-0.02542060E-04    3
+-0.01242214E-06 0.06989787E-10-0.05086706E+06-0.07024622E+02                   4
+SIF(NH2)3          42489SI  1N   3H   6F   1G  0200.00   3000.00  1000.00      1
+ 0.01611180E+03 0.08329222E-01-0.06023787E-05-0.07470125E-08 0.01570731E-11    2
+-0.09137007E+06-0.05098123E+03 0.08388268E+02 0.02746622E+00-0.04455675E-04    3
+-0.01955733E-06 0.01140721E-09-0.08947806E+06-0.01138178E+03                   4
+SIF2               42489SI  1F   2          G  0200.00   3000.00  1000.00      1
+ 0.06142470E+02 0.07807974E-02-0.01339312E-05-0.06264839E-09 0.01725138E-12    2
+-0.07744042E+06-0.04712327E+02 0.03845345E+02 0.06038465E-01-0.01167732E-04    3
+-0.04579554E-07 0.02607414E-10-0.07681634E+06 0.07272984E+02                   4
+SIF2(NH2)2         42489SI  1N   2H   4F   2G  0200.00   3000.00  1000.00      1
+ 0.01441477E+03 0.06110646E-01-0.04871145E-05-0.05455935E-08 0.01172714E-11    2
+-0.01292757E+07-0.04308682E+03 0.07634268E+02 0.02315843E+00-0.04193827E-04    3
+-0.01715351E-06 0.01016462E-09-0.01276410E+07-0.08419031E+02                   4
+SIF2N              42489SI  1N   1F   2     G  0200.00   3000.00  1000.00      1
+ 0.08687337E+02 0.01193488E-01-0.01992661E-05-0.09951334E-09 0.02704383E-12    2
+-0.03463832E+06-0.01494053E+03 0.05102583E+02 0.09456606E-01-0.01819383E-04    3
+-0.07309616E-07 0.04178902E-10-0.03367294E+06 0.03734424E+02                   4
+SIF2NH2            42489SI  1N   1F   2H   2G  0200.00   3000.00  1000.00      1
+ 0.09872415E+02 0.03722112E-01-0.03271338E-05-0.03321674E-08 0.07293692E-12    2
+-0.08751628E+06-0.01899096E+03 0.05890444E+02 0.01285128E+00-0.01863556E-04    3
+-0.08718963E-07 0.04848951E-10-0.08644527E+06 0.01756163E+02                   4
+SIF3               42489SI  1F   3          G  0200.00   3000.00  1000.00      1
+ 0.08524790E+02 0.01323792E-01-0.02104279E-05-0.01149504E-08 0.03055301E-12    2
+-0.01223522E+07-0.01550234E+03 0.04662868E+02 0.01008788E+00-0.01805544E-04    3
+-0.07769299E-07 0.04377852E-10-0.01212965E+07 0.04672966E+02                   4
+SIF3NH             42489SI  1N   1F   3H   1G  0200.00   3000.00  1000.00      1
+ 0.01163766E+03 0.02880769E-01-0.03357310E-05-0.02584594E-08 0.06162371E-12    2
+-0.01295891E+07-0.02590718E+03 0.06013822E+02 0.01597729E+00-0.02791466E-04    3
+-0.01214120E-06 0.06927415E-10-0.01280974E+07 0.03316771E+02                   4
+SIF3NH2            42489SI  1N   1F   3H   2G  0200.00   3000.00  1000.00      1
+ 0.01210964E+03 0.04383282E-01-0.04142245E-05-0.03989090E-08 0.08958954E-12    2
+-0.01641768E+07-0.03046928E+03 0.06229403E+02 0.01778015E+00-0.02612304E-04    3
+-0.01267243E-06 0.07044556E-10-0.01625849E+07 0.02045441E+01                   4
+SIF3NHSIH3         42489SI  2N   1H   4F   3G  0200.00   3000.00  1000.00      1
+ 0.01669941E+03 0.07789785E-01-0.08110570E-05-0.07650199E-08 0.01773956E-11    2
+-0.01673412E+07-0.05080007E+03 0.06216046E+02 0.02939330E+00-0.02717745E-04    3
+-0.01982878E-06 0.01002768E-09-0.01642282E+07 0.04858261E+02                   4
+SIF3NSIH3          42489SI  2N   1H   3F   3G  0200.00   3000.00  1000.00      1
+ 0.01599146E+03 0.06371086E-01-0.07256824E-05-0.06292690E-08 0.01495157E-11    2
+-0.01331158E+07-0.04495265E+03 0.06404372E+02 0.02601982E+00-0.02491543E-04    3
+-0.01769542E-06 0.08919883E-10-0.01302520E+07 0.06002945E+02                   4
+SIF4               41389F   4SI  1          G  0200.00   2000.00  1000.00      1
+ 0.09985301E+02 0.03532637E-01-0.01197378E-04-0.01036549E-08 0.08661585E-12    2
+-0.01977200E+07-0.02472644E+03 0.02147416E+02 0.03402219E+00-0.04756874E-03    3
+ 0.03252196E-06-0.08819304E-10-0.01960449E+07 0.01346315E+03                   4
+SIFH3              42489SI  1F   1H   3     G  0200.00   3000.00  1000.00      1
+ 0.06799678E+02 0.04747086E-01-0.04767067E-05-0.04814665E-08 0.01107761E-11    2
+-0.04577024E+06-0.01261433E+03 0.02032190E+02 0.01341363E+00-0.02806381E-05    3
+-0.07803291E-07 0.03337474E-10-0.04421627E+06 0.01318768E+03                   4
+SIFNH              42489SI  1N   1F   1H   1G  0200.00   3000.00  1000.00      1
+ 0.07163299E+02 0.01521325E-01-0.01536337E-05-0.01195933E-08 0.02684100E-12    2
+-0.09065496E+05-0.06764144E+02 0.05390691E+02 0.06071319E-01-0.01359490E-04    3
+-0.04267435E-07 0.02603154E-10-0.08644237E+05 0.02272065E+02                   4
+SIFNH2             22790F   1SI  1N   1H   2G  0200.00   4000.00  1000.00      1
+ 0.08017582E+02 0.03209103E-01-0.03361364E-05-0.01796537E-08 0.03385552E-12    2
+-0.04313426E+06-0.01487024E+03 0.04214050E+02 0.01105423E+00-0.01014725E-04    3
+-0.07143728E-07 0.03634923E-10-0.04200629E+06 0.05318890E+02                   4
+SIH               121986SI  1H   1          G  0200.00   2000.00  1000.00      1
+ 0.03110430E+02 0.01094946E-01 0.02898629E-06-0.02745104E-08 0.07051799E-12    2
+ 0.04516898E+06 0.04193487E+02 0.03836010E+02-0.02702657E-01 0.06849070E-04    3
+-0.05424184E-07 0.01472131E-10 0.04507593E+06 0.09350778E+01                   4
+SIH2               42489SI  1H   2          G  0200.00   3000.00  1000.00      1
+ 0.04142390E+02 0.02150191E-01-0.02190730E-05-0.02073725E-08 0.04741018E-12    2
+ 0.03110484E+06 0.02930745E+01 0.03475092E+02 0.02139338E-01 0.07672306E-05    3
+ 0.05217668E-08-0.09898824E-11 0.03147397E+06 0.04436585E+02                   4
+SIH2CL            121986SI  1H   2CL  1     G  0200.00   2000.00  1000.00      1
+ 0.05555902E+02 0.04046479E-01-0.06581751E-05-0.05027548E-08 0.01599110E-11    2
+ 0.01912428E+05-0.01906890E+02 0.01699256E+02 0.01961407E+00-0.02622973E-03    3
+ 0.01936417E-06-0.05846399E-10 0.02743662E+05 0.01683133E+03                   4
+SIH2F              42489SI  1F   1H   2     G  0200.00   3000.00  1000.00      1
+ 0.06020399E+02 0.03074040E-01-0.03248887E-05-0.03052243E-08 0.07098090E-12    2
+-0.02347670E+06-0.05919595E+02 0.02782566E+02 0.09148257E-01-0.04186788E-05    3
+-0.05388971E-07 0.02412133E-10-0.02244201E+06 0.01152854E+03                   4
+SIH2F2             42489SI  1H   2F   2     G  0200.00   3000.00  1000.00      1
+ 0.07997762E+02 0.03911538E-01-0.04222679E-05-0.03913812E-08 0.09171569E-12    2
+-0.09682880E+06-0.01622400E+03 0.02701455E+02 0.01456545E+00-0.01163300E-04    3
+-0.09685830E-07 0.04769591E-10-0.09522440E+06 0.01200689E+03                   4
+SIH3               42489SI  1H   3          G  0200.00   3000.00  1000.00      1
+ 0.05015906E+02 0.03732750E-01-0.03609053E-05-0.03729193E-08 0.08468490E-12    2
+ 0.02190233E+06-0.04291368E+02 0.02946733E+02 0.06466764E-01 0.05991653E-05    3
+-0.02218413E-07 0.03052670E-11 0.02270173E+06 0.07347948E+02                   4
+SIH3NH2            42489SI  1N   1H   5     G  0200.00   3000.00  1000.00      1
+ 0.08109945E+02 0.07215753E-01-0.06052251E-05-0.07086088E-08 0.01557864E-11    2
+-0.08999782E+05-0.01651650E+03 0.02936348E+02 0.01674704E+00-0.03232859E-05    3
+-0.09171970E-07 0.03979516E-10-0.07334716E+05 0.01141437E+03                   4
+SIH3NHSIH3         42489SI  2N   1H   7     G  0200.00   3000.00  1000.00      1
+ 0.01265296E+03 0.01066748E+00-0.01007336E-04-0.01081222E-07 0.02452364E-11    2
+-0.01249721E+06-0.03441428E+03 0.02468750E+02 0.02940255E+00-0.06248179E-05    3
+-0.01731462E-06 0.07545261E-10-0.09209690E+05 0.02059560E+03                   4
+SIH3NSIH3          42489SI  2N   1H   6     G  0200.00   3000.00  1000.00      1
+ 0.01201462E+03 0.09187517E-01-0.09159516E-05-0.09380967E-08 0.02156435E-11    2
+ 0.01965066E+06-0.02978186E+03 0.02827574E+02 0.02580647E+00-0.04200478E-05    3
+-0.01503859E-06 0.06388325E-10 0.02265351E+06 0.01997012E+03                   4
+SIH3SIH2CH3       111391H   8C   1SI  2     G  0200.00   4000.00  1500.00      1
+ 0.01886736E+03 0.06449996E-01-0.06896411E-05-0.02584789E-08 0.04830521E-12    2
+-0.06620909E+05-0.07374424E+03 0.02132164E+02 0.04348657E+00-0.03495608E-03    3
+ 0.01588231E-06-0.03150773E-10-0.02040937E+04 0.01752930E+03                   4
+SIH4              121386SI  1H   4          G  0200.00   4000.00  1000.00      1
+ 0.06893874E+02 0.04030501E-01-0.04183314E-05-0.02291395E-08 0.04384766E-12    2
+ 0.01107037E+05-0.01749117E+03 0.02475167E+02 0.09003721E-01 0.02185394E-04    3
+-0.02681423E-07-0.06621081E-11 0.02925488E+05 0.07751015E+02                   4
+SIHCL2            121986SI  1H   1CL  2     G  0200.00   2000.00  1000.00      1
+ 0.07229734E+02 0.02869206E-01-0.08849876E-05-0.07495866E-09 0.05752338E-12    2
+-0.01971399E+06-0.07052663E+02 0.02368353E+02 0.02401088E+00-0.03717220E-03    3
+ 0.02851998E-06-0.08530494E-10-0.01875884E+06 0.01614587E+03                   4
+SIHF               42489SI  1F   1H   1     G  0200.00   3000.00  1000.00      1
+ 0.05073509E+02 0.01533279E-01-0.01840659E-05-0.01440038E-08 0.03452517E-12    2
+-0.01973880E+06-0.01079507E+02 0.03223728E+02 0.04981221E-01-0.03173051E-05    3
+-0.02822231E-07 0.01247832E-10-0.01914168E+06 0.08906423E+02                   4
+SIHF2              42489SI  1H   1F   2     G  0200.00   3000.00  1000.00      1
+ 0.07216536E+02 0.02253240E-01-0.02737472E-05-0.02173460E-08 0.05255331E-12    2
+-0.07280241E+06-0.09783487E+02 0.03377237E+02 0.01036607E+00-0.01239082E-04    3
+-0.07267982E-07 0.03794989E-10-0.07168358E+06 0.01052189E+03                   4
+SIHF3              42489SI  1H   1F   3     G  0200.00   3000.00  1000.00      1
+ 0.09363567E+02 0.02947556E-01-0.03577633E-05-0.02858224E-08 0.06915729E-12    2
+-0.01486074E+07-0.02169453E+03 0.03918053E+02 0.01463917E+00-0.01856070E-04    3
+-0.01058200E-06 0.05617543E-10-0.01470439E+07 0.07024261E+02                   4
+SIN                42489SI  1N   1          G  0200.00   3000.00  1000.00      1
+ 0.04122909E+02 0.03521458E-02-0.07161081E-06-0.02154956E-09 0.06667571E-13    2
+ 0.05683927E+06 0.02389838E+02 0.03149182E+02 0.02584376E-01-0.05804625E-05    3
+-0.01805627E-07 0.01041095E-10 0.05710564E+06 0.07474389E+02                   4
+SINH               42489SI  1N   1H   1     G  0200.00   3000.00  1000.00      1
+ 0.04928801E+02 0.01628624E-01-0.01367197E-05-0.01390460E-08 0.02998969E-12    2
+ 0.01767790E+06-0.02823472E+02 0.03166975E+02 0.05805823E-01-0.09524443E-05    3
+-0.03991893E-07 0.02283188E-10 0.01813561E+06 0.06298440E+02                   4
+SINH2              42489SI  1N   1H   2     G  0200.00   3000.00  1000.00      1
+ 0.05186436E+02 0.03016656E-01-0.02165476E-05-0.02722658E-08 0.05706182E-12    2
+ 0.02270508E+06-0.01242140E+02 0.03362770E+02 0.07261176E-01-0.08721233E-05    3
+-0.04400014E-07 0.02419532E-10 0.02318446E+06 0.08223867E+02                   4
+SN                121286S   1N   1          G  0200.00   5000.00  1000.00      1
+ 0.03888287E+02 0.06778427E-02-0.02725309E-05 0.05135927E-09-0.03593836E-13    2
+ 0.03044496E+06 0.04194291E+02 0.03407346E+02 0.01797887E-01-0.02018970E-04    3
+ 0.02107857E-07-0.09527592E-11 0.03062373E+06 0.06821481E+02                   4
+SO                121286S   1O   1          G  0200.00   5000.00  1000.00      1
+ 0.04021078E+02 0.02584856E-02 0.08948142E-06-0.03580145E-09 0.03228430E-13    2
+-0.07119620E+04 0.03452523E+02 0.03080401E+02 0.01803106E-01 0.06705022E-05    3
+-0.02069005E-07 0.08514657E-11-0.03986163E+04 0.08581028E+02                   4
+SO2               121286S   1O   2          G  0200.00   5000.00  1000.00      1
+ 0.05254498E+02 0.01978545E-01-0.08204226E-05 0.01576383E-08-0.01120451E-12    2
+-0.03756886E+06-0.01146056E+02 0.02911439E+02 0.08103022E-01-0.06906710E-04    3
+ 0.03329016E-07-0.08777121E-11-0.03687882E+06 0.01111740E+03                   4
+SO3               121286S   1O   3          G  0200.00   5000.00  1000.00      1
+ 0.07050668E+02 0.03246560E-01-0.01408897E-04 0.02721535E-08-0.01942365E-12    2
+-0.05020668E+06-0.01106443E+03 0.02575283E+02 0.01515092E+00-0.01229872E-03    3
+ 0.04240257E-07-0.05266812E-11-0.04894411E+06 0.01219512E+03                   4
+CH2*              L S/93C   1H   2   00   00G   200.000  3500.000  1000.000    1
+ 2.29203842E+00 4.65588637E-03-2.01191947E-06 4.17906000E-10-3.39716365E-14    2
+ 5.09259997E+04 8.62650169E+00 4.19860411E+00-2.36661419E-03 8.23296220E-06    3
+-6.68815981E-09 1.94314737E-12 5.04968163E+04-7.69118967E-01 9.93967200E+03    4
+C2H3O             T04/83O   1H   3C   2    0G   200.000  5000.000              1
+ 0.59756699E+01 0.81305914E-02-0.27436245E-05 0.40703041E-09-0.21760171E-13    2
+ 0.49032178E+03-0.50320879E+01 0.34090624E+01 0.10738574E-01 0.18914925E-05    3
+ 0.71585831E-08 0.28673851E-11 0.15214766E+04 0.95714535E+01 0.30474436E+04    4
+PC3H4              40687C   3H   4          G  0200.00   5000.00  1000.00      1
+ 0.05511034E+02 0.01246956E+00-0.04814165E-04 0.08573769E-08-0.05771561E-12    2
+ 0.01961967E+06-0.01079475E+03 0.06271447E+01 0.03116179E+00-0.03747664E-03    3
+ 0.02964118E-06-0.09987382E-10 0.02083493E+06 0.01346880E+03                   4
+n-C4H3            HW /94C   4H   3    0    0G   200.000  3000.000              1
+ 0.54328279E+01 0.16860981E-01-0.94313109E-05 0.25703895E-08-0.27456309E-12    2
+ 0.61600680E+05-0.15673981E+01-0.31684113E+00 0.46912100E-01-0.68093810E-04    3
+ 0.53179921E-07-0.16523005E-10 0.62476199E+05 0.24622559E+02                   4
+i-C4H3            AB1/93C   4H   3    0    0G   200.000  3000.000              1
+ 0.90978165E+01 0.92207119E-02-0.33878441E-05 0.49160498E-09-0.14529780E-13    2
+ 0.56600574E+05-0.19802597E+02 0.20830412E+01 0.40834274E-01-0.62159685E-04    3
+ 0.51679358E-07-0.17029184E-10 0.58005129E+05 0.13617462E+02                   4
+n-C4H5            HW /94C   4H   5    0    0G   200.000  3000.000              1
+ 0.98501978E+01 0.10779008E-01-0.13672125E-05-0.77200535E-09 0.18366314E-12    2
+ 0.38840301E+05-0.26001846E+02 0.16305321E+00 0.39830137E-01-0.34000128E-04    3
+ 0.15147233E-07-0.24665825E-11 0.41429766E+05 0.23536163E+02                   4
+i-C4H5            HW /94C   4H   5    0    0G   200.000  3000.000              1
+ 0.10229092E+02 0.94850138E-02-0.90406445E-07-0.12596100E-08 0.24781468E-12    2
+ 0.34642812E+05-0.28564529E+02-0.19932900E-01 0.38005672E-01-0.27559450E-04    3
+ 0.77835551E-08 0.40209383E-12 0.37496223E+05 0.24394241E+02                   4
+C4H612            A 8/83C   4H   6    0    0G   200.     3000.     1000.0      1
+  0.1781557E 02 -0.4257502E-02  0.1051185E-04 -0.4473844E-08  0.5848138E-12    2
+  0.1267342E 05 -0.6982662E 02  0.1023467E 01  0.3495919E-01 -0.2200905E-04    3
+  0.6942272E-08 -0.7879187E-12  0.1811799E 05  0.1975066E 02  0.1950807E+05    4
+A1                HW /94C   6H   6    0    0G   200.000  3000.000              1
+ 0.17246994E+02 0.38420164E-02 0.82776232E-05-0.48961120E-08 0.76064545E-12    2
+ 0.26646055E+04-0.71945175E+02-0.48998680E+01 0.59806932E-01-0.36710087E-04    3
+ 0.32740399E-08 0.37600886E-11 0.91824570E+04 0.44095642E+02                   4
+C5H3               20387C   5H   3          G  0200.00   5000.00  1000.00      1
+ 0.01078762E+03 0.09539619E-01-0.03206745E-04 0.04733323E-08-0.02512135E-12    2
+ 0.06392904E+06-0.03005444E+03 0.04328720E+02 0.02352480E+00-0.05856723E-04    3
+-0.01215449E-06 0.07726478E-10 0.06588531E+06 0.04173259E+02                   4
+l-C6H4            HW /94C   6H   4    0    0G   200.000  3000.000              1
+ 0.12715182E+02 0.13839662E-01-0.43765440E-05 0.31541636E-09 0.46619026E-13    2
+ 0.57031148E+05-0.39464600E+02 0.29590225E+00 0.58053318E-01-0.67766756E-04    3
+ 0.43376762E-07-0.11418864E-10 0.60001371E+05 0.22318970E+02                   4
+n-C6H5            HW /94C   6H   5    0    0G   200.000  3000.000              1
+ 0.16070068E+02 0.81899539E-02 0.17325165E-05-0.20624185E-08 0.36292345E-12    2
+ 0.64616867E+05-0.56163742E+02-0.61135769E+00 0.65082610E-01-0.78262397E-04    3
+ 0.53030828E-07-0.14946683E-10 0.68805375E+05 0.27635468E+02                   4
+A1-               HW /94C   6H   5    0    0G   200.000  3000.000              1
+ 0.14493439E+02 0.75712688E-02 0.37894542E-05-0.30769500E-08 0.51347820E-12    2
+ 0.33189977E+05-0.54288940E+02-0.49076147E+01 0.59790771E-01-0.45639827E-04    3
+ 0.14964993E-07-0.91767826E-12 0.38733410E+05 0.46567780E+02                   4
+c-C6H4            HW /94C   6H   4    0    0G   200.000  3000.000              1
+ 0.13849209E+02 0.78807920E-02 0.18243836E-05-0.21169166E-08 0.37459977E-12    2
+ 0.47446340E+05-0.50404953E+02-0.30991268E+01 0.54030564E-01-0.40839004E-04    3
+ 0.10738837E-07 0.98078490E-12 0.52205711E+05 0.37415207E+02                   4
+l-C6H6            HW /94C   6H   6    0    0G   200.000  3000.000              1
+ 0.10874918E+02 0.23293324E-01-0.94495535E-05 0.16255329E-08-0.84771200E-13    2
+ 0.36224055E+05-0.30326756E+02 0.59114441E-01 0.55723339E-01-0.43485274E-04    3
+ 0.14487391E-07-0.52512541E-12 0.39042688E+05 0.24796795E+02                   4
+n-C6H7            HW /94C   6H   7    0    0G   200.000  3000.000              1
+ 0.22577469E+02-0.30737517E-02 0.14225234E-04-0.69880848E-08 0.10232874E-11    2
+ 0.41228980E+05-0.91568619E+02 0.13248032E+00 0.57103366E-01-0.43712644E-04    3
+ 0.15538603E-07-0.12976356E-11 0.47730512E+05 0.25339081E+02                   4
+c-C6H7            HW /94C   6H   7    0    0G   200.000  3000.000              1
+ 0.19996841E+02 0.11189543E-02 0.11649756E-04-0.62779471E-08 0.94939508E-12    2
+ 0.16730059E+05-0.83746933E+02-0.30328493E+01 0.50804518E-01-0.69150292E-05    3
+-0.29715974E-07 0.16296353E-10 0.23895383E+05 0.38909180E+02                   4
+C6H8              HW /94C   6H   8    0    0G   200.000  3000.000              1
+ 0.28481979E+02-0.15702948E-01 0.26771697E-04-0.11780109E-07 0.16573427E-11    2
+ 0.93346445E+04-0.12500226E+03 0.15850439E+01 0.40215142E-01 0.78439543E-05    3
+-0.38761325E-07 0.18545207E-10 0.17949613E+05 0.19112625E+02                   4
+i-C6H5            HW /94C   6H   5    0    0G   200.000  3000.000              1
+ 0.22501663E+02-0.81009977E-02 0.15955695E-04-0.72310371E-08 0.10310424E-11    2
+ 0.58473410E+05-0.91224777E+02-0.78585434E+00 0.60221825E-01-0.62890264E-04    3
+ 0.36310730E-07-0.87000259E-11 0.64942270E+05 0.28658905E+02                   4
+i-C6H7            HW /94C   6H   7    0    0G   200.000  3000.000              1
+ 0.20481506E+02 0.79439697E-03 0.11450761E-04-0.60991177E-08 0.91756724E-12    2
+ 0.37728426E+05-0.81812073E+02-0.17099094E+01 0.62486034E-01-0.54290707E-04    3
+ 0.26959682E-07-0.58999090E-11 0.44086621E+05 0.33344772E+02                   4
+A1C2H             HW /94C   8H   6    0    0G   200.000  3000.000              1
+ 0.24090759E+02 0.78232400E-03 0.11453964E-04-0.61620504E-08 0.93346685E-12    2
+ 0.27429445E+05-0.10499631E+03-0.52645016E+01 0.84511042E-01-0.76597848E-04    3
+ 0.33216978E-07-0.47673063E-11 0.35566242E+05 0.46378815E+02                   4
+A1C2H-            HW /94C   8H   5    0    0G   200.000  3000.000              1
+ 0.12359501E+02 0.25453357E-01-0.10606554E-04 0.18914603E-08-0.10630622E-12    2
+ 0.60930461E+05-0.40900208E+02-0.44495859E+01 0.76995067E-01-0.66617038E-04    3
+ 0.25038682E-07-0.19756601E-11 0.65225926E+05 0.44427948E+02                   4
+n-A1C2H2          HW /94C   8H   7    0    0G   200.000  3000.000              1
+ 0.30433151E+02-0.13965182E-01 0.25416972E-04-0.11354174E-07 0.16092050E-11    2
+ 0.35738719E+05-0.13416492E+03-0.44899931E+01 0.78750789E-01-0.62376959E-04    3
+ 0.21952140E-07-0.16960955E-11 0.45902949E+05 0.47980759E+02                   4
+i-A1C2H2          HW /94C   8H   7    0    0G   200.000  3000.000              1
+ 0.24365524E+02 0.11262144E-02 0.12931670E-04-0.69641146E-08 0.10540145E-11    2
+ 0.33549121E+05-0.10462067E+03-0.25971584E+01 0.63454390E-01-0.20852312E-04    3
+-0.22604624E-07 0.15112869E-10 0.41707375E+05 0.37893417E+02                   4
+A1C2H*            HW /94C   8H   5    0    0G   200.000  3000.000              1
+ 0.28686157E+02-0.13869863E-01 0.22721186E-04-0.99882271E-08 0.14085851E-11    2
+ 0.56047309E+05-0.12750334E+03-0.29324217E+01 0.66043675E-01-0.39500475E-04    3
+-0.31830381E-08 0.85300387E-11 0.65324043E+05 0.38058685E+02                   4
+A1C2H3            HW /94C   8H   8    0    0G   200.000  3000.000              1
+ 0.11303213E+02 0.33709887E-01-0.13208885E-04 0.21140962E-08-0.87311377E-13    2
+ 0.11725388E+05-0.34737919E+02-0.38678493E+01 0.67947865E-01-0.25230333E-04    3
+-0.18017145E-07 0.12998470E-10 0.16200269E+05 0.45271770E+02                   4
+A1C2H3*           HW /94C   8H   7    0    0G   200.000  3000.000              1
+ 0.11563599E+02 0.30210810E-01-0.11545593E-04 0.17302320E-08-0.52379765E-13    2
+ 0.40498492E+05-0.34882965E+02-0.38868685E+01 0.68168961E-01-0.34805875E-04    3
+-0.56410254E-08 0.80714758E-11 0.44941359E+05 0.45943188E+02                   4
+A1C2HC2H2         HW /94C  10H   7    0    0G   200.000  3000.000              1
+ 0.37523422E+02-0.17028838E-01 0.28777416E-04-0.12719674E-07 0.17976818E-11    2
+ 0.61041488E+05-0.17188731E+03-0.63184557E+01 0.11657917E+00-0.13638573E-03    3
+ 0.88823526E-07-0.24348468E-10 0.72977062E+05 0.52624207E+02                   4
+A1C2H)2           HW /94C  10H   6    0    0G   200.000  3000.000              1
+ 0.39766785E+02-0.24939798E-01 0.34210185E-04-0.14473258E-07 0.20104023E-11    2
+ 0.50136750E+05-0.18657632E+03-0.75570364E+01 0.12159592E+00-0.15138849E-03    3
+ 0.10287488E-06-0.28950911E-10 0.62914168E+05 0.55213287E+02                   4
+A2-1              HW /94C  10H   7    0    0G   200.000  3000.000              1
+ 0.38380905E+02-0.23157451E-01 0.35479272E-04-0.15395457E-07 0.21609069E-11    2
+ 0.32698469E+05-0.18106512E+03-0.85287294E+01 0.10334599E+00-0.91922702E-04    3
+ 0.43147448E-07-0.85738135E-11 0.46335004E+05 0.63342224E+02                   4
+A2-2              HW /94C  10H   7    0    0G   200.000  3000.000              1
+ 0.37326401E+02-0.20478070E-01 0.33183067E-04-0.14576987E-07 0.20569137E-11    2
+ 0.32840301E+05-0.17537704E+03-0.38448524E+01 0.70514679E-01-0.93748040E-05    3
+-0.44051607E-07 0.24267865E-10 0.45627656E+05 0.43582001E+02                   4
+A2                HW /94C  10H   8    0    0G   200.000  3000.000              1
+ 0.36468643E+02-0.15419513E-01 0.30160038E-04-0.13700120E-07 0.19582730E-11    2
+ 0.35091445E+04-0.17329489E+03-0.94505043E+01 0.11137849E+00-0.10345667E-03    3
+ 0.52800392E-07-0.11804439E-10 0.16695594E+05 0.65187668E+02                   4
+naphthyne         HW /94C  10H   6    0    0G   200.000  3000.000              1
+ 0.37680222E+02-0.23843173E-01 0.34590019E-04-0.14841252E-07 0.20744023E-11    2
+ 0.45771934E+05-0.17676088E+03-0.68131294E+01 0.96868336E-01-0.87982247E-04    3
+ 0.41858918E-07-0.82716637E-11 0.58661090E+05 0.54849548E+02                   4
+A2C2H2            HW /94C  12H   9    0    0G   200.000  3000.000              1
+ 0.38449295E+02-0.62794946E-02 0.24404828E-04-0.11968822E-07 0.17586878E-11    2
+ 0.41090176E+05-0.17668623E+03-0.78516331E+01 0.12104863E+00-0.10531662E-03    3
+ 0.46280483E-07-0.77963885E-11 0.54316234E+05 0.63654388E+02                   4
+A2C2HA            HW /94C  12H   8    0    0G   200.000  3000.000              1
+ 0.49453674E+02-0.33857111E-01 0.46505607E-04-0.19681195E-07 0.27340769E-11    2
+ 0.26851051E+05-0.23933099E+03-0.11530450E+02 0.14741433E+00-0.17302344E-03    3
+ 0.11500390E-06-0.32709183E-10 0.43793129E+05 0.74391754E+02                   4
+A2C2HB            HW /94C  12H   8    0    0G   200.000  3000.000              1
+ 0.18184774E+02 0.41343965E-01-0.17302822E-04 0.31004770E-08-0.17580817E-12    2
+ 0.36171543E+05-0.73466003E+02-0.68233256E+01 0.11382083E+00-0.88584900E-04    3
+ 0.25930856E-07 0.80712824E-12 0.42797719E+05 0.54592098E+02                   4
+A2C2HA*           HW /94C  12H   7    0    0G   200.000  3000.000              1
+ 0.36614349E+02-0.60314685E-02 0.21614964E-04-0.10579910E-07 0.15563124E-11    2
+ 0.60723898E+05-0.17026691E+03-0.84175968E+01 0.12391680E+00-0.12250672E-03    3
+ 0.64071344E-07-0.13889583E-10 0.73248562E+05 0.61893204E+02                   4
+A2C2HB*           HW /94C  12H   7    0    0G   200.000  3000.000              1
+ 0.44933517E+02-0.26026871E-01 0.38589074E-04-0.16646357E-07 0.23321310E-11    2
+ 0.57926637E+05-0.21417279E+03-0.11824737E+02 0.14904183E+00-0.18618468E-03    3
+ 0.13129460E-06-0.39145326E-10 0.73385375E+05 0.76273834E+02                   4
+A2C2H)2           HW /94C  14H   8    0    0G   200.000  3000.000              1
+ 0.23671062E+02 0.42137049E-01-0.17596645E-04 0.31081251E-08-0.16805216E-12    2
+ 0.77926273E+05-0.99615448E+02-0.63029008E+01 0.13745695E+00-0.13055481E-03    3
+ 0.60730663E-07-0.10178345E-10 0.85489430E+05 0.51891548E+02                   4
+A2HR5             HW /94C  12H   9    0    0G   200.000  3000.000              1
+ 0.51227890E+02-0.36250230E-01 0.50296483E-04-0.21346413E-07 0.29698119E-11    2
+ 0.32111648E+05-0.25061665E+03-0.92796507E+01 0.11707741E+00-0.78334211E-04    3
+ 0.10778407E-07 0.66555260E-11 0.50063973E+05 0.66712509E+02                   4
+A2R5              HW /94C  12H   8    0    0G   200.000  3000.000              1
+ 0.45883698E+02-0.27226903E-01 0.41569336E-04-0.18047093E-07 0.25351396E-11    2
+ 0.13394574E+05-0.22304584E+03-0.97011614E+01 0.12019449E+00-0.98907694E-04    3
+ 0.37240884E-07-0.41124578E-11 0.29601926E+05 0.66970596E+02                   4
+A3-4              HW /94C  14H   9    0    0G   200.000  3000.000              1
+ 0.55788879E+02-0.37930615E-01 0.53528085E-04-0.22830790E-07 0.31841231E-11    2
+ 0.32605633E+05-0.27378882E+03-0.11266616E+02 0.14216852E+00-0.12632679E-03    3
+ 0.58348800E-07-0.11184283E-10 0.52141961E+05 0.75774780E+02                   4
+A3-1              HW /94C  14H   9    0    0G   200.000  3000.000              1
+ 0.51812469E+02-0.28380312E-01 0.45409150E-04-0.19924162E-07 0.28118107E-11    2
+ 0.34357359E+05-0.25257889E+03-0.73971558E+01 0.11464679E+00-0.57456185E-04    3
+-0.14070547E-07 0.16005933E-10 0.52239715E+05 0.59582397E+02                   4
+A3                HW /94C  14H  10    0    0G   200.000  3000.000              1
+ 0.55916473E+02-0.35253201E-01 0.52522926E-04-0.22672634E-07 0.31770584E-11    2
+ 0.32654609E+04-0.27604980E+03-0.12275226E+02 0.15032256E+00-0.13862801E-03    3
+ 0.69376767E-07-0.15105445E-10 0.23030492E+05 0.78889145E+02                   4
+A3C2H2            HW /94C  16H  11    0    0G   200.000  3000.000              1
+ 0.47582428E+02-0.12822752E-02 0.25647692E-04-0.13378838E-07 0.20086545E-11    2
+ 0.46191215E+05-0.22653258E+03-0.95893555E+01 0.15080631E+00-0.11617327E-03    3
+ 0.36814228E-07-0.12802901E-11 0.62701906E+05 0.71309311E+02                   4
+A3C2H             HW /94C  16H  10    0    0G   200.000  3000.000              1
+ 0.52165146E+02-0.13197318E-01 0.34353056E-04-0.16283892E-07 0.23677362E-11    2
+ 0.34235055E+05-0.25406651E+03-0.11602674E+02 0.16824394E+00-0.16432030E-03    3
+ 0.86394380E-07-0.19310567E-10 0.52172836E+05 0.75515366E+02                   4
+A4H               HW /94C  16H  11    0    0G   200.000  3000.000              1
+ 0.53775238E+02-0.15681151E-01 0.38488797E-04-0.18134241E-07 0.26325071E-11    2
+ 0.24154484E+05-0.26532764E+03-0.12209255E+02 0.15599608E+00-0.11474930E-03    3
+ 0.30214796E-07 0.18287498E-11 0.43453211E+05 0.79503540E+02                   4
+A4                HW /94C  16H  10    0    0G   200.000  3000.000              1
+ 0.58017273E+02-0.29164989E-01 0.48728383E-04-0.21593682E-07 0.30609786E-11    2
+ 0.43451016E+04-0.29017163E+03-0.13759249E+02 0.16772294E+00-0.15500121E-03    3
+ 0.75759544E-07-0.15674045E-10 0.24996187E+05 0.82853027E+02                   4
+A4-               HW /94C  16H   9    0    0G   200.000  3000.000              1
+ 0.22088816E+02 0.53355407E-01-0.22329932E-04 0.39479620E-08-0.21313176E-12    2
+ 0.45200934E+05-0.96724930E+02-0.96258593E+01 0.13385314E+00-0.77600773E-04    3
+-0.36330547E-08 0.13855670E-10 0.54171852E+05 0.68499725E+02                   4
+P2                HW /94C  12H  10    0    0G   200.000  3000.000              1
+ 0.50761871E+02-0.34501564E-01 0.50293413E-04-0.21559579E-07 0.30097192E-11    2
+ 0.21538867E+04-0.24670712E+03-0.10283234E+02 0.12428707E+00-0.95990268E-04    3
+ 0.32294793E-07-0.23045229E-11 0.20165258E+05 0.72707947E+02                   4
+P2-               HW /94C  12H   9    0    0G   200.000  3000.000              1
+ 0.44711853E+02-0.22851825E-01 0.39102117E-04-0.17352100E-07 0.24579375E-11    2
+ 0.33714000E+05-0.21220692E+03-0.11851097E+02 0.13545156E+00-0.13310938E-03    3
+ 0.73769911E-07-0.18193003E-10 0.49878781E+05 0.81107361E+02                   4
+P2-H              HW /94C  12H  11    0    0G   200.000  3000.000              1
+ 0.41542511E+02-0.83502531E-02 0.29097937E-04-0.14148299E-07 0.20728341E-11    2
+ 0.22772937E+05-0.19578616E+03-0.99978790E+01 0.12279570E+00-0.80112615E-04    3
+ 0.11102152E-07 0.64273890E-11 0.37960410E+05 0.74195984E+02                   4
+C5H4OH            L 8/89C   5H   5O   1    0G   200.000  6000.000              1
+ 0.13367912d+02 0.15205785d-01-0.54592258d-05 0.88134866d-09-0.52774454d-13    2
+ 0.38411506d+04-0.45920839d+02-0.12822236d+01 0.49041160d-01-0.13688997d-04    3
+-0.29133858d-07 0.19006964d-10 0.80087098d+04 0.30798358d+02 0.96365992d+04    4
+C5H5O             L 7/89C   5O   1H   5    0G   200.000  6000.000              1
+ 0.12606422d+02 0.16747260d-01-0.61098574d-05 0.99676557d-09-0.60113201d-13    2
+ 0.39313455d+04-0.42604277d+02 0.23042835d+00 0.32322691d-01 0.28900443d-04    3
+-0.70679977d-07 0.33406891d-10 0.80753082d+04 0.25330974d+02                   4
+C5H4O             P 1/93C   5H   4O   1    0G   200.000  3000.000              1
+ 0.47927242E+01 0.29221680E-01-0.15997486E-04 0.42069049E-08-0.42815179E-12    2
+ 0.22849286E+04-0.30131893E+01-0.23915355E+01 0.47363680E-01-0.30728171E-04    3
+ 0.78031552E-08-0.25145729E-12 0.43740152E+04 0.34594337E+02                   4
+C7H16             P10/95C   7H  16    0    0G   200.000  5000.000  1391.000    1
+ 2.22148969e+01 3.47675750e-02-1.18407129e-05 1.83298478e-09-1.06130266e-13    2
+-3.42760081e+04-9.23040196e+01-1.26836187e+00 8.54355820e-02-5.25346786e-05    3
+ 1.62945721e-08-2.02394925e-12-2.56586565e+04 3.53732912e+01                   4
+C7H15-1    2/10/95      C   7H  15    0    0G   200.000  5000.000  1391.000    1
+ 2.17940709e+01 3.26280243e-02-1.11138244e-05 1.72067148e-09-9.96366999e-14    2
+-9.20938221e+03-8.64954311e+01-4.99570406e-01 8.08826467e-02-5.00532754e-05    3
+ 1.56549308e-08-1.96616227e-12-1.04590223e+03 3.46564011e+01                   4
+C7H15-2    2/10/95      C   7H  15    0    0G   200.000  5000.000  1391.000    1
+ 2.16368842e+01 3.23324804e-02-1.09273807e-05 1.68357060e-09-9.71774091e-14    2
+-1.05873616e+04-8.52209653e+01-3.79155767e-02 7.56726570e-02-4.07473634e-05    3
+ 9.32678943e-09-4.92360745e-13-2.35605303e+03 3.37321506e+01                   4
+C4H9              P10/84C  4.H  9.   0.   0.G   200.000  6000.000              1
+ 9.43040607E+00 2.34271349E-02-8.53599182E-06 1.39748355E-09-8.44057456E-14    2
+ 2.14214862E+03-2.42207994E+01 3.54885235E+00 1.78747638E-02 5.00782825E-05    3
+-7.94475071E-08 3.35802354E-11 4.74011588E+03 1.11849382E+01 6.89397210E+03    4
+C3H7            N-L 9/84C   3H   7    0    0G   200.000  5000.000              1
+ 0.77026987E 01 0.16044203E-01-0.52833220E-05 0.76298590E-09-0.39392284E-13    2
+ 0.82984336E 04-0.15480180E 02 0.10515518E 01 0.25991980E-01 0.23800540E-05    3
+-0.19609569E-07 0.93732470E-11 0.10631863E 05 0.21122559E 02 0.12087447E 05    4
+C7H15O2    7/23/98      C  7.H 15.O  2.   0.G   200.000  5000.000              1
+ 2.49023689e+01 3.50716920e-02-1.20440306e-05 1.87464822e-09-1.08947791e-13    2
+-2.82976050e+04-9.73923542e+01 2.37499334e+00 8.34651906e-02-5.13897320e-05    3
+ 1.64217662e-08-2.19505216e-12-1.99237961e+04 2.53067342e+01                   4
+C7H14O2H   7/23/98      C  7.H 15.O  2.   0.G   200.000  5000.000              1
+ 2.70028807e+01 3.22272216e-02-1.09366516e-05 1.68977918e-09-9.77321946e-14    2
+-2.27229231e+04-1.06332170e+02 2.49875186e+00 8.32443344e-02-4.85933986e-05    3
+ 1.28927950e-08-1.09878385e-12-1.36530733e+04 2.73754005e+01                   4
+C7H14O2HO2   7/23/98    C  7.H 15.O  4.   0.G   200.000  5000.000              1
+ 3.23937788e+01 3.33911097e-02-1.15672104e-05 1.81146023e-09-1.05739941e-13    2
+-4.36321048e+04-1.32597311e+02 3.84933185e+00 9.45955097e-02-5.94934121e-05    3
+ 1.78836457e-08-2.00618696e-12-3.32051631e+04 2.25912030e+01                   4
+C7KET12    7/23/98      C  7.H 14.O  3.   0.G   200.000  5000.000              1
+ 2.97472906e+01 3.06622294e-02-1.05563590e-05 1.64627343e-09-9.58171675e-14    2
+-5.66856828e+04-1.22432490e+02 5.82433697e-01 1.01207869e-01-7.65855996e-05    3
+ 3.00738606e-08-4.82902792e-12-4.68054419e+04 3.33331449e+01                   4
+C7KET21    2/10/95      C  7.H 14.O  3.   0.G   200.000  5000.000 1382.000     1
+ 2.80512936e+01 3.27356029e-02-1.14107044e-05 1.79404506e-09-1.05002142e-13    2
+-5.89640173e+04-1.11392338e+02 4.19023030e+00 8.43118237e-02-5.44315814e-05    3
+ 1.85837721e-08-2.72768938e-12-5.00570382e+04 1.85783455e+01                   4
+C5H11CHO   2/29/96      C   6H  12O   1    0G   200.000  5000.000              1
+ 1.98891043e+01 2.71869340e-02-9.27391515e-06 1.43744158e-09-8.33090761e-14    2
+-3.97523444e+04-7.60741671e+01 1.37517192e+00 6.65669689e-02-4.04423050e-05    3
+ 1.23836270e-08-1.52905857e-12-3.28740986e+04 2.48343934e+01                   4
+C5H11CO    2/29/96      C  6.H 11.O  1.   0.G   200.000  5000.000              1
+ 1.94783812e+01 2.50466029e-02-8.54861346e-06 1.32557944e-09-7.68503296e-14    2
+-2.07923937e+04-7.21995578e+01 2.14479069e+00 6.17863563e-02-3.74134690e-05    3
+ 1.13283795e-08-1.36917698e-12-1.43451172e+04 2.23128045e+01                   4
+C5H11             T03/97C  5.H 11.   0.   0.G   200.000  5000.000              1
+ 1.13324106E+01 3.03659897E-02-1.13934480E-05 1.99539733E-09-1.32825012E-13    2
+-5.95299959E+03-3.13564905E+01 3.57867617E+00 3.04236365E-02 3.27768270E-05    3
+-5.86453147E-08 2.39315107E-11-2.60420265E+03 1.42591121E+01 6.68760000E+03    4
+CH3O2             L 1/84C   1H   3O   2N   0G   200.000  5000.00               1
+ 0.66812963E 01 0.80057271E-02-0.27188507E-05 0.40631365E-09-0.21927725E-13    2
+ 0.52621851E 03-0.99423847E 01 0.20986490E 01 0.15786357E-01 0.75683261E-07    3
+-0.11274587E-07 0.56665133E-11 0.20695879E 04 0.15007068E 02                   4
+CH4O2             T11/96C   1H   4O   2    0G   200.000  6000.000              1
+ 6.86907934E+00 1.00840883E-02-3.66515947E-06 5.96302681E-10-3.58894156E-14    2
+-1.98402231E+04-1.24951986E+01 3.72654981E+00 7.51851847E-03 2.35970425E-05    3
+-3.52694507E-08 1.42757614E-11-1.83982011E+04 6.52443362E+00-1.68074366E+04    4
+C6H12      2/14/95      C  6.H 12.O  0.   0.G   200.000  5000.000              1
+ 1.78337529e+01 2.67377658e-02-9.10036773e-06 1.40819768e-09-8.15124244e-14    2
+-1.42062860e+04-6.83818851e+01-1.35275205e+00 6.98655426e-02-4.59408022e-05    3
+ 1.56967343e-08-2.21296175e-12-7.34368617e+03 3.53120691e+01                   4
+C3H5              BUR 92C   3H   5O   0N   0G   200.000  6000.000              1
+ 6.54761132E+00 1.33152246E-02-4.78333100E-06 7.71949814E-10-4.61930808E-14    2
+ 1.72714707E+04-9.27486841E+00 3.78794693E+00 9.48414335E-03 2.42343368E-05    3
+-3.65604010E-08 1.48592356E-11 1.86261218E+04 7.82822499E+00 2.03259122E+04    4
+CH3CHO            L 8/88C   2H   4O   1     G   200.000  6000.000  1000.000    1
+ 0.54041108E+01 0.11723059E-01-0.42263137E-05 0.68372451E-09-0.40984863E-13    2
+-0.22593122E+05-0.34807917E+01 0.47294595E+01-0.31932858E-02 0.47534921E-04    3
+-0.57458611E-07 0.21931112E-10-0.21572878E+05 0.41030159E+01                   4
+C3H3              BUR 92C   3H   3O   0N   0G   200.000  6000.000              1
+ 6.64175821E+00 8.08587428E-03-2.84787887E-06 4.53525977E-10-2.68879815E-14    2
+ 3.89793699E+04-1.04004255E+01 1.82840766E+00 2.37839036E-02-2.19228176E-05    3
+ 1.00067444E-08-1.38984644E-12 4.01863058E+04 1.38447957E+01 4.16139977E+04    4
+C4H3              L 9/89C   4H   3O   0N   0G   200.000  6000.000              1
+ 0.84762079E+01 0.88782327E-02-0.30328412E-05 0.47358302E-09-0.27716627E-13    2
+ 0.54756540E+05-0.17170551E+02 0.24173247E+01 0.24104782E-01-0.12813470E-04    3
+-0.28606237E-08 0.39194527E-11 0.56506476E+05 0.14471107E+02 0.58181574E+05    4
+CH2CHO            SAND86O   1H   3C   2     G   200.000  5000.000  1000.000    1
+ 0.05975670E+02 0.08130591E-01-0.02743624E-04 0.04070304E-08-0.02176017E-12    2
+ 0.04903218E+04-0.05045251E+02 0.03409062E+02 0.10738574E-01 0.01891492E-04    3
+-0.07158583E-07 0.02867385E-10 0.15214766E+04 0.09558290E+02                   4
+END
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/RASProperties b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/RASProperties
new file mode 100644
index 0000000000..907214c9f8
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/RASProperties
@@ -0,0 +1,60 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+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;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties
new file mode 100644
index 0000000000..a13dc664a5
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties
@@ -0,0 +1,47 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      chemistryProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+chemistry       on;
+
+turbulentReaction on;
+
+chemistrySolver ODE;
+
+initialChemicalTimeStep 1e-07;
+
+sequentialCoeffs
+{
+    cTauChem        0.001;
+}
+
+EulerImplicitCoeffs
+{
+    cTauChem        0.05;
+    equilibriumRateLimiter off;
+}
+
+ODECoeffs
+{
+    ODESolver       SIBS;
+    eps             0.05;
+    scale           1;
+}
+
+Cmix            Cmix [ 0 0 0 0 0 0 0 ] 1;
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions
new file mode 100644
index 0000000000..a5cc78c32e
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    location    "";
+    class       vectorField;
+    object      coalCloudPositions;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+(
+(0.005 0.5 0.05)
+(0.010 0.5 0.05)
+(0.015 0.5 0.05)
+(0.020 0.5 0.05)
+(0.025 0.5 0.05)
+(0.030 0.5 0.05)
+(0.035 0.5 0.05)
+(0.040 0.5 0.05)
+(0.045 0.5 0.05)
+(0.005 0.6 0.05)
+(0.010 0.6 0.05)
+(0.015 0.6 0.05)
+(0.020 0.6 0.05)
+(0.025 0.6 0.05)
+(0.030 0.6 0.05)
+(0.035 0.6 0.05)
+(0.040 0.6 0.05)
+(0.045 0.6 0.05)
+(0.005 0.7 0.05)
+(0.010 0.7 0.05)
+(0.015 0.7 0.05)
+(0.020 0.7 0.05)
+(0.025 0.7 0.05)
+(0.030 0.7 0.05)
+(0.035 0.7 0.05)
+(0.040 0.7 0.05)
+(0.045 0.7 0.05)
+)
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
new file mode 100644
index 0000000000..4886a81f6f
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
@@ -0,0 +1,164 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      coalCloud1Properties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+InjectionModel  ManualInjection;
+
+DragModel       SphereDrag;
+
+DispersionModel StochasticDispersionRAS;
+
+WallInteractionModel StandardWallInteraction;
+
+HeatTransferModel RanzMarshall;
+
+CompositionModel SingleMixtureFraction;
+
+PhaseChangeModel LiquidEvaporation;
+
+DevolatilisationModel ConstantRateDevolatilisation;
+
+SurfaceReactionModel COxidationDiffusionLimitedRate;
+
+radiation       on;
+
+coupled         true;
+
+cellValueSourceCorrection on;
+
+parcelTypeId    1;
+
+constantProperties
+{
+    rhoMin          rhoMin [ 1 -3 0 0 0 ] 1e-15;
+    TMin            TMin [ 0 0 0 1 0 ] 200;
+    pMin            pMin [ 1 -1 2 0 0 ] 1000;
+    minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15;
+    rho0            rho0 [ 1 -3 0 0 0 ] 1000;
+    T0              T0 [ 0 0 0 1 0 ] 300;
+    cp0             cp0 [ 0 2 -2 -1 0 ] 4187;
+    epsilon0        epsilon0 [ 0 0 0 0 0 ] 1;
+    f0              f0 [ 0 0 0 0 0 ] 0.5;
+    Tbp             Tbp [ 0 0 0 1 0 ] 400;
+    Tvap            Tvap [ 0 0 0 1 0 ] 400;
+    LDevol          LDevol [ 0 0 0 0 0 ] 0;
+    hRetentionCoeff hRetentionCoeff [ 0 0 0 0 0 ] 1;
+    constantVolume  true;
+}
+
+interpolationSchemes
+{
+    rho             cell;
+    U               cellPointFace;
+    mu              cell;
+    T               cell;
+    Cp              cell;
+    p               cell;
+}
+
+integrationSchemes
+{
+    U               Euler;
+    T               Analytical;
+}
+
+particleForces
+{
+    gravity         on;
+    virtualMass     off;
+    Cvm             0.5;
+    pressureGradient off;
+    gradU           gradU;
+}
+
+ManualInjectionCoeffs
+{
+    massTotal       massTotal [ 1 0 0 0 0 ] 0.0001;
+    parcelBasisType mass;
+    SOI             0;
+    positionsFile   "coalCloud1Positions";
+    U0              ( 0 -10 0 );
+    parcelPDF
+    {
+        pdfType         RosinRammler;
+        RosinRammlerPDF
+        {
+            minValue        5e-06;
+            maxValue        0.0005;
+            d               ( 5e-05 );
+            n               ( 0.5 );
+        }
+    }
+}
+
+StandardWallInteractionCoeffs
+{
+    e               e [ 0 0 0 0 0 ] 1;
+    mu              mu [ 0 0 0 0 0 ] 0;
+}
+
+RanzMarshallCoeffs
+{
+    Pr              Pr [ 0 0 0 0 0 ] 0.7;
+}
+
+SingleMixtureFractionCoeffs
+{
+    phases
+    (
+        gas
+        {
+            CH4 0.604;
+            H2 0.099;
+            CO2 0.297;
+        }
+        liquid
+        {
+            H2O 1;
+        }
+        solid
+        {
+            ash 0.136304;
+            C 0.863696;
+        }
+    );
+    YGasTot0        0.211;
+    YLiquidTot0     0.026;
+    YSolidTot0      0.763;
+}
+
+LiquidEvaporationCoeffs
+{
+    activeLiquids
+    (
+        H2O
+    );
+}
+
+ConstantRateDevolatilisationCoeffs
+{
+    A0              A0 [ 0 0 -1 0 0 ] 12;
+    volatileResidualCoeff 0.001;
+}
+
+COxidationDiffusionLimitedRateCoeffs
+{
+    Sb              Sb [ 0 0 0 0 0 ] 1;
+    D               D [ 0 2 -1 0 0 ] 1.5e-05;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/enthalpySourceProperties b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/enthalpySourceProperties
new file mode 100644
index 0000000000..614c9a41b3
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/enthalpySourceProperties
@@ -0,0 +1,37 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      enthalpySourceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+cellSource      sphereToCell;
+
+volumeType      absolute;
+
+timeStart       0.15;
+
+duration        0.1;
+
+onValue         10000;
+
+offValue        0;
+
+sphereToCellCoeffs
+{
+    centre          ( 0.125 0.375 0.05 );
+    radius          0.005;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/environmentalProperties b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/environmentalProperties
new file mode 100644
index 0000000000..4baaea2a25
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/environmentalProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      environmentalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
new file mode 100644
index 0000000000..aec7c430a7
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
@@ -0,0 +1,104 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      limestoneCloud1Properties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+InjectionModel  ManualInjection;
+
+DragModel       SphereDrag;
+
+DispersionModel StochasticDispersionRAS;
+
+WallInteractionModel StandardWallInteraction;
+
+HeatTransferModel RanzMarshall;
+
+radiation       on;
+
+coupled         true;
+
+cellValueSourceCorrection on;
+
+parcelTypeId    2;
+
+constantProperties
+{
+    rhoMin          rhoMin [ 1 -3 0 0 0 ] 1e-15;
+    TMin            TMin [ 0 0 0 1 0 ] 200;
+    minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15;
+    rho0            rho0 [ 1 -3 0 0 0 ] 2500;
+    T0              T0 [ 0 0 0 1 0 ] 300;
+    cp0             cp0 [ 0 2 -2 -1 0 ] 900;
+    epsilon0        epsilon0 [ 0 0 0 0 0 ] 1;
+    f0              f0 [ 0 0 0 0 0 ] 0.5;
+}
+
+interpolationSchemes
+{
+    rho             cell;
+    mu              cell;
+    U               cellPoint;
+    Cp              cell;
+    T               cell;
+}
+
+integrationSchemes
+{
+    U               Euler;
+    T               Analytical;
+}
+
+particleForces
+{
+    gravity         on;
+    virtualMass     off;
+    Cvm             0.5;
+    pressureGradient off;
+    gradU           gradU;
+}
+
+ManualInjectionCoeffs
+{
+    massTotal       massTotal [ 1 0 0 0 0 ] 0.0001;
+    parcelBasisType mass;
+    SOI             0;
+    positionsFile   "limestonePositions";
+    U0              ( 0 0 0 );
+    parcelPDF
+    {
+        pdfType         RosinRammler;
+        RosinRammlerPDF
+        {
+            minValue        5e-06;
+            maxValue        0.000565;
+            d               ( 4.8e-05 );
+            n               ( 0.5 );
+        }
+    }
+}
+
+StandardWallInteractionCoeffs
+{
+    e               e [ 0 0 0 0 0 ] 1;
+    mu              mu [ 0 0 0 0 0 ] 0;
+}
+
+RanzMarshallCoeffs
+{
+    Pr              Pr [ 0 0 0 0 0 ] 0.7;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestonePositions b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestonePositions
new file mode 100644
index 0000000000..e94ef68510
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestonePositions
@@ -0,0 +1,37 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      http://www.openfoam.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    location    "";
+    class       vectorField;
+    object      limestonePositions;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+(
+(0.0075 0.55 0.05)
+(0.0125 0.55 0.05)
+(0.0175 0.55 0.05)
+(0.0225 0.55 0.05)
+(0.0275 0.55 0.05)
+(0.0325 0.55 0.05)
+(0.0375 0.55 0.05)
+(0.0425 0.55 0.05)
+(0.0475 0.55 0.05)
+(0.0075 0.45 0.05)
+(0.0125 0.45 0.05)
+(0.0175 0.45 0.05)
+(0.0225 0.45 0.05)
+(0.0275 0.45 0.05)
+(0.0325 0.45 0.05)
+(0.0375 0.45 0.05)
+(0.0425 0.45 0.05)
+(0.0475 0.45 0.05)
+)
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/polyMesh/blockMeshDict b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/polyMesh/blockMeshDict
new file mode 100644
index 0000000000..fd9096e952
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/polyMesh/blockMeshDict
@@ -0,0 +1,88 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant/polyMesh";
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 1.0;
+
+vertices
+(
+    (0     0     0)
+    (0.05  0     0)
+    (0.05  0.5   0)
+    (0     0.5   0)
+    (0     0     0.1)
+    (0.05  0     0.1)
+    (0.05  0.5   0.1)
+    (0     0.5   0.1)
+    (0.5   0     0)
+    (0.5   0.5   0)
+    (0.5   0     0.1)
+    (0.5   0.5   0.1)
+    (0.05  1     0)
+    (0     1     0)
+    (0.05  1     0.1)
+    (0     1     0.1)
+);
+
+blocks
+(
+    hex (0 1 2 3 4 5 6 7)     (5 50 1) simpleGrading (1 1 1)
+    hex (1 8 9 2 5 10 11 6)   (40 50 1) simpleGrading (1 1 1)
+    hex (3 2 12 13 7 6 14 15) (5 50 1) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+patches
+(
+    wall top
+    (
+        (13 15 14 12)
+    )
+    wall bottom
+    (
+        (0 1 5 4)
+        (1 8 10 5)
+    )
+    wall walls
+    (
+        (8 9 11 10)
+        (9 2 6 11)
+        (2 12 14 6)
+    )
+    symmetryPlane symmetry
+    (
+        (4 7 3 0)
+        (7 15 13 3)
+    )
+    empty frontAndBack
+    (
+        (0 3 2 1)
+        (3 13 12 2)
+        (1 2 9 8)
+        (5 6 7 4)
+        (6 14 15 7)
+        (10 11 6 5)
+    )
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties
new file mode 100644
index 0000000000..8fbbdfa720
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties
@@ -0,0 +1,73 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation       on;
+
+solverFreq      1;
+
+radiationModel  P1;
+
+noRadiation
+{
+}
+
+P1Coeffs
+{
+    C               C [ 0 0 0 0 0 0 0 ] 0;
+}
+
+absorptionEmissionModel binaryAbsorptionEmission;
+
+binaryAbsorptionEmissionCoeffs
+{
+    model1
+    {
+        absorptionEmissionModel constantAbsorptionEmission;
+        constantAbsorptionEmissionCoeffs
+        {
+            a               a [ 0 -1 0 0 0 0 0 ] 0.5;
+            e               e [ 0 -1 0 0 0 0 0 ] 0.5;
+            E               E [ 1 -1 -3 0 0 0 0 ] 0;
+        }
+    }
+    model2
+    {
+        absorptionEmissionModel cloudAbsorptionEmission;
+        cloudAbsorptionEmissionCoeffs
+        {
+            cloudNames
+            (
+                coalCloud1
+                limestoneCloud1
+            );
+        }
+    }
+}
+
+scatterModel    cloudScatter;
+
+cloudScatterCoeffs
+{
+    cloudNames
+    (
+        coalCloud1
+        limestoneCloud1
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
new file mode 100644
index 0000000000..4936c35ab1
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties
@@ -0,0 +1,46 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType      hMixtureThermo<reactingMixture>;
+
+chemistryReader foamChemistryReader;
+
+foamChemistryThermoFile "$FOAM_CASE/chemkin/foam.dat";
+
+foamChemistryFile "$FOAM_CASE/chemkin/foam.inp";
+
+inertSpecie     N2;
+
+liquidComponents
+(
+    H2O
+);
+
+H2O             H2O defaultCoeffs;
+
+solidFuelComponents
+(
+    C
+    ash
+);
+
+C               C defaultCoeffs;
+
+ash             ash defaultCoeffs;
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties
new file mode 100644
index 0000000000..78f28eca60
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  RASModel;
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict
new file mode 100644
index 0000000000..6cc0b6002c
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict
@@ -0,0 +1,55 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     coalChemistryFoam;
+
+startFrom       latestTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         0.5;
+
+deltaT          0.0001;
+
+writeControl    adjustableRunTime;
+
+writeInterval   0.0025;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  10;
+
+writeCompression uncompressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+adjustTimeStep  yes;
+
+maxCo           0.2;
+
+maxDeltaT       1;
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/system/decomposeParDict b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/system/decomposeParDict
new file mode 100644
index 0000000000..e9784a98d7
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/system/decomposeParDict
@@ -0,0 +1,50 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 4;
+
+method          metis;
+
+simpleCoeffs
+{
+    n               ( 2 2 1 );
+    delta           0.001;
+}
+
+hierarchicalCoeffs
+{
+    n               ( 1 1 1 );
+    delta           0.001;
+    order           xyz;
+}
+
+metisCoeffs
+{
+    processorWeights ( 1 1 1 1 );
+}
+
+manualCoeffs
+{
+    dataFile        "";
+}
+
+distributed     no;
+
+roots           ( );
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes
new file mode 100755
index 0000000000..99267208ea
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes
@@ -0,0 +1,72 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+    grad(p)         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+    div(phi,U)      Gauss upwind;
+    div(phid,p)     Gauss upwind;
+    div(phiU,p)     Gauss linear;
+    div(phi,h)      Gauss upwind;
+    div(phi,k)      Gauss upwind;
+    div(phi,epsilon) Gauss upwind;
+    div(U)          Gauss linear;
+    div((muEff*dev2(grad(U).T()))) Gauss linear;
+    div(phi,Yi_h)   Gauss upwind;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear corrected;
+    laplacian(muEff,U) Gauss linear corrected;
+    laplacian(mut,U) Gauss linear corrected;
+    laplacian(DkEff,k) Gauss linear corrected;
+    laplacian(DepsilonEff,epsilon) Gauss linear corrected;
+    laplacian(DREff,R) Gauss linear corrected;
+    laplacian((rho*(1|A(U))),p) Gauss linear corrected;
+    laplacian(alphaEff,h) Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+fluxRequired
+{
+    default         no;
+    p               ;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
new file mode 100755
index 0000000000..08e0c7a037
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
@@ -0,0 +1,143 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    rho
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-05;
+        relTol          0;
+    };
+    U
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    };
+    p
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    };
+    G
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-05;
+        relTol          0;
+    };
+    Yi
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    };
+    CO2
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    };
+    O2
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    };
+    N2
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    };
+    CH4
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    };
+    H2
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    };
+    H2O
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    };
+    CO
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0;
+    };
+    h
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    };
+    R
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    };
+    k
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    };
+    epsilon
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0;
+    };
+}
+
+PISO
+{
+    transonic       yes;
+    nCorrectors     2;
+    nNonOrthogonalCorrectors 0;
+    momentumPredictor yes;
+}
+
+
+// ************************************************************************* //

From 4459d245b73e114f0709081d49e9fb8eecc80a5b Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 20 May 2009 17:31:46 +0100
Subject: [PATCH 170/175] updates to bring in to line with radiation lib

---
 .../cloudAbsorptionEmission.C                 |  6 ++---
 .../cloudAbsorptionEmission.H                 |  6 ++---
 .../binaryAbsorptionEmission.C                | 24 +++++++++----------
 .../binaryAbsorptionEmission.H                | 12 +++++-----
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
index de19513e4a..fae1d15e6b 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
@@ -72,7 +72,7 @@ Foam::radiation::cloudAbsorptionEmission::~cloudAbsorptionEmission()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::volScalarField>
-Foam::radiation::cloudAbsorptionEmission::aDisp() const
+Foam::radiation::cloudAbsorptionEmission::aDisp(const label) const
 {
     tmp<volScalarField> ta
     (
@@ -107,7 +107,7 @@ Foam::radiation::cloudAbsorptionEmission::aDisp() const
 
 
 Foam::tmp<Foam::volScalarField>
-Foam::radiation::cloudAbsorptionEmission::eDisp() const
+Foam::radiation::cloudAbsorptionEmission::eDisp(const label bandI) const
 {
     tmp<volScalarField> te
     (
@@ -132,7 +132,7 @@ Foam::radiation::cloudAbsorptionEmission::eDisp() const
 
 
 Foam::tmp<Foam::volScalarField>
-Foam::radiation::cloudAbsorptionEmission::EDisp() const
+Foam::radiation::cloudAbsorptionEmission::EDisp(const label bandI) const
 {
     tmp<volScalarField> tE
     (
diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H
index 033ed351d5..a737764e88 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H
@@ -85,19 +85,19 @@ public:
             // Absorption coefficient
 
                 //- Absorption coefficient for dispersed phase
-                tmp<volScalarField> aDisp() const;
+                virtual tmp<volScalarField> aDisp(const label bandI = 0) const;
 
 
             // Emission coefficient
 
                 //- Emission coefficient for dispersed phase
-                tmp<volScalarField> eDisp() const;
+                virtual tmp<volScalarField> eDisp(const label bandI = 0) const;
 
 
             // Emission contribution
 
                 //- Return emission contribution for dispersed phase
-                tmp<volScalarField> EDisp() const;
+                virtual tmp<volScalarField> EDisp(const label bandI = 0) const;
 };
 
 
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C
index 15d8c37a31..5cc3ac9b27 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C
@@ -75,44 +75,44 @@ Foam::radiation::binaryAbsorptionEmission::~binaryAbsorptionEmission()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::volScalarField>
-Foam::radiation::binaryAbsorptionEmission::aCont() const
+Foam::radiation::binaryAbsorptionEmission::aCont(const label bandI) const
 {
-    return model1_->aCont() + model2_->aCont();
+    return model1_->aCont(bandI) + model2_->aCont(bandI);
 }
 
 
 Foam::tmp<Foam::volScalarField>
-Foam::radiation::binaryAbsorptionEmission::aDisp() const
+Foam::radiation::binaryAbsorptionEmission::aDisp(const label bandI) const
 {
-    return model1_->aDisp() + model2_->aDisp();
+    return model1_->aDisp(bandI) + model2_->aDisp(bandI);
 }
 
 
 Foam::tmp<Foam::volScalarField>
-Foam::radiation::binaryAbsorptionEmission::eCont() const
+Foam::radiation::binaryAbsorptionEmission::eCont(const label bandI) const
 {
-    return model1_->eCont() + model2_->eCont();
+    return model1_->eCont(bandI) + model2_->eCont(bandI);
 }
 
 
 Foam::tmp<Foam::volScalarField>
-Foam::radiation::binaryAbsorptionEmission::eDisp() const
+Foam::radiation::binaryAbsorptionEmission::eDisp(const label bandI) const
 {
-    return model1_->eDisp() + model2_->eDisp();
+    return model1_->eDisp(bandI) + model2_->eDisp(bandI);
 }
 
 
 Foam::tmp<Foam::volScalarField>
-Foam::radiation::binaryAbsorptionEmission::ECont() const
+Foam::radiation::binaryAbsorptionEmission::ECont(const label bandI) const
 {
-    return model1_->ECont() + model2_->ECont();
+    return model1_->ECont(bandI) + model2_->ECont(bandI);
 }
 
 
 Foam::tmp<Foam::volScalarField>
-Foam::radiation::binaryAbsorptionEmission::EDisp() const
+Foam::radiation::binaryAbsorptionEmission::EDisp(const label bandI) const
 {
-    return model1_->EDisp() + model2_->EDisp();
+    return model1_->EDisp(bandI) + model2_->EDisp(bandI);
 }
 
 
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H
index 68ad204b84..d5cec44a8f 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H
@@ -92,28 +92,28 @@ public:
             // Absorption coefficient
 
                 //- Absorption coefficient for continuous phase
-                tmp<volScalarField> aCont() const;
+                virtual tmp<volScalarField> aCont(const label bandI = 0) const;
 
                 //- Absorption coefficient for dispersed phase
-                tmp<volScalarField> aDisp() const;
+                virtual tmp<volScalarField> aDisp(const label bandI = 0) const;
 
 
             // Emission coefficient
 
                 //- Emission coefficient for continuous phase
-                tmp<volScalarField> eCont() const;
+                virtual tmp<volScalarField> eCont(const label bandI = 0) const;
 
                 //- Emission coefficient for dispersed phase
-                tmp<volScalarField> eDisp() const;
+                virtual tmp<volScalarField> eDisp(const label bandI = 0) const;
 
 
             // Emission contribution
 
                 //- Emission contribution for continuous phase
-                tmp<volScalarField> ECont() const;
+                virtual tmp<volScalarField> ECont(const label bandI = 0) const;
 
                 //- Emission contribution for continuous phase
-                tmp<volScalarField> EDisp() const;
+                virtual tmp<volScalarField> EDisp(const label bandI = 0) const;
 };
 
 

From 287fd398e2c9ba212d8f32618085510b3f46184e Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 20 May 2009 17:37:54 +0100
Subject: [PATCH 171/175] adding missed file from tutorial

---
 .../coalChemistryFoam/simplifiedSiwek/0/p.org | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/p.org

diff --git a/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/p.org b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/p.org
new file mode 100644
index 0000000000..e716bc595b
--- /dev/null
+++ b/tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/0/p.org
@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 100000;
+
+boundaryField
+{
+    top
+    {
+        type            zeroGradient;
+    }
+
+    bottom
+    {
+        type            zeroGradient;
+    }
+
+    walls
+    {
+        type            zeroGradient;
+    }
+
+    symmetry
+    {
+        type            symmetryPlane;
+    }
+
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //

From a5623956872f9d0c9dc0f460cfeb118602e9912e Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Thu, 21 May 2009 17:45:56 +0100
Subject: [PATCH 172/175] Allow the setting of the Qt version via the path to
 the appropriate qmake.

---
 bin/buildParaView                | 3 +++
 bin/tools/buildParaViewFunctions | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/bin/buildParaView b/bin/buildParaView
index 76a0264e69..35d027c3da 100755
--- a/bin/buildParaView
+++ b/bin/buildParaView
@@ -56,6 +56,9 @@ MESA_LIBRARY="/usr/lib64/libOSMesa.so"
 # extra QT gui support (useful for re-using the installation for engrid)
 withQTSUPPORT=true
 
+# Set the path to the Qt-4.3.? qmake if the system Qt is other than this version
+#QMAKE_PATH=/usr/local/Trolltech/Qt-4.3.4/bin/qmake
+
 #
 # No further editing below this line
 #------------------------------------------------------------------------------
diff --git a/bin/tools/buildParaViewFunctions b/bin/tools/buildParaViewFunctions
index f1c6ffaed6..5b3ae1fec9 100644
--- a/bin/tools/buildParaViewFunctions
+++ b/bin/tools/buildParaViewFunctions
@@ -170,6 +170,11 @@ addQtSupport()
     [ "${withQTSUPPORT:=false}" = true ] || return
 
     addCMakeVariable "PARAVIEW_BUILD_QT_GUI=ON"
+
+    if [ -n "$QMAKE_PATH" ]
+    then
+        addCMakeVariable QT_QMAKE_EXECUTABLE:FILEPATH=$QMAKE_PATH
+    fi
 }
 
 

From cc5506f103ce65449d51325512c648fbf2c6052f Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Thu, 21 May 2009 18:29:13 +0100
Subject: [PATCH 173/175] Added backward compatibility in the naming of the
 ParaView directory.

---
 bin/buildParaView | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/buildParaView b/bin/buildParaView
index 35d027c3da..de0fe41150 100755
--- a/bin/buildParaView
+++ b/bin/buildParaView
@@ -57,7 +57,7 @@ MESA_LIBRARY="/usr/lib64/libOSMesa.so"
 withQTSUPPORT=true
 
 # Set the path to the Qt-4.3.? qmake if the system Qt is other than this version
-#QMAKE_PATH=/usr/local/Trolltech/Qt-4.3.4/bin/qmake
+QMAKE_PATH=/usr/local/Trolltech/Qt-4.3.4/bin/qmake
 
 #
 # No further editing below this line

From 71a73d9490608f01750a903ee7aa6b2df94d9761 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 22 May 2009 11:57:05 +0100
Subject: [PATCH 174/175] removing duplicate file

---
 .../buoyantSimpleRadiationFoam/createRadiationModel.H        | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/createRadiationModel.H

diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/createRadiationModel.H b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/createRadiationModel.H
deleted file mode 100644
index babe3c4dbe..0000000000
--- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/createRadiationModel.H
+++ /dev/null
@@ -1,5 +0,0 @@
-    Info<< "Creating radiation model\n" << endl;
-    autoPtr<radiation::radiationModel> radiation
-    (
-        radiation::radiationModel::New(thermo->T())
-    );

From 88ea18c3a724a22236bcdfcc0cbb9bbd8d795efb Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 22 May 2009 12:32:17 +0100
Subject: [PATCH 175/175] change to QMAKE_PATH

---
 bin/buildParaView | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/buildParaView b/bin/buildParaView
index de0fe41150..cceee96487 100755
--- a/bin/buildParaView
+++ b/bin/buildParaView
@@ -57,7 +57,9 @@ MESA_LIBRARY="/usr/lib64/libOSMesa.so"
 withQTSUPPORT=true
 
 # Set the path to the Qt-4.3.? qmake if the system Qt is other than this version
-QMAKE_PATH=/usr/local/Trolltech/Qt-4.3.4/bin/qmake
+QMAKE_PATH=""
+#QMAKE_PATH=/usr/local/Trolltech/Qt-4.3.5/bin/qmake
+#QMAKE_PATH=$WM_THIRD_PARTY_DIR/qt-x11-opensource-src-4.3.5/platforms/linux64GccDPOpt/bin/qmake
 
 #
 # No further editing below this line