diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C
index f2ddf13741..c3ae69847d 100644
--- a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C
+++ b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C
@@ -39,6 +39,20 @@ int main(int argc, char *argv[])
 #   include "createTime.H"
 #   include "createMesh.H"
 
+    Info<< "\nReading field U\n" << endl;
+    volVectorField U
+    (
+        IOobject
+        (
+            "U",
+            runTime.timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh
+    );
+
     potential pot(mesh);
 
     moleculeCloud molecules(mesh, pot);
diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C b/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C
index 3aa2532c3e..ade0895a2a 100644
--- a/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C
+++ b/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C
@@ -39,6 +39,20 @@ int main(int argc, char *argv[])
 #   include "createTime.H"
 #   include "createMesh.H"
 
+    Info<< "\nReading field U\n" << endl;
+    volVectorField U
+    (
+        IOobject
+        (
+            "U",
+            runTime.timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh
+    );
+
     potential pot(mesh);
 
     moleculeCloud molecules(mesh, pot);
diff --git a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/Make/files b/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/Make/files
new file mode 100644
index 0000000000..7a27f008c8
--- /dev/null
+++ b/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/Make/files
@@ -0,0 +1,3 @@
+incompressibleUncoupledKinematicParcelFoam.C
+
+EXE = $(FOAM_APPBIN)/incompressibleUncoupledKinematicParcelFoam
diff --git a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/Make/options
new file mode 100644
index 0000000000..1ad3529232
--- /dev/null
+++ b/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/Make/options
@@ -0,0 +1,27 @@
+EXE_INC = \
+    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
+    -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
+    -I$(LIB_SRC)/transportModels \
+    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/surfaceFilmModels/lnInclude
+
+EXE_LIBS = \
+    -llagrangian \
+    -llagrangianIntermediate \
+    -lthermophysicalFunctions \
+    -lbasicThermophysicalModels \
+    -lspecie \
+    -lradiation \
+    -lincompressibleRASModels \
+    -lincompressibleLESModels \
+    -lincompressibleTransportModels \
+    -lfiniteVolume \
+    -lmeshTools \
+    -lsurfaceFilmModels
diff --git a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/createFields.H
new file mode 100644
index 0000000000..d98e9369b8
--- /dev/null
+++ b/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/createFields.H
@@ -0,0 +1,147 @@
+    Info<< "Reading transportProperties\n" << endl;
+
+    IOdictionary transportProperties
+    (
+        IOobject
+        (
+            "transportProperties",
+            runTime.constant(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        )
+    );
+
+    dimensionedScalar rhoInfValue
+    (
+        transportProperties.lookup("rhoInf")
+    );
+
+    volScalarField rhoInf
+    (
+        IOobject
+        (
+            "rho",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh,
+        rhoInfValue
+    );
+
+    Info<< "\nReading field U\n" << endl;
+    volVectorField U
+    (
+        IOobject
+        (
+            "U",
+            runTime.timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh
+    );
+
+    #include "createPhi.H"
+
+    Info<< "Creating turbulence model\n" << endl;
+
+    singlePhaseTransportModel laminarTransport(U, phi);
+
+    const volScalarField nu = laminarTransport.nu();
+
+    autoPtr<incompressible::turbulenceModel> turbulence
+    (
+        incompressible::turbulenceModel::New(U, phi, laminarTransport)
+    );
+
+    volScalarField mu
+    (
+        IOobject
+        (
+            "mu",
+            runTime.timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        nu*rhoInfValue
+    );
+
+    word kinematicCloudName("kinematicCloud");
+    args.optionReadIfPresent("cloudName", kinematicCloudName);
+
+    Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;
+    basicKinematicCloud kinematicCloud
+    (
+        kinematicCloudName,
+        rhoInf,
+        U,
+        mu,
+        g
+    );
+
+    IOobject Hheader
+    (
+        "H",
+        runTime.timeName(),
+        mesh,
+        IOobject::NO_READ
+    );
+
+    autoPtr<volVectorField> HPtr_;
+
+    if (Hheader.headerOk())
+    {
+        Info<< "\nReading field H\n" << endl;
+
+        HPtr_.reset
+        (
+            new volVectorField
+            (
+                IOobject
+                (
+                    "H",
+                    runTime.timeName(),
+                    mesh,
+                    IOobject::MUST_READ,
+                    IOobject::AUTO_WRITE
+                ),
+                mesh
+            )
+        );
+    }
+
+    IOobject HdotGradHheader
+    (
+        "HdotGradH",
+        runTime.timeName(),
+        mesh,
+        IOobject::NO_READ
+    );
+
+    autoPtr<volVectorField> HdotGradHPtr_;
+
+    if (HdotGradHheader.headerOk())
+    {
+        Info<< "\nReading field HdotGradH\n" << endl;
+
+        HdotGradHPtr_.reset
+        (
+            new volVectorField
+            (
+                IOobject
+                (
+                    "HdotGradH",
+                    runTime.timeName(),
+                    mesh,
+                    IOobject::MUST_READ,
+                    IOobject::AUTO_WRITE
+                ),
+                mesh
+            )
+        );
+    }
diff --git a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/incompressibleUncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/incompressibleUncoupledKinematicParcelFoam.C
new file mode 100644
index 0000000000..bc87b5118f
--- /dev/null
+++ b/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/incompressibleUncoupledKinematicParcelFoam.C
@@ -0,0 +1,81 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2008-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 3 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, see <http://www.gnu.org/licenses/>.
+
+Application
+    uncoupledKinematicParcelFoam
+
+Description
+    Transient solver for the passive transport of a single kinematic
+    particle could.
+
+    Uses a pre-calculated velocity field to evolve the cloud.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fvCFD.H"
+#include "singlePhaseTransportModel.H"
+#include "turbulenceModel.H"
+#include "basicKinematicCloud.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    argList::addOption("cloudName", "cloud name");
+
+    #include "setRootCase.H"
+    #include "createTime.H"
+    #include "createMesh.H"
+    #include "readGravitationalAcceleration.H"
+    #include "createFields.H"
+
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+    Info<< "\nStarting time loop\n" << endl;
+
+    while (runTime.loop())
+    {
+        Info<< "Time = " << runTime.timeName() << nl << endl;
+
+        Info<< "Evolving " << kinematicCloud.name() << endl;
+
+        laminarTransport.correct();
+
+        mu = nu*rhoInfValue;
+
+        kinematicCloud.evolve();
+
+        runTime.write();
+
+        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
+            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
+            << nl << endl;
+    }
+
+    Info<< "End\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/globalIndex/Make/files b/applications/test/globalIndex/Make/files
index 6d7dd88f14..cb25b3090f 100644
--- a/applications/test/globalIndex/Make/files
+++ b/applications/test/globalIndex/Make/files
@@ -1,4 +1,3 @@
-globalIndex.C
 globalIndexTest.C
 
 EXE = $(FOAM_USER_APPBIN)/globalIndexTest
diff --git a/applications/test/nearWallDist-wave/testWallDist2.C b/applications/test/nearWallDist-wave/testWallDist2.C
index ee9fff90b3..49322a558d 100644
--- a/applications/test/nearWallDist-wave/testWallDist2.C
+++ b/applications/test/nearWallDist-wave/testWallDist2.C
@@ -108,13 +108,17 @@ int main(int argc, char *argv[])
         }
     }
 
+    List<wallPoint> allFaceInfo(mesh.nFaces());
+    List<wallPoint> allCellInfo(mesh.nCells());
 
-    MeshWave<wallPoint> wallDistCalc
+    FaceCellWave<wallPoint> wallDistCalc
     (
         mesh,
         changedFaces,
         faceDist,
-        0           // max iterations
+        allFaceInfo,
+        allCellInfo,
+        0             // max iterations
     );
 
     Info<< "\nStarting time loop\n" << endl;
@@ -148,16 +152,13 @@ int main(int argc, char *argv[])
         // Copy face and cell values into field
         //
 
-        const List<wallPoint>& cellInfo = wallDistCalc.allCellInfo();
-        const List<wallPoint>& faceInfo = wallDistCalc.allFaceInfo();
-
         label nIllegal = 0;
 
         // Copy cell values
-        forAll(cellInfo, cellI)
+        forAll(allCellInfo, cellI)
         {
-            scalar dist = cellInfo[cellI].distSqr();
-            if (cellInfo[cellI].valid())
+            scalar dist = allCellInfo[cellI].distSqr();
+            if (allCellInfo[cellI].valid())
             {
                 wallDistUncorrected[cellI] = Foam::sqrt(dist);
             }
@@ -178,8 +179,8 @@ int main(int argc, char *argv[])
             {
                 const label meshFaceI = patchField.patch().start() + patchFaceI;
 
-                scalar dist = faceInfo[meshFaceI].distSqr();
-                if (faceInfo[meshFaceI].valid())
+                scalar dist = allFaceInfo[meshFaceI].distSqr();
+                if (allFaceInfo[meshFaceI].valid())
                 {
                     patchField[patchFaceI] = Foam::sqrt(dist);
                 }
diff --git a/src/lagrangian/basic/Cloud/Cloud.C b/src/lagrangian/basic/Cloud/Cloud.C
index ef43828c4c..ceaf1c44d4 100644
--- a/src/lagrangian/basic/Cloud/Cloud.C
+++ b/src/lagrangian/basic/Cloud/Cloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/basic/Cloud/Cloud.H b/src/lagrangian/basic/Cloud/Cloud.H
index b173f60fe4..0520c51869 100644
--- a/src/lagrangian/basic/Cloud/Cloud.H
+++ b/src/lagrangian/basic/Cloud/Cloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/basic/Cloud/CloudIO.C b/src/lagrangian/basic/Cloud/CloudIO.C
index 067378c3cf..24a65c1685 100644
--- a/src/lagrangian/basic/Cloud/CloudIO.C
+++ b/src/lagrangian/basic/Cloud/CloudIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/basic/IOPosition/IOPosition.C b/src/lagrangian/basic/IOPosition/IOPosition.C
index 5d0d62facb..c62898895a 100644
--- a/src/lagrangian/basic/IOPosition/IOPosition.C
+++ b/src/lagrangian/basic/IOPosition/IOPosition.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/basic/IOPosition/IOPosition.H b/src/lagrangian/basic/IOPosition/IOPosition.H
index 52c9a2cedd..a421fa29ac 100644
--- a/src/lagrangian/basic/IOPosition/IOPosition.H
+++ b/src/lagrangian/basic/IOPosition/IOPosition.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/basic/InteractionLists/InteractionLists.C b/src/lagrangian/basic/InteractionLists/InteractionLists.C
new file mode 100644
index 0000000000..83ab477ee4
--- /dev/null
+++ b/src/lagrangian/basic/InteractionLists/InteractionLists.C
@@ -0,0 +1,1208 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2008-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "InteractionLists.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class ParticleType>
+void Foam::InteractionLists<ParticleType>::buildInteractionLists()
+{
+    Info<< "Building InteractionLists with interaction distance "
+        << maxDistance_ << endl;
+
+    Random rndGen(419715);
+
+    const vector interactionVec = maxDistance_*vector::one;
+
+    treeBoundBox procBb(treeBoundBox(mesh_.points()));
+
+    treeBoundBox extendedProcBb
+    (
+        procBb.min() - interactionVec,
+        procBb.max() + interactionVec
+    );
+
+    treeBoundBoxList allExtendedProcBbs(Pstream::nProcs());
+
+    allExtendedProcBbs[Pstream::myProcNo()] = extendedProcBb;
+
+    Pstream::gatherList(allExtendedProcBbs);
+
+    Pstream::scatterList(allExtendedProcBbs);
+
+    List<treeBoundBox> extendedProcBbsInRange;
+    List<label> extendedProcBbsTransformIndex;
+    List<label> extendedProcBbsOrigProc;
+
+    findExtendedProcBbsInRange
+    (
+        procBb,
+        allExtendedProcBbs,
+        globalTransforms_,
+        extendedProcBbsInRange,
+        extendedProcBbsTransformIndex,
+        extendedProcBbsOrigProc
+    );
+
+    treeBoundBoxList cellBbs(mesh_.nCells());
+
+    forAll(cellBbs, cellI)
+    {
+        cellBbs[cellI] = treeBoundBox
+        (
+            mesh_.cells()[cellI].points
+            (
+                mesh_.faces(),
+                mesh_.points()
+            )
+        );
+    }
+
+    // Recording which cells are in range of an extended boundBox, as
+    // only these cells will need to be tested to determine which
+    // referred cells that they interact with.
+    PackedBoolList cellInRangeOfCoupledPatch(mesh_.nCells(), false);
+
+    // IAndT: index and transform
+    DynamicList<labelPair> cellIAndTToExchange;
+
+    DynamicList<treeBoundBox> cellBbsToExchange;
+
+    DynamicList<label> procToDistributeCellTo;
+
+    forAll(extendedProcBbsInRange, ePBIRI)
+    {
+        const treeBoundBox& otherExtendedProcBb =
+            extendedProcBbsInRange[ePBIRI];
+
+        label transformIndex = extendedProcBbsTransformIndex[ePBIRI];
+
+        label origProc = extendedProcBbsOrigProc[ePBIRI];
+
+        forAll(cellBbs, cellI)
+        {
+            const treeBoundBox& cellBb = cellBbs[cellI];
+
+            if (cellBb.overlaps(otherExtendedProcBb))
+            {
+                // This cell is in range of the Bb of the other
+                // processor Bb, and so needs to be referred to it
+
+                cellInRangeOfCoupledPatch[cellI] = true;
+
+                cellIAndTToExchange.append
+                (
+                    globalTransforms_.encode(cellI, transformIndex)
+                );
+
+                cellBbsToExchange.append(cellBb);
+
+                procToDistributeCellTo.append(origProc);
+            }
+        }
+    }
+
+    buildMap(cellMapPtr_, procToDistributeCellTo);
+
+    // Needed for reverseDistribute
+    label preDistributionCellMapSize = procToDistributeCellTo.size();
+
+    cellMap().distribute(cellBbsToExchange);
+
+    cellMap().distribute(cellIAndTToExchange);
+
+    // Determine labelList specifying only cells that are in range of
+    // a coupled boundary to build an octree limited to these cells.
+    DynamicList<label> coupledPatchRangeCells;
+
+    forAll(cellInRangeOfCoupledPatch, cellI)
+    {
+        if (cellInRangeOfCoupledPatch[cellI])
+        {
+            coupledPatchRangeCells.append(cellI);
+        }
+    }
+
+    treeBoundBox procBbRndExt
+    (
+        treeBoundBox(mesh_.points()).extend(rndGen, 1e-4)
+    );
+
+    indexedOctree<treeDataCell> coupledPatchRangeTree
+    (
+        treeDataCell(true, mesh_, coupledPatchRangeCells),
+        procBbRndExt,
+        8,              // maxLevel,
+        10,             // leafSize,
+        100.0
+    );
+
+    ril_.setSize(cellBbsToExchange.size());
+
+    // This needs to be a boolList, not PackedBoolList if
+    // reverseDistribute is called.
+    boolList cellBbRequiredByAnyCell(cellBbsToExchange.size(), false);
+
+    Info<< "    Building referred interaction lists" << endl;
+
+    forAll(cellBbsToExchange, bbI)
+    {
+        const labelPair& ciat = cellIAndTToExchange[bbI];
+
+        const vectorTensorTransform& transform = globalTransforms_.transform
+        (
+            globalTransforms_.transformIndex(ciat)
+        );
+
+        treeBoundBox tempTransformedBb
+        (
+            transform.invTransform(cellBbsToExchange[bbI].corners())
+        );
+
+        treeBoundBox extendedBb
+        (
+            tempTransformedBb.min() - interactionVec,
+            tempTransformedBb.max() + interactionVec
+        );
+
+        // Find all elements intersecting box.
+        labelList interactingElems
+        (
+            coupledPatchRangeTree.findBox(extendedBb)
+        );
+
+        if (!interactingElems.empty())
+        {
+            cellBbRequiredByAnyCell[bbI] = true;
+        }
+
+        ril_[bbI].setSize(interactingElems.size(), -1);
+
+        forAll(interactingElems, i)
+        {
+            label elemI = interactingElems[i];
+
+            // Here, a more detailed geometric test could be applied,
+            // i.e. a more accurate bounding volume like a OBB or
+            // convex hull or an exact geometrical test.
+
+            label c = coupledPatchRangeTree.shapes().cellLabels()[elemI];
+
+            ril_[bbI][i] = c;
+        }
+    }
+
+    // Perform subset of ril_, to remove any referred cells that do
+    // not interact.  They will not be sent from originating
+    // processors.  This assumes that the disappearance of the cell
+    // from the sending list of the source processor, simply removes
+    // the referred cell from the ril_, all of the subsequent indices
+    // shuffle down one, but the order and structure is preserved,
+    // i.e. it, is as if the cell had never been referred in the first
+    // place.
+
+    inplaceSubset(cellBbRequiredByAnyCell, ril_);
+
+    // Send information about which cells are actually required back
+    // to originating processors.
+
+    // At this point, cellBbsToExchange does not need to be maintained
+    // or distributed as it is not longer needed.
+
+    cellBbsToExchange.setSize(0);
+
+    cellMap().reverseDistribute
+    (
+        preDistributionCellMapSize,
+        cellBbRequiredByAnyCell
+    );
+
+    cellMap().reverseDistribute
+    (
+        preDistributionCellMapSize,
+        cellIAndTToExchange
+    );
+
+    // Perform ordering of cells to send, this invalidates the
+    // previous value of preDistributionCellMapSize.
+
+    preDistributionCellMapSize = -1;
+
+    // Move all of the used cells to refer to the start of the list
+    // and truncate it
+
+    inplaceSubset(cellBbRequiredByAnyCell, cellIAndTToExchange);
+
+    inplaceSubset(cellBbRequiredByAnyCell, procToDistributeCellTo);
+
+    preDistributionCellMapSize = procToDistributeCellTo.size();
+
+    // Rebuild mapDistribute with only required referred cells
+    buildMap(cellMapPtr_, procToDistributeCellTo);
+
+    // Store cellIndexAndTransformToDistribute
+    cellIndexAndTransformToDistribute_.transfer(cellIAndTToExchange);
+
+    // Determine inverse addressing for referred cells
+
+    rilInverse_.setSize(mesh_.nCells());
+
+    // Temporary Dynamic lists for accumulation
+    List<DynamicList<label> > rilInverseTemp(rilInverse_.size());
+
+    // Loop over all referred cells
+    forAll(ril_, refCellI)
+    {
+        const labelList& realCells = ril_[refCellI];
+
+        // Loop over all real cells in that the referred cell is to
+        // supply interactions to and record the index of this
+        // referred cell in the real cells entry in rilInverse
+
+        forAll(realCells, realCellI)
+        {
+            rilInverseTemp[realCells[realCellI]].append(refCellI);
+        }
+    }
+
+    forAll(rilInverse_, cellI)
+    {
+        rilInverse_[cellI].transfer(rilInverseTemp[cellI]);
+    }
+
+    // Determine which wall faces to refer
+
+    // The referring of wall patch data relies on patches having the same
+    // index on each processor.
+    mesh_.boundaryMesh().checkParallelSync(true);
+
+    // Determine the index of all of the wall faces on this processor
+    DynamicList<label> localWallFaces;
+
+    forAll(mesh_.boundaryMesh(), patchI)
+    {
+        const polyPatch& patch = mesh_.boundaryMesh()[patchI];
+
+        if (isA<wallPolyPatch>(patch))
+        {
+            localWallFaces.append(identity(patch.size()) + patch.start());
+        }
+    }
+
+    treeBoundBoxList wallFaceBbs(localWallFaces.size());
+
+    forAll(wallFaceBbs, i)
+    {
+        wallFaceBbs[i] = treeBoundBox
+        (
+            mesh_.faces()[localWallFaces[i]].points(mesh_.points())
+        );
+    }
+
+    // IAndT: index and transform
+    DynamicList<labelPair> wallFaceIAndTToExchange;
+
+    DynamicList<treeBoundBox> wallFaceBbsToExchange;
+
+    DynamicList<label> procToDistributeWallFaceTo;
+
+    forAll(extendedProcBbsInRange, ePBIRI)
+    {
+        const treeBoundBox& otherExtendedProcBb =
+            extendedProcBbsInRange[ePBIRI];
+
+        label transformIndex = extendedProcBbsTransformIndex[ePBIRI];
+
+        label origProc = extendedProcBbsOrigProc[ePBIRI];
+
+        forAll(wallFaceBbs, i)
+        {
+            const treeBoundBox& wallFaceBb = wallFaceBbs[i];
+
+            if (wallFaceBb.overlaps(otherExtendedProcBb))
+            {
+                // This wall face is in range of the Bb of the other
+                // processor Bb, and so needs to be referred to it
+
+                label wallFaceI = localWallFaces[i];
+
+                wallFaceIAndTToExchange.append
+                (
+                    globalTransforms_.encode(wallFaceI, transformIndex)
+                );
+
+                wallFaceBbsToExchange.append(wallFaceBb);
+
+                procToDistributeWallFaceTo.append(origProc);
+            }
+        }
+    }
+
+    buildMap(wallFaceMapPtr_, procToDistributeWallFaceTo);
+
+    // Needed for reverseDistribute
+    label preDistributionWallFaceMapSize = procToDistributeWallFaceTo.size();
+
+    wallFaceMap().distribute(wallFaceBbsToExchange);
+
+    wallFaceMap().distribute(wallFaceIAndTToExchange);
+
+    indexedOctree<treeDataCell> allCellsTree
+    (
+        treeDataCell(true, mesh_),
+        procBbRndExt,
+        8,              // maxLevel,
+        10,             // leafSize,
+        100.0
+    );
+
+    rwfil_.setSize(wallFaceBbsToExchange.size());
+
+    // This needs to be a boolList, not PackedBoolList if
+    // reverseDistribute is called.
+    boolList wallFaceBbRequiredByAnyCell(wallFaceBbsToExchange.size(), false);
+
+    forAll(wallFaceBbsToExchange, bbI)
+    {
+        const labelPair& wfiat = wallFaceIAndTToExchange[bbI];
+
+        const vectorTensorTransform& transform = globalTransforms_.transform
+        (
+            globalTransforms_.transformIndex(wfiat)
+        );
+
+        treeBoundBox tempTransformedBb
+        (
+            transform.invTransform(wallFaceBbsToExchange[bbI].corners())
+        );
+
+        treeBoundBox extendedBb
+        (
+            tempTransformedBb.min() - interactionVec,
+            tempTransformedBb.max() + interactionVec
+        );
+
+        // Find all elements intersecting box.
+        labelList interactingElems
+        (
+            coupledPatchRangeTree.findBox(extendedBb)
+        );
+
+        if (!interactingElems.empty())
+        {
+            wallFaceBbRequiredByAnyCell[bbI] = true;
+        }
+
+        rwfil_[bbI].setSize(interactingElems.size(), -1);
+
+        forAll(interactingElems, i)
+        {
+            label elemI = interactingElems[i];
+
+            // Here, a more detailed geometric test could be applied,
+            // i.e. a more accurate bounding volume like a OBB or
+            // convex hull or an exact geometrical test.
+
+            label c = coupledPatchRangeTree.shapes().cellLabels()[elemI];
+
+            rwfil_[bbI][i] = c;
+        }
+    }
+
+    // Perform subset of rwfil_, to remove any referred wallFaces that do
+    // not interact.  They will not be sent from originating
+    // processors.  This assumes that the disappearance of the wallFace
+    // from the sending list of the source processor, simply removes
+    // the referred wallFace from the rwfil_, all of the subsequent indices
+    // shuffle down one, but the order and structure is preserved,
+    // i.e. it, is as if the wallFace had never been referred in the first
+    // place.
+
+    inplaceSubset(wallFaceBbRequiredByAnyCell, rwfil_);
+
+    // Send information about which wallFaces are actually required
+    // back to originating processors.
+
+    // At this point, wallFaceBbsToExchange does not need to be
+    // maintained or distributed as it is not longer needed.
+
+    wallFaceBbsToExchange.setSize(0);
+
+    wallFaceMap().reverseDistribute
+    (
+        preDistributionWallFaceMapSize,
+        wallFaceBbRequiredByAnyCell
+    );
+
+    wallFaceMap().reverseDistribute
+    (
+        preDistributionWallFaceMapSize,
+        wallFaceIAndTToExchange
+    );
+
+    // Perform ordering of wallFaces to send, this invalidates the
+    // previous value of preDistributionWallFaceMapSize.
+
+    preDistributionWallFaceMapSize = -1;
+
+    // Move all of the used wallFaces to refer to the start of the
+    // list and truncate it
+
+    inplaceSubset(wallFaceBbRequiredByAnyCell, wallFaceIAndTToExchange);
+
+    inplaceSubset(wallFaceBbRequiredByAnyCell, procToDistributeWallFaceTo);
+
+    preDistributionWallFaceMapSize = procToDistributeWallFaceTo.size();
+
+    // Rebuild mapDistribute with only required referred wallFaces
+    buildMap(wallFaceMapPtr_, procToDistributeWallFaceTo);
+
+    // Store wallFaceIndexAndTransformToDistribute
+    wallFaceIndexAndTransformToDistribute_.transfer(wallFaceIAndTToExchange);
+
+    // Determine inverse addressing for referred wallFaces
+
+    rwfilInverse_.setSize(mesh_.nCells());
+
+    // Temporary Dynamic lists for accumulation
+    List<DynamicList<label> > rwfilInverseTemp(rwfilInverse_.size());
+
+    // Loop over all referred wall faces
+    forAll(rwfil_, refWallFaceI)
+    {
+        const labelList& realCells = rwfil_[refWallFaceI];
+
+        // Loop over all real cells in that the referred wall face is
+        // to supply interactions to and record the index of this
+        // referred wall face in the real cells entry in rwfilInverse
+
+        forAll(realCells, realCellI)
+        {
+            rwfilInverseTemp[realCells[realCellI]].append(refWallFaceI);
+        }
+    }
+
+    forAll(rwfilInverse_, cellI)
+    {
+        rwfilInverse_[cellI].transfer(rwfilInverseTemp[cellI]);
+    }
+
+    // Refer wall faces to the appropriate processor
+    referredWallFaces_.setSize(wallFaceIndexAndTransformToDistribute_.size());
+
+    forAll(referredWallFaces_, rWFI)
+    {
+        const labelPair& wfiat = wallFaceIndexAndTransformToDistribute_[rWFI];
+
+        label wallFaceIndex = globalTransforms_.index(wfiat);
+
+        const vectorTensorTransform& transform = globalTransforms_.transform
+        (
+            globalTransforms_.transformIndex(wfiat)
+        );
+
+        const face& f = mesh_.faces()[wallFaceIndex];
+
+        label patchI = mesh_.boundaryMesh().patchID()
+        [
+            wallFaceIndex - mesh_.nInternalFaces()
+        ];
+
+        referredWallFaces_[rWFI] = referredWallFace
+        (
+            face(identity(f.size())),
+            transform.invTransform(f.points(mesh_.points())),
+            patchI
+        );
+    }
+
+    wallFaceMap().distribute(referredWallFaces_);
+
+    if (writeCloud_)
+    {
+        writeReferredWallFaces();
+    }
+
+    // Direct interaction list and direct wall faces
+
+    Info<< "    Building direct interaction lists" << endl;
+
+    indexedOctree<treeDataFace> wallFacesTree
+    (
+        treeDataFace(true, mesh_, localWallFaces),
+        procBbRndExt,
+        8,              // maxLevel,
+        10,             // leafSize,
+        100.0
+    );
+
+    dil_.setSize(mesh_.nCells());
+
+    dwfil_.setSize(mesh_.nCells());
+
+    forAll(cellBbs, cellI)
+    {
+        const treeBoundBox& cellBb = cellBbs[cellI];
+
+        treeBoundBox extendedBb
+        (
+            cellBb.min() - interactionVec,
+            cellBb.max() + interactionVec
+        );
+
+        // Find all cells intersecting extendedBb
+        labelList interactingElems
+        (
+            allCellsTree.findBox(extendedBb)
+        );
+
+        // Reserve space to avoid multiple resizing
+        DynamicList<label> cellDIL(interactingElems.size());
+
+        forAll(interactingElems, i)
+        {
+            label elemI = interactingElems[i];
+
+            label c = allCellsTree.shapes().cellLabels()[elemI];
+
+            // Here, a more detailed geometric test could be applied,
+            // i.e. a more accurate bounding volume like a OBB or
+            // convex hull, or an exact geometrical test.
+
+            // The higher index cell is added to the lower index
+            // cell's DIL.  A cell is not added to its own DIL.
+            if (c > cellI)
+            {
+                cellDIL.append(c);
+            }
+        }
+
+        dil_[cellI].transfer(cellDIL);
+
+        // Find all wall faces intersecting extendedBb
+        interactingElems = wallFacesTree.findBox(extendedBb);
+
+        dwfil_[cellI].setSize(interactingElems.size(), -1);
+
+        forAll(interactingElems, i)
+        {
+            label elemI = interactingElems[i];
+
+            label f = wallFacesTree.shapes().faceLabels()[elemI];
+
+            dwfil_[cellI][i] = f;
+        }
+    }
+}
+
+
+template<class ParticleType>
+void Foam::InteractionLists<ParticleType>::findExtendedProcBbsInRange
+(
+    const treeBoundBox& procBb,
+    const List<treeBoundBox>& allExtendedProcBbs,
+    const globalIndexAndTransform& globalTransforms,
+    List<treeBoundBox>& extendedProcBbsInRange,
+    List<label>& extendedProcBbsTransformIndex,
+    List<label>& extendedProcBbsOrigProc
+)
+{
+    extendedProcBbsInRange.setSize(0);
+    extendedProcBbsTransformIndex.setSize(0);
+    extendedProcBbsOrigProc.setSize(0);
+
+    DynamicList<treeBoundBox> tmpExtendedProcBbsInRange;
+    DynamicList<label> tmpExtendedProcBbsTransformIndex;
+    DynamicList<label> tmpExtendedProcBbsOrigProc;
+
+    label nTrans = globalTransforms.nIndependentTransforms();
+
+    forAll(allExtendedProcBbs, procI)
+    {
+        List<label> permutationIndices(nTrans, 0);
+
+        vector s = vector::zero;
+
+        if (nTrans == 0 && procI != Pstream::myProcNo())
+        {
+            treeBoundBox extendedReferredProcBb = allExtendedProcBbs[procI];
+
+            if (procBb.overlaps(extendedReferredProcBb))
+            {
+                tmpExtendedProcBbsInRange.append
+                (
+                    extendedReferredProcBb
+                );
+
+                // Dummy index, there are no transforms, so there will
+                // be no resultant transform when this is decoded.
+                tmpExtendedProcBbsTransformIndex.append(0);
+
+                tmpExtendedProcBbsOrigProc.append(procI);
+            }
+        }
+        else if (nTrans == 3)
+        {
+            label& i = permutationIndices[0];
+            label& j = permutationIndices[1];
+            label& k = permutationIndices[2];
+
+            for (i = -1; i <= 1; i++)
+            {
+                for (j = -1; j <= 1; j++)
+                {
+                    for (k = -1; k <= 1; k++)
+                    {
+                        if
+                        (
+                            i == 0
+                         && j == 0
+                         && k == 0
+                         && procI == Pstream::myProcNo()
+                        )
+                        {
+                            // Skip this processor's extended boundBox
+                            // when it has no transformation
+                            continue;
+                        }
+
+                        label transI = globalTransforms.encodeTransformIndex
+                        (
+                            permutationIndices
+                        );
+
+                        const vectorTensorTransform& transform =
+                            globalTransforms.transform(transI);
+
+                        treeBoundBox extendedReferredProcBb
+                        (
+                            transform.transform
+                            (
+                                allExtendedProcBbs[procI].corners()
+                            )
+                        );
+
+                        if (procBb.overlaps(extendedReferredProcBb))
+                        {
+                            tmpExtendedProcBbsInRange.append
+                            (
+                                extendedReferredProcBb
+                            );
+
+                            tmpExtendedProcBbsTransformIndex.append(transI);
+
+                            tmpExtendedProcBbsOrigProc.append(procI);
+                        }
+                    }
+                }
+            }
+        }
+        else if (nTrans == 2)
+        {
+            label& i = permutationIndices[0];
+            label& j = permutationIndices[1];
+
+            for (i = -1; i <= 1; i++)
+            {
+                for (j = -1; j <= 1; j++)
+                {
+                    if (i == 0 && j == 0 && procI == Pstream::myProcNo())
+                    {
+                        // Skip this processor's extended boundBox
+                        // when it has no transformation
+                        continue;
+                    }
+
+                    label transI = globalTransforms.encodeTransformIndex
+                    (
+                        permutationIndices
+                    );
+
+                    const vectorTensorTransform& transform =
+                        globalTransforms.transform(transI);
+
+                    treeBoundBox extendedReferredProcBb
+                    (
+                        transform.transform
+                        (
+                            allExtendedProcBbs[procI].corners()
+                        )
+                    );
+
+                    if (procBb.overlaps(extendedReferredProcBb))
+                    {
+                        tmpExtendedProcBbsInRange.append
+                        (
+                            extendedReferredProcBb
+                        );
+
+                        tmpExtendedProcBbsTransformIndex.append(transI);
+
+                        tmpExtendedProcBbsOrigProc.append(procI);
+                    }
+                }
+            }
+        }
+        else if (nTrans == 1)
+        {
+            label& i = permutationIndices[0];
+
+            for (i = -1; i <= 1; i++)
+            {
+                if (i == 0 && procI == Pstream::myProcNo())
+                {
+                    // Skip this processor's extended boundBox when it
+                    // has no transformation
+                    continue;
+                }
+
+                label transI = globalTransforms.encodeTransformIndex
+                (
+                    permutationIndices
+                );
+
+                const vectorTensorTransform& transform =
+                    globalTransforms.transform(transI);
+
+                treeBoundBox extendedReferredProcBb
+                (
+                    transform.transform
+                    (
+                        allExtendedProcBbs[procI].corners()
+                    )
+                );
+
+                if (procBb.overlaps(extendedReferredProcBb))
+                {
+                    tmpExtendedProcBbsInRange.append
+                    (
+                        extendedReferredProcBb
+                    );
+
+                    tmpExtendedProcBbsTransformIndex.append(transI);
+
+                    tmpExtendedProcBbsOrigProc.append(procI);
+                }
+            }
+        }
+    }
+
+    extendedProcBbsInRange = tmpExtendedProcBbsInRange.xfer();
+    extendedProcBbsTransformIndex = tmpExtendedProcBbsTransformIndex.xfer();
+    extendedProcBbsOrigProc = tmpExtendedProcBbsOrigProc.xfer();
+}
+
+
+template<class ParticleType>
+void Foam::InteractionLists<ParticleType>::buildMap
+(
+    autoPtr<mapDistribute>& mapPtr,
+    const List<label>& toProc
+)
+{
+    // Determine send map
+    // ~~~~~~~~~~~~~~~~~~
+
+    // 1. Count
+    labelList nSend(Pstream::nProcs(), 0);
+
+    forAll(toProc, i)
+    {
+        label procI = toProc[i];
+
+        nSend[procI]++;
+    }
+
+    // Send over how many I need to receive
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    labelListList sendSizes(Pstream::nProcs());
+
+    sendSizes[Pstream::myProcNo()] = nSend;
+
+    combineReduce(sendSizes, UPstream::listEq());
+
+    // 2. Size sendMap
+    labelListList sendMap(Pstream::nProcs());
+
+    forAll(nSend, procI)
+    {
+        sendMap[procI].setSize(nSend[procI]);
+
+        nSend[procI] = 0;
+    }
+
+    // 3. Fill sendMap
+    forAll(toProc, i)
+    {
+        label procI = toProc[i];
+
+        sendMap[procI][nSend[procI]++] = i;
+    }
+
+    // Determine receive map
+    // ~~~~~~~~~~~~~~~~~~~~~
+
+    labelListList constructMap(Pstream::nProcs());
+
+    // Local transfers first
+    constructMap[Pstream::myProcNo()] = identity
+    (
+        sendMap[Pstream::myProcNo()].size()
+    );
+
+    label constructSize = constructMap[Pstream::myProcNo()].size();
+
+    forAll(constructMap, procI)
+    {
+        if (procI != Pstream::myProcNo())
+        {
+            label nRecv = sendSizes[procI][Pstream::myProcNo()];
+
+            constructMap[procI].setSize(nRecv);
+
+            for (label i = 0; i < nRecv; i++)
+            {
+                constructMap[procI][i] = constructSize++;
+            }
+        }
+    }
+
+    mapPtr.reset
+    (
+        new mapDistribute
+        (
+
+            constructSize,
+            sendMap.xfer(),
+            constructMap.xfer()
+        )
+    );
+}
+
+
+template<class ParticleType>
+void Foam::InteractionLists<ParticleType>::prepareParticlesToRefer
+(
+    const List<DynamicList<ParticleType*> >& cellOccupancy
+)
+{
+    referredParticles_.setSize(cellIndexAndTransformToDistribute_.size());
+
+    // Clear all existing referred particles
+
+    forAll(referredParticles_, i)
+    {
+        referredParticles_[i].clear();
+    }
+
+    // Clear all particles that may have been populated into the cloud
+    cloud_.clear();
+
+    forAll(cellIndexAndTransformToDistribute_, i)
+    {
+        const labelPair ciat = cellIndexAndTransformToDistribute_[i];
+
+        label cellIndex = globalTransforms_.index(ciat);
+
+        List<ParticleType*> realParticles = cellOccupancy[cellIndex];
+
+        IDLList<ParticleType>& particlesToRefer = referredParticles_[i];
+
+        forAll (realParticles, rM)
+        {
+            const ParticleType& particle = *realParticles[rM];
+
+            particlesToRefer.append(particle.clone().ptr());
+
+            prepareParticleToBeReferred(particlesToRefer.last(), ciat);
+        }
+    }
+}
+
+
+template<class ParticleType>
+void Foam::InteractionLists<ParticleType>::prepareParticleToBeReferred
+(
+    ParticleType* particle,
+    labelPair ciat
+)
+{
+    const vectorTensorTransform& transform = globalTransforms_.transform
+    (
+        globalTransforms_.transformIndex(ciat)
+    );
+
+    particle->position() = transform.invTransform(particle->position());
+
+    particle->transformProperties(-transform.t());
+
+    if (transform.hasR())
+    {
+        particle->transformProperties(transform.R().T());
+    }
+}
+
+
+template<class ParticleType>
+void Foam::InteractionLists<ParticleType>::fillReferredParticleCloud()
+{
+    if (writeCloud_)
+    {
+        forAll(referredParticles_, refCellI)
+        {
+            const IDLList<ParticleType>& refCell =
+                referredParticles_[refCellI];
+
+            forAllConstIter(typename IDLList<ParticleType>, refCell, iter)
+            {
+                cloud_.addParticle(iter().clone().ptr());
+            }
+        }
+    }
+}
+
+
+template<class ParticleType>
+void Foam::InteractionLists<ParticleType>::prepareWallDataToRefer()
+{
+    referredWallData_.setSize
+    (
+        wallFaceIndexAndTransformToDistribute_.size()
+    );
+
+    const volVectorField& U = mesh_.lookupObject<volVectorField>(UName_);
+
+    forAll(referredWallData_, rWVI)
+    {
+        const labelPair& wfiat = wallFaceIndexAndTransformToDistribute_[rWVI];
+
+        label wallFaceIndex = globalTransforms_.index(wfiat);
+
+        const vectorTensorTransform& transform = globalTransforms_.transform
+        (
+            globalTransforms_.transformIndex(wfiat)
+        );
+
+        label patchI = mesh_.boundaryMesh().patchID()
+        [
+            wallFaceIndex - mesh_.nInternalFaces()
+        ];
+
+        label patchFaceI =
+            wallFaceIndex
+          - mesh_.boundaryMesh()[patchI].start();
+
+        // Need to transform velocity when tensor transforms are
+        // supported
+        referredWallData_[rWVI] = U.boundaryField()[patchI][patchFaceI];
+
+        if (transform.hasR())
+        {
+            referredWallData_[rWVI] =
+                transform.R().T() & referredWallData_[rWVI];
+        }
+    }
+}
+
+
+template<class ParticleType>
+void Foam::InteractionLists<ParticleType>::writeReferredWallFaces() const
+{
+    if (referredWallFaces_.empty())
+    {
+        return;
+    }
+
+    fileName objDir = mesh_.time().timePath()/cloud::prefix;
+
+    mkDir(objDir);
+
+    fileName objFileName = "referredWallFaces.obj";
+
+    OFstream str(objDir/objFileName);
+
+    Info<< "    Writing "
+        << mesh_.time().timeName()/cloud::prefix/objFileName
+        << endl;
+
+    label offset = 1;
+
+    forAll(referredWallFaces_, rWFI)
+    {
+        const referredWallFace& rwf = referredWallFaces_[rWFI];
+
+        forAll(rwf, fPtI)
+        {
+            meshTools::writeOBJ(str, rwf.points()[rwf[fPtI]]);
+        }
+
+        str<< 'f';
+
+        forAll(rwf, fPtI)
+        {
+            str<< ' ' << fPtI + offset;
+        }
+
+        str<< nl;
+
+        offset += rwf.size();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class ParticleType>
+Foam::InteractionLists<ParticleType>::InteractionLists
+(
+    const polyMesh& mesh,
+    scalar maxDistance,
+    Switch writeCloud,
+    const word& UName
+)
+:
+    mesh_(mesh),
+    cloud_(mesh_, "referredParticleCloud", IDLList<ParticleType>()),
+    writeCloud_(writeCloud),
+    cellMapPtr_(),
+    wallFaceMapPtr_(),
+    globalTransforms_(mesh_),
+    maxDistance_(maxDistance),
+    dil_(),
+    dwfil_(),
+    ril_(),
+    rilInverse_(),
+    cellIndexAndTransformToDistribute_(),
+    wallFaceIndexAndTransformToDistribute_(),
+    referredWallFaces_(),
+    UName_(UName),
+    referredWallData_(),
+    referredParticles_()
+{
+    buildInteractionLists();
+}
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class ParticleType>
+Foam::InteractionLists<ParticleType>::~InteractionLists()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+template<class ParticleType>
+void Foam::InteractionLists<ParticleType>::sendReferredData
+(
+    const List<DynamicList<ParticleType*> >& cellOccupancy,
+    PstreamBuffers& pBufs
+)
+{
+    if (mesh_.changing())
+    {
+        WarningIn
+        (
+            "void Foam::InteractionLists<ParticleType>::sendReferredData"
+            "("
+                "const List<DynamicList<ParticleType*> >& cellOccupancy,"
+                "PstreamBuffers& pBufs"
+            ")"
+        )
+            << "Mesh changing, rebuilding InteractionLists form scratch."
+            << endl;
+
+        buildInteractionLists();
+    }
+
+    prepareWallDataToRefer();
+
+    prepareParticlesToRefer(cellOccupancy);
+
+    for (label domain = 0; domain < Pstream::nProcs(); domain++)
+    {
+        const labelList& subMap = cellMap().subMap()[domain];
+
+        if (subMap.size())
+        {
+            UOPstream toDomain(domain, pBufs);
+
+            UIndirectList<IDLList<ParticleType> > subMappedParticles
+            (
+                referredParticles_,
+                subMap
+            );
+
+            forAll(subMappedParticles, i)
+            {
+                toDomain << subMappedParticles[i];
+            }
+        }
+    }
+
+    // Using the mapDistribute to start sending and receiving the
+    // buffer but not block, i.e. it is calling
+    //     pBufs.finishedSends(false);
+    wallFaceMap().send(pBufs, referredWallData_);
+};
+
+
+template<class ParticleType>
+void Foam::InteractionLists<ParticleType>::receiveReferredData
+(
+    PstreamBuffers& pBufs
+)
+{
+    Pstream::waitRequests();
+
+    referredParticles_.setSize(cellMap().constructSize());
+
+    for (label domain = 0; domain < Pstream::nProcs(); domain++)
+    {
+        const labelList& constructMap = cellMap().constructMap()[domain];
+
+        if (constructMap.size())
+        {
+            UIPstream str(domain, pBufs);
+
+            forAll (constructMap, i)
+            {
+                referredParticles_[constructMap[i]] = IDLList<ParticleType>
+                (
+                    str,
+                    typename ParticleType::iNew(cloud_)
+                );
+            }
+        }
+    }
+
+    fillReferredParticleCloud();
+
+    wallFaceMap().receive(pBufs, referredWallData_);
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/basic/InteractionLists/InteractionLists.H b/src/lagrangian/basic/InteractionLists/InteractionLists.H
new file mode 100644
index 0000000000..77da111828
--- /dev/null
+++ b/src/lagrangian/basic/InteractionLists/InteractionLists.H
@@ -0,0 +1,322 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2008-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::InteractionLists
+
+Description
+
+    Builds direct interaction list, specifying which local (real)
+    cells are potentially in range of each other.
+
+    Builds referred interaction list, specifying which cells are
+    required to provideinteractions across coupled patched (cyclic or
+    processor).  Generates referred cells, and refers particles to the
+    correct processor, applying the appropriate transform.
+
+    Simultaneous communication and computation is possible using:
+
+    @verbatim
+    PstreamBuffers pBufs(Pstream::nonBlocking);
+    il_.sendReferredData(cellOccupancy_, pBufs);
+    // Do other things
+    il_.receiveReferredData(pBufs);
+    @endverbatim
+
+    Requiring data:
+
+    @verbatim
+    List<DynamicList<typename CloudType::parcelType*> > cellOccupancy_;
+    @endverbatim
+
+SourceFiles
+    InteractionListsI.H
+    InteractionLists.C
+    InteractionListsIO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef InteractionLists_H
+#define InteractionLists_H
+
+#include "polyMesh.H"
+#include "globalIndexAndTransform.H"
+#include "referredWallFace.H"
+#include "indexedOctree.H"
+#include "Tuple2.H"
+#include "treeDataCell.H"
+#include "treeDataFace.H"
+#include "mapDistribute.H"
+#include "volFields.H"
+#include "Random.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class InteractionLists Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class ParticleType>
+class InteractionLists
+{
+    // Private data
+
+        //- Reference to mesh
+        const polyMesh& mesh_;
+
+        //- Dummy cloud to give to particles
+        Cloud<ParticleType> cloud_;
+
+        //- Switch controlling whether or not the cloud gets populated
+        //  with the referred particles, hence gets written out
+        const Switch writeCloud_;
+
+        //- mapDistribute to exchange referred particles into referred cells
+        autoPtr<mapDistribute> cellMapPtr_;
+
+        //- mapDistribute to exchange wall face data
+        autoPtr<mapDistribute> wallFaceMapPtr_;
+
+        //- Storage and encoding/decoding for all possible transforms
+        //  of the geometry
+        globalIndexAndTransform globalTransforms_;
+
+        //- Maximum distance over which interactions will be detected
+        scalar maxDistance_;
+
+        //- Direct interaction list
+        labelListList dil_;
+
+        //- Wall faces on this processor that are in interaction range
+        //  of each each cell (direct wall face interaction list)
+        labelListList dwfil_;
+
+        //- Referred interaction list - which real cells are to be
+        //  supplied with particle interactions from the referred
+        //  particle container with the same index.
+        labelListList ril_;
+
+        //- Inverse addressing for referred cells, specifies which
+        //  referred cells (indices of entries in the ril_ and
+        //  referredParticles_ lists) interact with the real cell
+        //  indexed in this container.
+        labelListList rilInverse_;
+
+        //- Which real cells on this on this processor are in
+        //  interaction range of each referred wall face (referred
+        //  wall face interaction list)
+        labelListList rwfil_;
+
+        //- Inverse addressing for referred wall faces, specifies
+        //  which referred wall faces interact with the real cells
+        //  indexed in this container.
+        labelListList rwfilInverse_;
+
+        //- Which cells are to be sent via the cellMap, and an index
+        //  specifying how they should be transformed.
+        List<labelPair> cellIndexAndTransformToDistribute_;
+
+        //- Which wallFaces are to be sent via the wallFaceMap, and an index
+        //  specifying how they should be transformed.
+        List<labelPair> wallFaceIndexAndTransformToDistribute_;
+
+        //- Referred wall faces
+        List<referredWallFace> referredWallFaces_;
+
+        //- Velocity field name, default to "U"
+        const word UName_;
+
+        //- Referred wall face velocity field values;
+        List<vector> referredWallData_;
+
+        //- Referred particle container
+        List<IDLList<ParticleType> > referredParticles_;
+
+
+    // Private Member Functions
+
+        //- Construct all interaction lists
+        void buildInteractionLists();
+
+        //- Find the other processors which have interaction range
+        //  extended bound boxes in range
+        void findExtendedProcBbsInRange
+        (
+            const treeBoundBox& procBb,
+            const List<treeBoundBox>& allExtendedProcBbs,
+            const globalIndexAndTransform& globalTransforms,
+            List<treeBoundBox>& extendedProcBbsInRange,
+            List<label>& extendedProcBbsTransformIndex,
+            List<label>& extendedProcBbsOrigProc
+        );
+
+        //- Build the mapDistribute from information about which entry
+        //  is to be sent to which processor
+        void buildMap
+        (
+            autoPtr<mapDistribute>& mapPtr,
+            const List<label>& toProc
+        );
+
+        //- Fill the referredParticles container with particles that
+        //  will be referred
+        void prepareParticlesToRefer
+        (
+            const List<DynamicList<ParticleType*> >& cellOccupancy
+        );
+
+        //- Prepare particle to be referred
+        void prepareParticleToBeReferred
+        (
+            ParticleType* particle,
+            labelPair iat
+        );
+
+        //- Fill the referredParticles so that it will be written out
+        void fillReferredParticleCloud();
+
+        //- Populate the referredWallData container with data that
+        //  will be referred.
+        void prepareWallDataToRefer();
+
+        //- Write the referred wall faces out for debug
+        void writeReferredWallFaces() const;
+
+        //- Disallow default bitwise copy construct
+        InteractionLists(const InteractionLists&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const InteractionLists&);
+
+
+public:
+
+    // Constructors
+
+        //- Construct and call function to create all information from
+        //  the mesh
+        InteractionLists
+        (
+            const polyMesh& mesh,
+            scalar maxDistance,
+            Switch writeCloud = false,
+            const word& UName = "U"
+        );
+
+    // Destructor
+
+        ~InteractionLists();
+
+
+    // Member Functions
+
+        //- Prepare and send referred particles and wall data,
+        //  nonBlocking communication
+        void sendReferredData
+        (
+            const List<DynamicList<ParticleType*> >& cellOccupancy,
+            PstreamBuffers& pBufs
+        );
+
+        //- Receive referred data
+        void receiveReferredData(PstreamBuffers& pBufs);
+
+
+        // Access
+
+            //- Return access to the mesh
+            inline const polyMesh& mesh() const;
+
+            //- Return access to the cellMap
+            inline const mapDistribute& cellMap() const;
+
+            //- Return access to the wallFaceMap
+            inline const mapDistribute& wallFaceMap() const;
+
+            //- Return access to the globalTransforms
+            inline const globalIndexAndTransform& globalTransforms() const;
+
+            //- Return access to the direct interaction list
+            inline const labelListList& dil() const;
+
+            //- Return access to the direct wall face interaction list
+            inline const labelListList& dwfil() const;
+
+            //- Return access to the referred interaction list
+            inline const labelListList& ril() const;
+
+            //- Return access to the inverse referred interaction list
+            inline const labelListList& rilInverse() const;
+
+            //- Return access to the referred wall face interaction list
+            inline const labelListList& rwfil() const;
+
+            //- Return access to the inverse referred wall face
+            //  interaction list
+            inline const labelListList& rwfilInverse() const;
+
+            //- Return access to the cellIndexAndTransformToDistribute list
+            inline const List<labelPair>&
+            cellIndexAndTransformToDistribute() const;
+
+            //- Return access to the wallFaceIndexAndTransformToDistribute list
+            inline const List<labelPair>&
+            wallFaceIndexAndTransformToDistribute() const;
+
+            //- Return access to the referred wall faces
+            const List<referredWallFace>& referredWallFaces() const;
+
+            //- Return access to the referred wall data
+            const List<vector>& referredWallData() const;
+
+            //- Return access to the referred particle container
+            inline const List<IDLList<ParticleType> >&
+            referredParticles() const;
+
+            //- Return non-const access to the referred particle container
+            inline List<IDLList<ParticleType> >& referredParticles();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "InteractionListsI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "InteractionLists.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/basic/InteractionLists/InteractionListsI.H b/src/lagrangian/basic/InteractionLists/InteractionListsI.H
new file mode 100644
index 0000000000..ad28f696c5
--- /dev/null
+++ b/src/lagrangian/basic/InteractionLists/InteractionListsI.H
@@ -0,0 +1,155 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2008-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class ParticleType>
+const Foam::polyMesh& Foam::InteractionLists<ParticleType>::mesh() const
+{
+    return mesh_;
+}
+
+
+template<class ParticleType>
+const Foam::mapDistribute&
+Foam::InteractionLists<ParticleType>::cellMap() const
+{
+    return cellMapPtr_();
+}
+
+
+template<class ParticleType>
+const Foam::mapDistribute&
+Foam::InteractionLists<ParticleType>::wallFaceMap() const
+{
+    return wallFaceMapPtr_();
+}
+
+
+template<class ParticleType>
+const Foam::globalIndexAndTransform&
+Foam::InteractionLists<ParticleType>::globalTransforms() const
+{
+    return globalTransforms_;
+}
+
+
+template<class ParticleType>
+const Foam::labelListList& Foam::InteractionLists<ParticleType>::dil() const
+{
+    return dil_;
+}
+
+
+template<class ParticleType>
+const Foam::labelListList&
+Foam::InteractionLists<ParticleType>::dwfil() const
+{
+    return dwfil_;
+}
+
+
+template<class ParticleType>
+const Foam::labelListList& Foam::InteractionLists<ParticleType>::ril() const
+{
+    return ril_;
+}
+
+
+template<class ParticleType>
+const Foam::labelListList&
+Foam::InteractionLists<ParticleType>::rilInverse() const
+{
+    return rilInverse_;
+}
+
+
+template<class ParticleType>
+const Foam::labelListList& Foam::InteractionLists<ParticleType>::rwfil() const
+{
+    return rwfil_;
+}
+
+
+template<class ParticleType>
+const Foam::labelListList&
+Foam::InteractionLists<ParticleType>::rwfilInverse() const
+{
+    return rwfilInverse_;
+}
+
+
+template<class ParticleType>
+const Foam::List<Foam::labelPair>&
+Foam::InteractionLists<ParticleType>::cellIndexAndTransformToDistribute() const
+{
+    return cellIndexAndTransformToDistribute_;
+}
+
+
+template<class ParticleType>
+const Foam::List<Foam::labelPair>&
+Foam::InteractionLists<ParticleType>::
+wallFaceIndexAndTransformToDistribute() const
+{
+    return wallFaceIndexAndTransformToDistribute_;
+}
+
+
+template<class ParticleType>
+const Foam::List<Foam::referredWallFace>&
+Foam::InteractionLists<ParticleType>::referredWallFaces() const
+{
+    return referredWallFaces_;
+}
+
+
+template<class ParticleType>
+const Foam::List<Foam::vector>&
+Foam::InteractionLists<ParticleType>::referredWallData() const
+{
+    return referredWallData_;
+}
+
+
+template<class ParticleType>
+const Foam::List<Foam::IDLList<ParticleType> >&
+Foam::InteractionLists<ParticleType>::referredParticles() const
+{
+    return referredParticles_;
+}
+
+
+template<class ParticleType>
+Foam::List<Foam::IDLList<ParticleType> >&
+Foam::InteractionLists<ParticleType>::referredParticles()
+{
+    return referredParticles_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/globalIndexAndTransform.C b/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/globalIndexAndTransform.C
new file mode 100644
index 0000000000..d0a2703a89
--- /dev/null
+++ b/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/globalIndexAndTransform.C
@@ -0,0 +1,313 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2010-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "globalIndexAndTransform.H"
+#include "coupledPolyPatch.H"
+#include "cyclicPolyPatch.H"
+
+// * * * * * * * * * * * * Private Static Data Members * * * * * * * * * * * //
+
+const Foam::label Foam::globalIndexAndTransform::base_ = 32;
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+bool Foam::globalIndexAndTransform::matchTransform
+(
+    const List<vectorTensorTransform>& refTransforms,
+    const vectorTensorTransform& testTransform,
+    scalar tolerance,
+    bool bothSigns
+) const
+{
+    // return min(mag(transforms_ - sepVec)) > tol
+
+    forAll(refTransforms, i)
+    {
+        const vectorTensorTransform& refTransform = refTransforms[i];
+
+        scalar maxVectorMag = sqrt
+        (
+            max(magSqr(testTransform.t()), magSqr(refTransform.t()))
+        );
+
+        // Test the difference between vector parts to see if it is
+        // less than tolerance times the larger vector part magnitude.
+
+        scalar vectorDiff =
+            mag(refTransform.t() - testTransform.t())
+           /(maxVectorMag + VSMALL)
+           /tolerance;
+
+        // Test the difference between tensor parts to see if it is
+        // less than the tolerance.  sqrt(3.0) factor used to scale
+        // differnces as this is magnitude of a rotation tensor.  If
+        // neither transform has a rotation, then the test is not
+        // necessary.
+
+        scalar tensorDiff = 0;
+
+        if (refTransform.hasR() || testTransform.hasR())
+        {
+            tensorDiff =
+                mag(refTransform.R() - testTransform.R())
+               /sqrt(3.0)
+               /tolerance;
+        }
+
+        // ...Diff result is < 1 if the test part matches the ref part
+        // within tolerance
+
+        if (vectorDiff < 1 && tensorDiff < 1)
+        {
+            return true;
+        }
+
+        if (bothSigns)
+        {
+            // Test the inverse transform differences too
+
+            vectorDiff =
+                mag(refTransform.t() + testTransform.t())
+               /(maxVectorMag + VSMALL)
+               /tolerance;
+
+            tensorDiff = 0;
+
+            if (refTransform.hasR() || testTransform.hasR())
+            {
+                tensorDiff =
+                    mag(refTransform.R() - testTransform.R().T())
+                   /sqrt(3.0)
+                   /tolerance;
+            }
+
+            if (vectorDiff < 1 && tensorDiff < 1)
+            {
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+
+void Foam::globalIndexAndTransform::determineTransforms()
+{
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
+    transforms_ = List<vectorTensorTransform>(6);
+
+    label nextTrans = 0;
+
+    forAll(patches, patchI)
+    {
+        const polyPatch& pp = patches[patchI];
+
+        if (isA<coupledPolyPatch>(pp))
+        {
+            const coupledPolyPatch& cpp = refCast<const coupledPolyPatch>(pp);
+
+            if (cpp.separated())
+            {
+                const vectorField& sepVecs = cpp.separation();
+
+                forAll(sepVecs, sVI)
+                {
+                    const vector& sepVec = sepVecs[sVI];
+
+                    if (mag(sepVec) > SMALL)
+                    {
+                        scalar tol = coupledPolyPatch::matchTol;
+
+                        vectorTensorTransform transform(sepVec);
+
+                        if (!matchTransform(transforms_, transform, tol, false))
+                        {
+                            transforms_[nextTrans++] = transform;
+                        }
+
+                        if (nextTrans > 6)
+                        {
+                            FatalErrorIn
+                            (
+                                 "void Foam::globalIndexAndTransform::"
+                                 "determineTransforms()"
+                            )
+                                << "More than six unsigned transforms detected:"
+                                << nl << transforms_
+                                << exit(FatalError);
+                        }
+                    }
+                }
+            }
+            else if (!cpp.parallel())
+            {
+                const tensorField& transTensors = cpp.forwardT();
+
+                forAll(transTensors, tTI)
+                {
+                    const tensor& transT = transTensors[tTI];
+
+                    if (mag(transT - I) > SMALL)
+                    {
+                        scalar tol = coupledPolyPatch::matchTol;
+
+                        vectorTensorTransform transform(transT);
+
+                        if (!matchTransform(transforms_, transform, tol, false))
+                        {
+                            transforms_[nextTrans++] = transform;
+                        }
+
+                        if (nextTrans > 6)
+                        {
+                            FatalErrorIn
+                            (
+                                "void Foam::globalIndexAndTransform::"
+                                "determineTransforms()"
+                            )
+                                << "More than six unsigned transforms detected:"
+                                << nl << transforms_
+                                << exit(FatalError);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    List<List<vectorTensorTransform> > allTransforms(Pstream::nProcs());
+
+    allTransforms[Pstream::myProcNo()] = transforms_;
+
+    Pstream::gatherList(allTransforms);
+
+    if (Pstream::master())
+    {
+        transforms_ = List<vectorTensorTransform>(3);
+
+        label nextTrans = 0;
+
+        forAll(allTransforms, procI)
+        {
+            const List<vectorTensorTransform>& procTransVecs =
+                allTransforms[procI];
+
+            forAll(procTransVecs, pSVI)
+            {
+                const vectorTensorTransform& transform = procTransVecs[pSVI];
+
+                if (mag(transform.t()) > SMALL || transform.hasR())
+                {
+                    scalar tol = coupledPolyPatch::matchTol;
+
+                    if (!matchTransform(transforms_, transform, tol, true))
+                    {
+                        transforms_[nextTrans++] = transform;
+                    }
+
+                    if (nextTrans > 3)
+                    {
+                        FatalErrorIn
+                        (
+                            "void Foam::globalIndexAndTransform::"
+                            "determineTransforms()"
+                        )
+                            << "More than three independent basic "
+                            << "transforms detected:" << nl
+                            << allTransforms
+                            << transforms_
+                            << exit(FatalError);
+                    }
+                }
+            }
+        }
+
+        transforms_.setSize(nextTrans);
+    }
+
+    Pstream::scatter(transforms_);
+}
+
+
+void Foam::globalIndexAndTransform::determineTransformPermutations()
+{
+    label nTransformPermutations = pow(3, transforms_.size());
+
+    transformPermutations_.setSize(nTransformPermutations);
+
+    forAll(transformPermutations_, tPI)
+    {
+        vectorTensorTransform transform;
+
+        label transformIndex = tPI;
+
+        // Invert the ternary index encoding using repeated division by
+        // three
+
+        for (label b = 0; b < transforms_.size(); b++)
+        {
+            label w = (transformIndex % 3) - 1;
+
+            transformIndex /= 3;
+
+            if (w > 0)
+            {
+                transform &= transforms_[b];
+            }
+            else if (w < 0)
+            {
+                transform &= inv(transforms_[b]);
+            }
+        }
+
+        transformPermutations_[tPI] = transform;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::globalIndexAndTransform::globalIndexAndTransform
+(
+    const polyMesh& mesh
+)
+:
+    mesh_(mesh)
+{
+    determineTransforms();
+
+    determineTransformPermutations();
+}
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::globalIndexAndTransform::~globalIndexAndTransform()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/globalIndexAndTransform.H b/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/globalIndexAndTransform.H
new file mode 100644
index 0000000000..4983fb4c16
--- /dev/null
+++ b/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/globalIndexAndTransform.H
@@ -0,0 +1,195 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2010-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::globalIndexAndTransform
+
+Description
+    Determination and storage of the possible independent transforms
+    introduced by coupledPolyPatches, as well as all of the possible
+    permutations of these transforms generated by the presence of
+    multiple coupledPolyPatches, i.e. more than one cyclic boundary.
+
+    Also provides global index encoding and decoding for entity
+    (i.e. cell) index, processor index and transform index (0 or
+    positive integer) to a labelPair.
+
+SourceFiles
+    globalIndexAndTransform.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef globalIndexAndTransform_H
+#define globalIndexAndTransform_H
+
+#include "Pstream.H"
+#include "List.H"
+#include "labelPair.H"
+#include "vectorTensorTransform.H"
+#include "polyMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class polyMesh;
+
+
+/*---------------------------------------------------------------------------*\
+                   Class globalIndexAndTransform Declaration
+\*---------------------------------------------------------------------------*/
+
+class globalIndexAndTransform
+{
+    // Private data
+
+        //- Reference to mesh
+        const polyMesh& mesh_;
+
+        //- The possible independent (non-permuted) transforms of the
+        //  geometry, i.e. for a geometry with two cyclics, this
+        //  stores the two transforms, not the eight permutations.
+        //  There may not be more than three transforms in the range
+        //  of coupledPolyPatch geometries (separated XOR
+        //  non-parallel) and symmetries (cuboid periodicity only)
+        //  supported.
+        List<vectorTensorTransform> transforms_;
+
+        //- The permutations of the transforms, stored for lookup
+        //  efficiency.  If there are n transforms, then there are
+        //  (3^n) permutations, including the no-transformation
+        //  transform.
+        List<vectorTensorTransform> transformPermutations_;
+
+
+    // Private static data
+
+        //- Number of spaces to reserve for transform encoding
+        static const label base_;
+
+    // Private Member Functions
+
+        //- Determine all of the independent basic transforms of the
+        //  geometry by analysing the coupledPolyPatches
+        void determineTransforms();
+
+        //- Generate all of the transformation permutations
+        void determineTransformPermutations();
+
+        //- Test a list of reference transforms to see if the test transform
+        bool matchTransform
+        (
+            const List<vectorTensorTransform>& refTransforms,
+            const vectorTensorTransform& testTransform,
+            scalar tolerance,
+            bool bothSigns
+        ) const;
+
+        //- Disallow default bitwise copy construct
+        globalIndexAndTransform(const globalIndexAndTransform&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const globalIndexAndTransform&);
+
+
+public:
+
+    // Constructors
+
+        //- Construct from components
+        globalIndexAndTransform(const polyMesh& mesh);
+
+
+    //- Destructor
+    ~globalIndexAndTransform();
+
+
+    // Member Functions
+
+        //- Generate a transform index from the permutation indices of
+        //  the independent transforms.  Permutations indices must
+        //  only be -1, 0 or +1.
+        inline label encodeTransformIndex
+        (
+            const List<label>& permutationIndices
+        ) const;
+
+        //- Encode index and bare index as components on own processor
+        inline labelPair encode
+        (
+            const label index,
+            const label transformIndex
+        );
+
+        //- Encode index and bare index as components on given processor
+        inline labelPair encode
+        (
+            const label procI,
+            const label index,
+            const label transformIndex
+        );
+
+        //- Index carried by the object
+        inline label index(const labelPair& globalIAndTransform);
+
+        //- Which processor does this come from?
+        inline label processor(const labelPair& globalIAndTransform);
+
+        //- Transform carried by the object
+        inline label transformIndex(const labelPair& globalIAndTransform);
+
+        // Access
+
+            //- Return the number of independent transforms
+            inline label nIndependentTransforms() const;
+
+            //- Return access to the stored independent transforms
+            inline const List<vectorTensorTransform>& transforms() const;
+
+            //- Return access to the permuted transforms
+            inline const List<vectorTensorTransform>&
+            transformPermutations() const;
+
+            //- Access the overall (permuted) transform corresponding
+            //  to the transformIndex
+            inline const vectorTensorTransform& transform
+            (
+                label transformIndex
+            ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "globalIndexAndTransformI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/globalIndexAndTransformI.H b/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/globalIndexAndTransformI.H
new file mode 100644
index 0000000000..da46fe08fe
--- /dev/null
+++ b/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/globalIndexAndTransformI.H
@@ -0,0 +1,192 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2010-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+
+Foam::label Foam::globalIndexAndTransform::encodeTransformIndex
+(
+    const List<label>& permutationIndices
+) const
+{
+    if (permutationIndices.size() != transforms_.size())
+    {
+        FatalErrorIn
+        (
+            "Foam::label encodeTransformIndex"
+            "("
+                "const List<label>& permutationIndices,"
+            ") const"
+        )
+            << "permutationIndices " << permutationIndices
+            << "are of a different size to the number of independent transforms"
+            << abort(FatalError);
+    }
+
+    label transformIndex = 0;
+
+    label w = 1;
+
+    for (label b = 0; b < transforms_.size(); b++)
+    {
+        if (mag(permutationIndices[b]) > 1)
+        {
+            FatalErrorIn
+            (
+                "Foam::label encodeTransformIndex"
+                "("
+                "const List<label>& permutationIndices,"
+                ") const"
+            )
+                << "permutationIndices " << permutationIndices
+                << "are illegal, they must all be only -1, 0 or +1"
+                << abort(FatalError);
+        }
+
+        transformIndex += (permutationIndices[b] + 1)*w;
+
+        w *= 3;
+    }
+
+    return transformIndex;
+}
+
+
+Foam::labelPair Foam::globalIndexAndTransform::encode
+(
+    const label index,
+    const label transformIndex
+)
+{
+    return encode(Pstream::myProcNo(), index, transformIndex);
+}
+
+
+Foam::labelPair Foam::globalIndexAndTransform::encode
+(
+    const label procI,
+    const label index,
+    const label transformIndex
+)
+{
+    if (transformIndex < 0 || transformIndex >= base_)
+    {
+        FatalErrorIn
+        (
+            "Foam::labelPair Foam::globalIndexAndTransform::encode"
+            "("
+                "const label procI, "
+                "const label index, "
+                "const label transformIndex"
+            ")"
+        )
+            << "TransformIndex " << transformIndex
+            << " is outside allowed range of 0 to "
+            << base_ - 1
+            << abort(FatalError);
+    }
+
+    if (procI > labelMax/base_)
+    {
+        FatalErrorIn
+        (
+            "Foam::labelPair Foam::globalIndexAndTransform::encode"
+            "("
+                "const label procI, "
+                "const label index, "
+                "const label transformIndex"
+            ")"
+        )
+            << "Overflow : encoding processor " << procI << " in base " << base_
+            << " exceeds capability of label (" << labelMax
+            << "). Please recompile with larger datatype for label."
+            << exit(FatalError);
+    }
+
+    return labelPair
+    (
+        index,
+        transformIndex + procI*base_
+    );
+}
+
+
+Foam::label  Foam::globalIndexAndTransform::index
+(
+    const labelPair& globalIAndTransform
+)
+{
+    return globalIAndTransform.first();
+}
+
+
+Foam::label Foam::globalIndexAndTransform::processor
+(
+    const labelPair& globalIAndTransform
+)
+{
+    return globalIAndTransform.second()/base_;
+}
+
+
+Foam::label Foam::globalIndexAndTransform::transformIndex
+(
+    const labelPair& globalIAndTransform
+)
+{
+    return globalIAndTransform.second() % base_;
+}
+
+
+Foam::label Foam::globalIndexAndTransform::nIndependentTransforms() const
+{
+    return transforms_.size();
+}
+
+
+const Foam::List<Foam::vectorTensorTransform>&
+Foam::globalIndexAndTransform::transforms() const
+{
+    return transforms_;
+}
+
+
+const Foam::List<Foam::vectorTensorTransform>&
+Foam::globalIndexAndTransform::transformPermutations() const
+{
+    return transformPermutations_;
+}
+
+
+const Foam::vectorTensorTransform& Foam::globalIndexAndTransform::transform
+(
+    label transformIndex
+) const
+{
+    return transformPermutations_[transformIndex];
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C b/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C
new file mode 100644
index 0000000000..7540a7a7bb
--- /dev/null
+++ b/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C
@@ -0,0 +1,100 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2010-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "vectorTensorTransform.H"
+#include "IOstreams.H"
+#include "OStringStream.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+const char* const Foam::vectorTensorTransform::typeName =
+    "vectorTensorTransform";
+
+const Foam::vectorTensorTransform Foam::vectorTensorTransform::zero
+(
+    vector::zero,
+    tensor::zero,
+    false
+);
+
+
+const Foam::vectorTensorTransform Foam::vectorTensorTransform::I
+(
+    vector::zero,
+    sphericalTensor::I,
+    false
+);
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::vectorTensorTransform::vectorTensorTransform(Istream& is)
+{
+    is  >> *this;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Foam::word Foam::name(const vectorTensorTransform& s)
+{
+    OStringStream buf;
+
+    buf << '(' << s.t() << ',' << s.R() << ')';
+
+    return buf.str();
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+Foam::Istream& Foam::operator>>(Istream& is, vectorTensorTransform& tr)
+{
+    // Read beginning of vectorTensorTransform
+    is.readBegin("vectorTensorTransform");
+
+    is  >> tr.t_ >> tr.R_ >> tr.hasR_;
+
+    // Read end of vectorTensorTransform
+    is.readEnd("vectorTensorTransform");
+
+    // Check state of Istream
+    is.check("operator>>(Istream&, vectorTensorTransform&)");
+
+    return is;
+}
+
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const vectorTensorTransform& tr)
+{
+    os  << token::BEGIN_LIST
+        << tr.t() << token::SPACE << tr.R() << token::SPACE << tr.hasR()
+        << token::END_LIST;
+
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.H b/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.H
new file mode 100644
index 0000000000..251d0e5aab
--- /dev/null
+++ b/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.H
@@ -0,0 +1,241 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2010-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::vectorTensorTransform
+
+Description
+    Vector-tensor class used to perform translations and rotations in
+    3D space.
+
+SourceFiles
+    vectorTensorTransformI.H
+    vectorTensorTransform.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef vectorTensorTransform_H
+#define vectorTensorTransform_H
+
+#include "vector.H"
+#include "tensor.H"
+#include "word.H"
+#include "contiguous.H"
+#include "pointField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of friend functions and operators
+
+class vectorTensorTransform;
+Istream& operator>>(Istream& is, vectorTensorTransform&);
+Ostream& operator<<(Ostream& os, const vectorTensorTransform& C);
+
+
+/*---------------------------------------------------------------------------*\
+                    Class vectorTensorTransform Declaration
+\*---------------------------------------------------------------------------*/
+
+class vectorTensorTransform
+{
+    // private data
+
+        //- Translation vector
+        vector t_;
+
+        //- Rotation tensor
+        tensor R_;
+
+        //- Recording if the transform has non-identity transform to
+        //  allow its calculation to be skipped, which is the majority
+        //  of the expected cases
+        bool hasR_;
+
+
+public:
+
+    // Static data members
+
+        static const char* const typeName;
+
+        static const vectorTensorTransform zero;
+
+        static const vectorTensorTransform I;
+
+
+    // Constructors
+
+        //- Construct null
+        inline vectorTensorTransform();
+
+        //- Construct given a translation vector, rotation tensor and
+        //  hasR bool
+        inline vectorTensorTransform
+        (
+            const vector& t,
+            const tensor& R,
+            bool hasR = true
+        );
+
+        //- Construct a pure translation vectorTensorTransform given a
+        //  translation vector
+        inline explicit vectorTensorTransform(const vector& t);
+
+        //- Construct a pure rotation vectorTensorTransform given a
+        //  rotation tensor
+        inline explicit vectorTensorTransform(const tensor& R);
+
+        //- Construct from Istream
+        vectorTensorTransform(Istream&);
+
+
+    // Member functions
+
+        // Access
+
+            inline const vector& t() const;
+
+            inline const tensor& R() const;
+
+            inline bool hasR() const;
+
+
+        // Edit
+
+            inline vector& t();
+
+            inline tensor& R();
+
+
+        // Transform
+
+            //- Transform the given vector
+            inline vector transform(const vector& v) const;
+
+            //- Transform the given pointField
+            inline pointField transform(const pointField& pts) const;
+
+            //- Inverse transform the given vector
+            inline vector invTransform(const vector& v) const;
+
+            //- Inverse transform the given pointField
+            inline pointField invTransform(const pointField& pts) const;
+
+
+    // Member operators
+
+        inline void operator=(const vectorTensorTransform&);
+        inline void operator&=(const vectorTensorTransform&);
+
+        inline void operator=(const vector&);
+        inline void operator+=(const vector&);
+        inline void operator-=(const vector&);
+
+        inline void operator=(const tensor&);
+        inline void operator&=(const tensor&);
+
+
+    // IOstream operators
+
+        friend Istream& operator>>(Istream& is, vectorTensorTransform&);
+
+        friend Ostream& operator<<(Ostream& os, const vectorTensorTransform&);
+};
+
+
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
+
+//- Return the inverse of the given vectorTensorTransform
+inline vectorTensorTransform inv(const vectorTensorTransform& tr);
+
+
+//- Return a string representation of a vectorTensorTransform
+word name(const vectorTensorTransform&);
+
+
+//- Data associated with vectorTensorTransform type are contiguous
+template<>
+inline bool contiguous<vectorTensorTransform>() {return true;}
+
+
+// * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
+
+inline bool operator==
+(
+    const vectorTensorTransform& tr1,
+    const vectorTensorTransform& tr2
+);
+
+
+inline bool operator!=
+(
+    const vectorTensorTransform& tr1,
+    const vectorTensorTransform& tr2
+
+);
+
+
+inline vectorTensorTransform operator+
+(
+    const vectorTensorTransform& tr,
+    const vector& t
+);
+
+
+inline vectorTensorTransform operator+
+(
+    const vector& t,
+    const vectorTensorTransform& tr
+);
+
+
+inline vectorTensorTransform operator-
+(
+    const vectorTensorTransform& tr,
+    const vector& t
+);
+
+
+inline vectorTensorTransform operator&
+(
+    const vectorTensorTransform& tr1,
+    const vectorTensorTransform& tr2
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "vectorTensorTransformI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransformI.H b/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransformI.H
new file mode 100644
index 0000000000..028d64f694
--- /dev/null
+++ b/src/lagrangian/basic/InteractionLists/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransformI.H
@@ -0,0 +1,299 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2010-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+inline Foam::vectorTensorTransform::vectorTensorTransform()
+:
+    t_(vector::zero),
+    R_(sphericalTensor::I),
+    hasR_(false)
+{}
+
+inline Foam::vectorTensorTransform::vectorTensorTransform
+(
+    const vector& t,
+    const tensor& R,
+    bool hasR
+)
+:
+    t_(t),
+    R_(R),
+    hasR_(hasR)
+{}
+
+inline Foam::vectorTensorTransform::vectorTensorTransform(const vector& t)
+:
+    t_(t),
+    R_(sphericalTensor::I),
+    hasR_(false)
+{}
+
+inline Foam::vectorTensorTransform::vectorTensorTransform(const tensor& R)
+:
+    t_(vector::zero),
+    R_(R),
+    hasR_(true)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline const Foam::vector& Foam::vectorTensorTransform::t() const
+{
+    return t_;
+}
+
+
+inline const Foam::tensor& Foam::vectorTensorTransform::R() const
+{
+    return R_;
+}
+
+
+inline bool Foam::vectorTensorTransform::hasR() const
+{
+    return hasR_;
+}
+
+
+inline Foam::vector& Foam::vectorTensorTransform::t()
+{
+    return t_;
+}
+
+
+inline Foam::tensor& Foam::vectorTensorTransform::R()
+{
+    // Assume that non-const access to R changes it from I, so set
+    // hasR to true
+
+    hasR_ = true;
+
+    return R_;
+}
+
+
+inline Foam::vector Foam::vectorTensorTransform::transform
+(
+    const vector& v
+) const
+{
+    if (hasR_)
+    {
+        return t() + (R() & v);
+    }
+    else
+    {
+        return t() + v;
+    }
+}
+
+
+inline Foam::pointField Foam::vectorTensorTransform::transform
+(
+    const pointField& pts
+) const
+{
+    if (hasR_)
+    {
+        return t() + (R() & pts);
+    }
+    else
+    {
+        return t() + pts;
+    }
+}
+
+
+inline Foam::vector Foam::vectorTensorTransform::invTransform
+(
+    const vector& v
+) const
+{
+    if (hasR_)
+    {
+        return (R().T() & (v - t()));
+    }
+    else
+    {
+        return v - t();
+    }
+}
+
+
+inline Foam::pointField Foam::vectorTensorTransform::invTransform
+(
+    const pointField& pts
+) const
+{
+    if (hasR_)
+    {
+        return (R().T() & (pts - t()));
+    }
+    else
+    {
+        return pts - t();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+inline void Foam::vectorTensorTransform::operator=
+(
+    const vectorTensorTransform& tr
+)
+{
+    t_ = tr.t_;
+    R_ = tr.R_;
+    hasR_ = tr.hasR_;
+}
+
+
+inline void Foam::vectorTensorTransform::operator&=
+(
+    const vectorTensorTransform& tr
+)
+{
+    t_ += tr.t_;
+    R_ = tr.R_ & R_;
+
+    // If either of the two objects has hasR_ as true, then inherit
+    // it, otherwise, these should both be I tensors.
+    hasR_ = tr.hasR_ || hasR_;
+}
+
+
+inline void Foam::vectorTensorTransform::operator=(const vector& t)
+{
+    t_ = t;
+}
+
+
+inline void Foam::vectorTensorTransform::operator+=(const vector& t)
+{
+    t_ += t;
+}
+
+
+inline void Foam::vectorTensorTransform::operator-=(const vector& t)
+{
+    t_ -= t;
+}
+
+
+inline void Foam::vectorTensorTransform::operator=(const tensor& R)
+{
+    hasR_ = true;
+
+    R_ = R;
+}
+
+
+inline void Foam::vectorTensorTransform::operator&=(const tensor& R)
+{
+    hasR_ = true;
+
+    R_ = R & R_;
+}
+
+
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
+
+inline Foam::vectorTensorTransform Foam::inv(const vectorTensorTransform& tr)
+{
+    return vectorTensorTransform(-tr.t(), tr.R().T(), tr.hasR());
+}
+
+
+// * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
+
+inline bool Foam::operator==
+(
+    const vectorTensorTransform& tr1,
+    const vectorTensorTransform& tr2
+)
+{
+    return (tr1.t() == tr2.t() && tr1.R() == tr2.R());
+}
+
+
+inline bool Foam::operator!=
+(
+    const vectorTensorTransform& tr1,
+    const vectorTensorTransform& tr2
+)
+{
+    return !operator==(tr1, tr2);
+}
+
+
+inline Foam::vectorTensorTransform Foam::operator+
+(
+    const vectorTensorTransform& tr,
+    const vector& t
+)
+{
+    return vectorTensorTransform(tr.t() + t, tr.R(), tr.hasR());
+}
+
+
+inline Foam::vectorTensorTransform Foam::operator+
+(
+    const vector& t,
+    const vectorTensorTransform& tr
+)
+{
+    return vectorTensorTransform(t + tr.t(), tr.R(), tr.hasR());
+}
+
+
+inline Foam::vectorTensorTransform Foam::operator-
+(
+    const vectorTensorTransform& tr,
+    const vector& t
+)
+{
+    return vectorTensorTransform(tr.t() - t, tr.R(), tr.hasR());
+}
+
+
+inline Foam::vectorTensorTransform Foam::operator&
+(
+    const vectorTensorTransform& tr1,
+    const vectorTensorTransform& tr2
+)
+{
+    return vectorTensorTransform
+    (
+        tr1.t() + tr2.t(),
+        tr1.R() & tr2.R(),
+        (tr1.hasR() || tr2.hasR())
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.C b/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.C
new file mode 100644
index 0000000000..8b836e0ad8
--- /dev/null
+++ b/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.C
@@ -0,0 +1,144 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2010-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "referredWallFace.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::referredWallFace::referredWallFace()
+:
+    face(),
+    pts_(),
+    patchI_()
+{}
+
+
+Foam::referredWallFace::referredWallFace
+(
+    const face& f,
+    const pointField& pts,
+    label patchI
+)
+:
+    face(f),
+    pts_(pts),
+    patchI_(patchI)
+{
+    if (this->size() != pts_.size())
+    {
+        FatalErrorIn
+        (
+            "Foam::referredWallFace::referredWallFace"
+            "("
+                "const face& f, "
+                "const pointField& pts, "
+                "label patchI"
+            ")"
+        )   << "Face and pointField are not the same size. " << nl << (*this)
+            << abort(FatalError);
+    }
+}
+
+
+Foam::referredWallFace::referredWallFace(const referredWallFace& rWF)
+:
+    face(rWF),
+    pts_(rWF.pts_),
+    patchI_(rWF.patchI_)
+{
+    if (this->size() != pts_.size())
+    {
+        FatalErrorIn
+        (
+            "Foam::referredWallFace::referredWallFace"
+            "("
+                "const referredWallFace& rWF"
+            ")"
+        )   << "Face and pointField are not the same size. " << nl << (*this)
+            << abort(FatalError);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::referredWallFace::~referredWallFace()
+{}
+
+
+// * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * * //
+
+bool Foam::referredWallFace::operator==(const referredWallFace& rhs) const
+{
+    return
+    (
+        static_cast<const face&>(rhs) == static_cast<face>(*this)
+     && rhs.pts_ == pts_
+     && rhs.patchI_ == patchI_
+    );
+}
+
+
+bool Foam::referredWallFace::operator!=(const referredWallFace& rhs) const
+{
+    return !(*this == rhs);
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+Foam::Istream& Foam::operator>>(Istream& is, referredWallFace& rWF)
+{
+    is  >> static_cast<face&>(rWF) >> rWF.pts_ >> rWF.patchI_;
+
+    // Check state of Istream
+    is.check
+    (
+        "Foam::Istream& "
+        "Foam::operator>>(Foam::Istream&, Foam::referredWallFace&)"
+    );
+
+    return is;
+}
+
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const referredWallFace& rWF)
+{
+    os  << static_cast<const face&>(rWF) << token::SPACE
+        << rWF.pts_ << token::SPACE
+        << rWF.patchI_;
+
+    // Check state of Ostream
+    os.check
+    (
+        "Foam::Ostream& Foam::operator<<(Foam::Ostream&, "
+        "const Foam::referredWallFace&)"
+    );
+
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.H b/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.H
similarity index 54%
rename from src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.H
rename to src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.H
index 09beca12cd..4806be711f 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.H
+++ b/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFace.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,38 +22,54 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::sendingReferralList
+    Foam::referredWallFace
 
 Description
+    Storage for referred wall faces.  Stores patch index, face and
+    associated points
 
 SourceFiles
-    sendingReferralListI.H
-    sendingReferralList.C
-    sendingReferralListIO.C
+    referredWallFaceI.H
+    referredWallFace.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef sendingReferralList_H
-#define sendingReferralList_H
+#ifndef referredWallFace_H
+#define referredWallFace_H
 
-#include "labelList.H"
+#include "face.H"
+#include "pointField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
+// Forward declaration of classes
+class Istream;
+class Ostream;
+
+// Forward declaration of friend functions and operators
+class referredWallFace;
+Istream& operator>>(Istream&, referredWallFace&);
+Ostream& operator<<(Ostream&, const referredWallFace&);
+
+
 /*---------------------------------------------------------------------------*\
-                      Class sendingReferralList Declaration
+                        Class referredWallFace Declaration
 \*---------------------------------------------------------------------------*/
 
-class sendingReferralList
+class referredWallFace
 :
-    public labelList
+    public face
 {
     // Private data
 
-        label destinationProc_;
+        //- Points of face
+        pointField pts_;
+
+        //- Index of originating patch
+        label patchI_;
 
 
 public:
@@ -61,63 +77,50 @@ public:
     // Constructors
 
         //- Construct null
-        sendingReferralList();
+        referredWallFace();
 
         //- Construct from components
-        sendingReferralList
+        referredWallFace
         (
-            const label destinationProc,
-            const labelList& cellsToSend
+            const face& f,
+            const pointField& pts,
+            label patchI
         );
 
         //- Construct as copy
-        sendingReferralList(const sendingReferralList&);
+        referredWallFace(const referredWallFace&);
 
 
     //- Destructor
-    ~sendingReferralList();
+    ~referredWallFace();
 
 
     // Member Functions
 
         // Access
 
-            inline label destinationProc() const;
+            //- Return access to the stored points
+            inline const pointField& points() const;
+
+            //- Return non-const access to the stored points
+            inline pointField& points();
+
+            //- Return access to the patch index
+            inline label patchIndex() const;
+
+            //- Return non-const access to the patch index
+            inline label& patchIndex();
 
 
     // Member Operators
 
-        void operator=(const sendingReferralList&);
-
-
-    // Friend Operators
-
-        friend bool operator==
-        (
-            const sendingReferralList& a,
-            const sendingReferralList& b
-        );
-
-        inline friend bool operator!=
-        (
-            const sendingReferralList& a,
-            const sendingReferralList& b
-        );
-
+        bool operator==(const referredWallFace&) const;
+        bool operator!=(const referredWallFace&) const;
 
     // IOstream Operators
 
-        friend Istream& operator>>
-        (
-            Istream&,
-            sendingReferralList&
-        );
-
-        friend Ostream& operator<<
-        (
-            Ostream&,
-            const sendingReferralList&
-        );
+        friend Istream& operator>>(Istream&, referredWallFace&);
+        friend Ostream& operator<<(Ostream&, const referredWallFace&);
 };
 
 
@@ -127,7 +130,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "sendingReferralListI.H"
+#include "referredWallFaceI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralListI.H b/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFaceI.H
similarity index 74%
rename from src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralListI.H
rename to src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFaceI.H
index ef9fb75bf5..3cf42d8eb8 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralListI.H
+++ b/src/lagrangian/basic/InteractionLists/referredWallFace/referredWallFaceI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,23 +23,31 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline Foam::label Foam::sendingReferralList::destinationProc() const
+const Foam::pointField& Foam::referredWallFace::points() const
 {
-    return destinationProc_;
+    return pts_;
 }
 
 
-// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
-
-inline bool operator!=
-(
-    const Foam::sendingReferralList& a,
-    const Foam::sendingReferralList& b
-)
+Foam::pointField& Foam::referredWallFace::points()
 {
-    return (!(a == b));
+    return pts_;
+}
+
+
+Foam::label Foam::referredWallFace::patchIndex() const
+{
+    return patchI_;
+}
+
+
+Foam::label& Foam::referredWallFace::patchIndex()
+{
+    return patchI_;
 }
 
 
diff --git a/src/lagrangian/basic/Make/files b/src/lagrangian/basic/Make/files
index 969b966f1a..c226859e6e 100644
--- a/src/lagrangian/basic/Make/files
+++ b/src/lagrangian/basic/Make/files
@@ -1,9 +1,11 @@
-Cloud = Cloud
-particle = particle
 passiveParticle = passiveParticle
 indexedParticle = indexedParticle
 
 $(passiveParticle)/passiveParticleCloud.C
 $(indexedParticle)/indexedParticleCloud.C
 
+InteractionLists/globalIndexAndTransform/globalIndexAndTransform.C
+InteractionLists/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C
+InteractionLists/referredWallFace/referredWallFace.C
+
 LIB = $(FOAM_LIBBIN)/liblagrangian
diff --git a/src/lagrangian/basic/Particle/Particle.C b/src/lagrangian/basic/Particle/Particle.C
index 2d94b9c29d..b413211499 100644
--- a/src/lagrangian/basic/Particle/Particle.C
+++ b/src/lagrangian/basic/Particle/Particle.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/basic/Particle/Particle.H b/src/lagrangian/basic/Particle/Particle.H
index e91a4885d3..077a6d4b8e 100644
--- a/src/lagrangian/basic/Particle/Particle.H
+++ b/src/lagrangian/basic/Particle/Particle.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/basic/Particle/ParticleI.H b/src/lagrangian/basic/Particle/ParticleI.H
index b202c01662..d3098325eb 100644
--- a/src/lagrangian/basic/Particle/ParticleI.H
+++ b/src/lagrangian/basic/Particle/ParticleI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/basic/Particle/ParticleIO.C b/src/lagrangian/basic/Particle/ParticleIO.C
index 3f176912b0..3212c1f486 100644
--- a/src/lagrangian/basic/Particle/ParticleIO.C
+++ b/src/lagrangian/basic/Particle/ParticleIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/basic/indexedParticle/indexedParticle.H b/src/lagrangian/basic/indexedParticle/indexedParticle.H
index 23bb3ccece..9f725d5f55 100644
--- a/src/lagrangian/basic/indexedParticle/indexedParticle.H
+++ b/src/lagrangian/basic/indexedParticle/indexedParticle.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/basic/indexedParticle/indexedParticleCloud.C b/src/lagrangian/basic/indexedParticle/indexedParticleCloud.C
index ffbdec9180..b0819d1213 100644
--- a/src/lagrangian/basic/indexedParticle/indexedParticleCloud.C
+++ b/src/lagrangian/basic/indexedParticle/indexedParticleCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/basic/indexedParticle/indexedParticleCloud.H b/src/lagrangian/basic/indexedParticle/indexedParticleCloud.H
index 0d4f90d28f..41490022bf 100644
--- a/src/lagrangian/basic/indexedParticle/indexedParticleCloud.H
+++ b/src/lagrangian/basic/indexedParticle/indexedParticleCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/basic/passiveParticle/passiveParticle.H b/src/lagrangian/basic/passiveParticle/passiveParticle.H
index 98d18c08d5..fec00ea922 100644
--- a/src/lagrangian/basic/passiveParticle/passiveParticle.H
+++ b/src/lagrangian/basic/passiveParticle/passiveParticle.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/basic/passiveParticle/passiveParticleCloud.C b/src/lagrangian/basic/passiveParticle/passiveParticleCloud.C
index bac813bf1c..5c297cb44d 100644
--- a/src/lagrangian/basic/passiveParticle/passiveParticleCloud.C
+++ b/src/lagrangian/basic/passiveParticle/passiveParticleCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H b/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H
index 6480b21f34..2e378fd379 100644
--- a/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H
+++ b/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/coalCombustion/CoalCloud/CoalCloud.H b/src/lagrangian/coalCombustion/CoalCloud/CoalCloud.H
index 498dd3586b..2e26fbc0fd 100644
--- a/src/lagrangian/coalCombustion/CoalCloud/CoalCloud.H
+++ b/src/lagrangian/coalCombustion/CoalCloud/CoalCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/coalCombustion/CoalParcel/CoalParcel.C b/src/lagrangian/coalCombustion/CoalParcel/CoalParcel.C
index cb7529e3d1..3c1d517c58 100644
--- a/src/lagrangian/coalCombustion/CoalParcel/CoalParcel.C
+++ b/src/lagrangian/coalCombustion/CoalParcel/CoalParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,6 +49,9 @@ Foam::CoalParcel<ThermoType>::CoalParcel
     const scalar nParticle0,
     const scalar d0,
     const vector& U0,
+    const vector& f0,
+    const vector& pi0,
+    const vector& tau0,
     const scalarField& YMixture0,
     const scalarField& YGas0,
     const scalarField& YLiquid0,
@@ -67,6 +70,9 @@ Foam::CoalParcel<ThermoType>::CoalParcel
         nParticle0,
         d0,
         U0,
+        f0,
+        pi0,
+        tau0,
         YMixture0,
         YGas0,
         YLiquid0,
diff --git a/src/lagrangian/coalCombustion/CoalParcel/CoalParcel.H b/src/lagrangian/coalCombustion/CoalParcel/CoalParcel.H
index db5edc8126..54c8077bb2 100644
--- a/src/lagrangian/coalCombustion/CoalParcel/CoalParcel.H
+++ b/src/lagrangian/coalCombustion/CoalParcel/CoalParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,6 +85,9 @@ public:
              const scalar nParticle0,
              const scalar d0,
              const vector& U0,
+             const vector& f0,
+             const vector& pi0,
+             const vector& tau0,
              const scalarField& YMixture0,
              const scalarField& YGas0,
              const scalarField& YLiquid0,
diff --git a/src/lagrangian/coalCombustion/CoalParcel/defineCoalParcel.C b/src/lagrangian/coalCombustion/CoalParcel/defineCoalParcel.C
index 4456682451..5b1ff95cfc 100644
--- a/src/lagrangian/coalCombustion/CoalParcel/defineCoalParcel.C
+++ b/src/lagrangian/coalCombustion/CoalParcel/defineCoalParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/coalCombustion/CoalParcel/makeCoalParcelSubmodels.C b/src/lagrangian/coalCombustion/CoalParcel/makeCoalParcelSubmodels.C
index 10f7330845..649dbe6794 100644
--- a/src/lagrangian/coalCombustion/CoalParcel/makeCoalParcelSubmodels.C
+++ b/src/lagrangian/coalCombustion/CoalParcel/makeCoalParcelSubmodels.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,6 +29,7 @@ License
 #include "makeReactingParcelDispersionModels.H"
 #include "makeReactingParcelDragModels.H"
 #include "makeReactingMultiphaseParcelInjectionModels.H" // MP variant
+#include "makeReactingParcelCollisionModels.H"
 #include "makeReactingParcelPatchInteractionModels.H"
 #include "makeReactingParcelPostProcessingModels.H"
 
@@ -54,6 +55,7 @@ namespace Foam
     makeReactingDispersionModels(CoalParcel);
     makeReactingDragModels(CoalParcel);
     makeReactingMultiphaseInjectionModels(CoalParcel);
+    makeReactingCollisionModels(CoalParcel);
     makeReactingPatchInteractionModels(CoalParcel);
     makeReactingPostProcessingModels(CoalParcel);
 
diff --git a/src/lagrangian/coalCombustion/include/createCoalParcelTypes.H b/src/lagrangian/coalCombustion/include/createCoalParcelTypes.H
index 32b7eedf5e..732159c5a3 100644
--- a/src/lagrangian/coalCombustion/include/createCoalParcelTypes.H
+++ b/src/lagrangian/coalCombustion/include/createCoalParcelTypes.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H b/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H
index 5f999ab103..0f63b37f58 100644
--- a/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H
+++ b/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
index fd153f992c..67bd87f76b 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) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 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 9a40d11364..3caebe1f5a 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) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 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 70769b115b..f6f7b79c9a 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) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 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 d1da6331a2..ffe9466c04 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) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 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 191edb5048..469484a7a6 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) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 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 ef3cd1091d..599c05bfb3 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) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.C b/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.C
index 81b1f808fc..595fb629c2 100644
--- a/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.C
+++ b/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.H b/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.H
index 853a6436b8..ed13a2cb82 100644
--- a/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.H
+++ b/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.C b/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.C
index 26b669ca8b..6071c67bd7 100644
--- a/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.C
+++ b/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.H b/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.H
index deadd67b0a..acbb09c765 100644
--- a/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.H
+++ b/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/injector/injector/injector.C b/src/lagrangian/dieselSpray/injector/injector/injector.C
index bd8a8de23e..417e04d82b 100644
--- a/src/lagrangian/dieselSpray/injector/injector/injector.C
+++ b/src/lagrangian/dieselSpray/injector/injector/injector.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/injector/injector/injector.H b/src/lagrangian/dieselSpray/injector/injector/injector.H
index 1cdbf633ca..2c03187f3c 100644
--- a/src/lagrangian/dieselSpray/injector/injector/injector.H
+++ b/src/lagrangian/dieselSpray/injector/injector/injector.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/injector/injector/injectorI.H b/src/lagrangian/dieselSpray/injector/injector/injectorI.H
index 86a429d043..4ded39e5ee 100644
--- a/src/lagrangian/dieselSpray/injector/injector/injectorI.H
+++ b/src/lagrangian/dieselSpray/injector/injector/injectorI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/injector/injector/injectorIO.C b/src/lagrangian/dieselSpray/injector/injector/injectorIO.C
index 495a249cf6..bc7652b7bf 100644
--- a/src/lagrangian/dieselSpray/injector/injector/injectorIO.C
+++ b/src/lagrangian/dieselSpray/injector/injector/injectorIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/injector/injectorType/injectorType.C b/src/lagrangian/dieselSpray/injector/injectorType/injectorType.C
index 1efcba20d0..0dc753a7cf 100644
--- a/src/lagrangian/dieselSpray/injector/injectorType/injectorType.C
+++ b/src/lagrangian/dieselSpray/injector/injectorType/injectorType.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/injector/injectorType/injectorType.H b/src/lagrangian/dieselSpray/injector/injectorType/injectorType.H
index 5d24c5f3ff..90e1c3885e 100644
--- a/src/lagrangian/dieselSpray/injector/injectorType/injectorType.H
+++ b/src/lagrangian/dieselSpray/injector/injectorType/injectorType.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C b/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C
index 731341b779..49446e1f00 100644
--- a/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C
+++ b/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.H b/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.H
index 03873372b1..686ac382bd 100644
--- a/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.H
+++ b/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.C b/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.C
index 635cdcfa81..ed8177e293 100644
--- a/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.C
+++ b/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.H b/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.H
index ec042ab4be..47131b3fcf 100644
--- a/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.H
+++ b/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.C b/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.C
index d1dd7ad11c..a09e497bb1 100644
--- a/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.C
+++ b/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.H b/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.H
index d9cf0d063b..f386783b10 100644
--- a/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.H
+++ b/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/parcel/parcel.C b/src/lagrangian/dieselSpray/parcel/parcel.C
index c5d97fd8eb..2dcd4665a5 100644
--- a/src/lagrangian/dieselSpray/parcel/parcel.C
+++ b/src/lagrangian/dieselSpray/parcel/parcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/parcel/parcel.H b/src/lagrangian/dieselSpray/parcel/parcel.H
index f9008a0a68..c96abd9155 100644
--- a/src/lagrangian/dieselSpray/parcel/parcel.H
+++ b/src/lagrangian/dieselSpray/parcel/parcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/parcel/parcelFunctions.C b/src/lagrangian/dieselSpray/parcel/parcelFunctions.C
index 6b24c2cd47..7b7a6d9141 100644
--- a/src/lagrangian/dieselSpray/parcel/parcelFunctions.C
+++ b/src/lagrangian/dieselSpray/parcel/parcelFunctions.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/parcel/parcelI.H b/src/lagrangian/dieselSpray/parcel/parcelI.H
index 740a02b1d3..d69ae7b9c3 100644
--- a/src/lagrangian/dieselSpray/parcel/parcelI.H
+++ b/src/lagrangian/dieselSpray/parcel/parcelI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/parcel/parcelIO.C b/src/lagrangian/dieselSpray/parcel/parcelIO.C
index e6682989e4..8363f56dbb 100644
--- a/src/lagrangian/dieselSpray/parcel/parcelIO.C
+++ b/src/lagrangian/dieselSpray/parcel/parcelIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/parcel/setRelaxationTimes.C b/src/lagrangian/dieselSpray/parcel/setRelaxationTimes.C
index 7192e70ad1..bcefddd613 100644
--- a/src/lagrangian/dieselSpray/parcel/setRelaxationTimes.C
+++ b/src/lagrangian/dieselSpray/parcel/setRelaxationTimes.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spray/spray.C b/src/lagrangian/dieselSpray/spray/spray.C
index e21063b569..4f98523b07 100644
--- a/src/lagrangian/dieselSpray/spray/spray.C
+++ b/src/lagrangian/dieselSpray/spray/spray.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spray/spray.H b/src/lagrangian/dieselSpray/spray/spray.H
index 8879ae2e7d..86859aa17c 100644
--- a/src/lagrangian/dieselSpray/spray/spray.H
+++ b/src/lagrangian/dieselSpray/spray/spray.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spray/sprayFunctions.C b/src/lagrangian/dieselSpray/spray/sprayFunctions.C
index ab4460e938..23c2e3d394 100644
--- a/src/lagrangian/dieselSpray/spray/sprayFunctions.C
+++ b/src/lagrangian/dieselSpray/spray/sprayFunctions.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spray/sprayI.H b/src/lagrangian/dieselSpray/spray/sprayI.H
index 423ff9e3f4..d406f670dd 100644
--- a/src/lagrangian/dieselSpray/spray/sprayI.H
+++ b/src/lagrangian/dieselSpray/spray/sprayI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spray/sprayInject.C b/src/lagrangian/dieselSpray/spray/sprayInject.C
index 0cfd600070..952b6949c9 100644
--- a/src/lagrangian/dieselSpray/spray/sprayInject.C
+++ b/src/lagrangian/dieselSpray/spray/sprayInject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spray/sprayOps.C b/src/lagrangian/dieselSpray/spray/sprayOps.C
index 7a7b026099..6210c01967 100644
--- a/src/lagrangian/dieselSpray/spray/sprayOps.C
+++ b/src/lagrangian/dieselSpray/spray/sprayOps.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
index 27b800b9a4..5334e2295d 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.H b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.H
index 9a534e4f10..18234356d5 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModel.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModel.C
index addfdb7e56..ec1b0bdb85 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModel.H b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModel.H
index 19e4778e55..db0cf0dada 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/newAtomizationModel.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/newAtomizationModel.C
new file mode 100644
index 0000000000..5304ea008d
--- /dev/null
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/newAtomizationModel.C
@@ -0,0 +1,74 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "error.H"
+#include "atomizationModel.H"
+#include "LISA.H"
+#include "noAtomization.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+autoPtr<atomizationModel> atomizationModel::New
+(
+    const dictionary& dict,
+    spray& sm
+)
+{
+    word atomizationModelType
+    (
+        dict.lookup("atomizationModel")
+    );
+
+    Info<< "Selecting atomizationModel "
+         << atomizationModelType << endl;
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(atomizationModelType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalError
+            << "atomizationModel::New(const dictionary&, const spray&) : " << endl
+            << "    unknown atomizationModelType type "
+            << atomizationModelType
+            << ", constructor not in hash table" << endl << endl
+            << "    Valid atomizationModel types are :" << endl;
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
+    }
+
+    return autoPtr<atomizationModel>(cstrIter()(dict, sm));
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.C
index aae7ee4f0f..3c58faaf4f 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.H b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.H
index 9fbe01fe9b..754c92f0f3 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.C
index 141824b0f7..a53cf0eb04 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.H b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.H
index 8d9895b73f..0869e6c550 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.C
index 482bdcd510..02c6e7a02f 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.H b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.H
index c08657d492..4d1948a641 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C
index 3b2fdad327..12a3a6771b 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.H b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.H
index 4370785ab4..daf62e69af 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.C
index 3b96271fe1..9d9f5523ef 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.H b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.H
index b4115e1036..fe08fcc172 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.C
index 5cfc819984..10b00aee61 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.H b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.H
index 7c288f988b..8913d4ad66 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModelNew.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModelNew.C
index c388f64982..99e9a344f0 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModelNew.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.C
index cc5e6051e1..fc6c4df5f6 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.H b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.H
index 5c836f2eaf..d757d60ace 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.C
index ddc3332ca8..3b7b17076d 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.H b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.H
index 7df7258da6..3e99b32b80 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C
index e972ec6a8b..921af9c585 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.H b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.H
index 8e1fb6bf19..1d1e600e24 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/ORourke/ORourkeCollisionModel.C b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/ORourke/ORourkeCollisionModel.C
index 78674f03ed..f333f6b387 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/ORourke/ORourkeCollisionModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/ORourke/ORourkeCollisionModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/ORourke/ORourkeCollisionModel.H b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/ORourke/ORourkeCollisionModel.H
index 14fefca698..64fb5f247c 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/ORourke/ORourkeCollisionModel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/ORourke/ORourkeCollisionModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModel.C b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModel.C
index e7a7944bd8..29a98081eb 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModel.H b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModel.H
index 12ff49a0b3..94d8c73b76 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModelNew.C b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModelNew.C
index e6b59d57d0..9e56403c36 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModelNew.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/noCollision/noCollision.C b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/noCollision/noCollision.C
index 4cd4b4a999..8949e12967 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/noCollision/noCollision.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/noCollision/noCollision.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/noCollision/noCollision.H b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/noCollision/noCollision.H
index c6c0476328..b78332edbc 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/noCollision/noCollision.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/noCollision/noCollision.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/trajectoryModel/trajectoryModel.C b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/trajectoryModel/trajectoryModel.C
index 6df8ef73b6..60e2e9b761 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/trajectoryModel/trajectoryModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/trajectoryModel/trajectoryModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/trajectoryModel/trajectoryModel.H b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/trajectoryModel/trajectoryModel.H
index 9de83da057..62b55f9a39 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/trajectoryModel/trajectoryModel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/trajectoryModel/trajectoryModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionLESModel/dispersionLESModel.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionLESModel/dispersionLESModel.C
index 814cc514fc..d9821bd4dd 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionLESModel/dispersionLESModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionLESModel/dispersionLESModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionLESModel/dispersionLESModel.H b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionLESModel/dispersionLESModel.H
index 6aba631ce9..59fab4a2dc 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionLESModel/dispersionLESModel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionLESModel/dispersionLESModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/dispersionModel.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/dispersionModel.C
index de92f9c359..8fd4ea6234 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/dispersionModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/dispersionModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/dispersionModel.H b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/dispersionModel.H
index 6c05c32187..2581d40d94 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/dispersionModel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/dispersionModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/newDispersionModel.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/newDispersionModel.C
new file mode 100644
index 0000000000..4c3c6664d2
--- /dev/null
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/newDispersionModel.C
@@ -0,0 +1,75 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "error.H"
+
+#include "dispersionModel.H"
+#include "noDispersion.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+autoPtr<dispersionModel> dispersionModel::New
+(
+    const dictionary& dict,
+    spray& sm
+)
+{
+    word dispersionModelType
+    (
+        dict.lookup("dispersionModel")
+    );
+
+    Info<< "Selecting dispersionModel "
+         << dispersionModelType << endl;
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(dispersionModelType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalError
+            << "dispersionModel::New(const dictionary&, const spray&) : "
+            << endl
+            << "    unknown dispersionModelType type "
+            << dispersionModelType
+            << ", constructor not in hash table" << endl << endl
+            << "    Valid dispersionModel types are :" << endl;
+        Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError);
+    }
+
+    return autoPtr<dispersionModel>(cstrIter()(dict, sm));
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.C
index 922761a89b..75aeb04ebb 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.H b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.H
index c76788c2ec..4219e0a761 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C
index c0ca1a42f9..b154974a26 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.H b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.H
index 3a8f3db239..ece608bbfd 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/noDispersion/noDispersion.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/noDispersion/noDispersion.C
index 1f780032e6..84030b40f9 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/noDispersion/noDispersion.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/noDispersion/noDispersion.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/noDispersion/noDispersion.H b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/noDispersion/noDispersion.H
index 2d601931ff..dcf2557ef8 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/noDispersion/noDispersion.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/noDispersion/noDispersion.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C
index f18136ceb7..c7e7e4cd09 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.H b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.H
index 8a87bda5ce..6d52c7f3ea 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModel.C b/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModel.C
index a231306fb4..fca499cd84 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModel.H b/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModel.H
index 84990bc464..cc09ca1745 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModelNew.C b/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModelNew.C
index a07000f845..5fd88fa2b4 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModelNew.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dragModel/noDragModel/noDragModel.C b/src/lagrangian/dieselSpray/spraySubModels/dragModel/noDragModel/noDragModel.C
index 3125a4ba38..b2a5b74c48 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dragModel/noDragModel/noDragModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dragModel/noDragModel/noDragModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dragModel/noDragModel/noDragModel.H b/src/lagrangian/dieselSpray/spraySubModels/dragModel/noDragModel/noDragModel.H
index f87acff1ec..074c1ae6be 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dragModel/noDragModel/noDragModel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/dragModel/noDragModel/noDragModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dragModel/standardDragModel/standardDragModel.C b/src/lagrangian/dieselSpray/spraySubModels/dragModel/standardDragModel/standardDragModel.C
index d9556f2395..94be272dc3 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dragModel/standardDragModel/standardDragModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dragModel/standardDragModel/standardDragModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dragModel/standardDragModel/standardDragModel.H b/src/lagrangian/dieselSpray/spraySubModels/dragModel/standardDragModel/standardDragModel.H
index c3de3210b6..ab98871303 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dragModel/standardDragModel/standardDragModel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/dragModel/standardDragModel/standardDragModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/RutlandFlashBoil/RutlandFlashBoil.C b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/RutlandFlashBoil/RutlandFlashBoil.C
index 1501a78b15..fb9ecfcb20 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/RutlandFlashBoil/RutlandFlashBoil.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/RutlandFlashBoil/RutlandFlashBoil.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/RutlandFlashBoil/RutlandFlashBoil.H b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/RutlandFlashBoil/RutlandFlashBoil.H
index 6194e1a3b1..1ed14e6b7d 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/RutlandFlashBoil/RutlandFlashBoil.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/RutlandFlashBoil/RutlandFlashBoil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModel.C b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModel.C
index 6b4186bdb5..bd1d7f492a 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModel.H b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModel.H
index a0a58e6f02..f79749551c 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModelNew.C b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModelNew.C
index 1e2c34d736..2fc7749d85 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModelNew.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/noEvaporation/noEvaporation.C b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/noEvaporation/noEvaporation.C
index 9414b6e597..e09a1ab966 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/noEvaporation/noEvaporation.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/noEvaporation/noEvaporation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/noEvaporation/noEvaporation.H b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/noEvaporation/noEvaporation.H
index 7dfb64879a..e266903675 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/noEvaporation/noEvaporation.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/noEvaporation/noEvaporation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/saturateEvaporationModel/saturateEvaporationModel.C b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/saturateEvaporationModel/saturateEvaporationModel.C
index 1d1f46a6c2..ae5fc8ddef 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/saturateEvaporationModel/saturateEvaporationModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/saturateEvaporationModel/saturateEvaporationModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/saturateEvaporationModel/saturateEvaporationModel.H b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/saturateEvaporationModel/saturateEvaporationModel.H
index 068809b0b6..852f79b010 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/saturateEvaporationModel/saturateEvaporationModel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/saturateEvaporationModel/saturateEvaporationModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/standardEvaporationModel/standardEvaporationModel.C b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/standardEvaporationModel/standardEvaporationModel.C
index 9539103c45..85c4e27724 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/standardEvaporationModel/standardEvaporationModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/standardEvaporationModel/standardEvaporationModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/standardEvaporationModel/standardEvaporationModel.H b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/standardEvaporationModel/standardEvaporationModel.H
index d525afc569..6263165b93 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/standardEvaporationModel/standardEvaporationModel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/standardEvaporationModel/standardEvaporationModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/RanzMarshall/RanzMarshall.C b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/RanzMarshall/RanzMarshall.C
index 1c0a821aab..5112508b84 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/RanzMarshall/RanzMarshall.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/RanzMarshall/RanzMarshall.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/RanzMarshall/RanzMarshall.H b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/RanzMarshall/RanzMarshall.H
index 2715a8b2ea..4358190a01 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/RanzMarshall/RanzMarshall.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/RanzMarshall/RanzMarshall.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/heatTransferModel.C b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/heatTransferModel.C
index b5b4590512..2128b4319f 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/heatTransferModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/heatTransferModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/heatTransferModel.H b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/heatTransferModel.H
index 95d413fbc3..d654fab69f 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/heatTransferModel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/heatTransferModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/heatTransferModelNew.C b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/heatTransferModelNew.C
index 3b53958dec..e64408899a 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/heatTransferModelNew.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/heatTransferModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/noHeatTransfer/noHeatTransfer.C b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/noHeatTransfer/noHeatTransfer.C
index 2f8fa18485..a5adb87670 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/noHeatTransfer/noHeatTransfer.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/noHeatTransfer/noHeatTransfer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/noHeatTransfer/noHeatTransfer.H b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/noHeatTransfer/noHeatTransfer.H
index fbc34deb3c..442c770c1e 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/noHeatTransfer/noHeatTransfer.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/noHeatTransfer/noHeatTransfer.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C
index 7ab341a38e..b69fd99959 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H
index c9174d94a7..7313763837 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.C
index de57c436e6..676d0a4d27 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.H
index a10b65e22d..00eae2821d 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/constant/constInjector.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/constant/constInjector.C
index 85011025b6..56c7d1165a 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/constant/constInjector.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/constant/constInjector.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/constant/constInjector.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/constant/constInjector.H
index 41d50a761f..987f141bf1 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/constant/constInjector.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/constant/constInjector.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C
index 730418989d..0574346100 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H
index 3e62814272..377e2d659e 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedPressureSwirl/definedPressureSwirl.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedPressureSwirl/definedPressureSwirl.C
index 42204c390e..38d9203786 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedPressureSwirl/definedPressureSwirl.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedPressureSwirl/definedPressureSwirl.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedPressureSwirl/definedPressureSwirl.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedPressureSwirl/definedPressureSwirl.H
index 9da8f16929..dd7f14bc7f 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedPressureSwirl/definedPressureSwirl.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedPressureSwirl/definedPressureSwirl.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C
index e018bb3e4e..b0ce51de53 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H
index fe6c7a41f4..03ddd520a9 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModel.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModel.C
index decc2ee8e8..c4cc0a4158 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModel.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModel.H
index 5bb9e8b07b..7d505ce833 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModelNew.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModelNew.C
index eca3049de8..8e94d144c5 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModelNew.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/pressureSwirl/pressureSwirlInjector.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/pressureSwirl/pressureSwirlInjector.C
index c53b52fbe8..bced5868ff 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/pressureSwirl/pressureSwirlInjector.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/pressureSwirl/pressureSwirlInjector.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/pressureSwirl/pressureSwirlInjector.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/pressureSwirl/pressureSwirlInjector.H
index 586ae329de..115ab45c18 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/pressureSwirl/pressureSwirlInjector.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/pressureSwirl/pressureSwirlInjector.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C b/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C
index 7268af7c9f..e776b78f49 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.H b/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.H
index ffcd61ae54..be19fafe24 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/wallModel/removeParcel/removeParcel.C b/src/lagrangian/dieselSpray/spraySubModels/wallModel/removeParcel/removeParcel.C
index 64e30ae8a9..b62ba09778 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/wallModel/removeParcel/removeParcel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/wallModel/removeParcel/removeParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/wallModel/removeParcel/removeParcel.H b/src/lagrangian/dieselSpray/spraySubModels/wallModel/removeParcel/removeParcel.H
index d951702f5b..f07761847a 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/wallModel/removeParcel/removeParcel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/wallModel/removeParcel/removeParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModel.C b/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModel.C
index 88c7c9c53f..0d109b4d8f 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModel.H b/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModel.H
index afaf552797..598c6803d1 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModelNew.C b/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModelNew.C
index ad888a2739..05e92e95ca 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModelNew.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
index 8b08b53893..0d9e84533d 100644
--- a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
+++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H
index 8dc7478103..1df4935f68 100644
--- a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H
+++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudI.H b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudI.H
index 607eaf3b33..6390bfbc82 100644
--- a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudI.H
+++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.C b/src/lagrangian/dsmc/clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.C
index c569458e46..5093e1df90 100644
--- a/src/lagrangian/dsmc/clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.C
+++ b/src/lagrangian/dsmc/clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.H b/src/lagrangian/dsmc/clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.H
index 1373e05ce0..d6229de737 100644
--- a/src/lagrangian/dsmc/clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.H
+++ b/src/lagrangian/dsmc/clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.H b/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.H
index 77e9942cad..58ca1e7cb2 100644
--- a/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.H
+++ b/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.C b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.C
index 4f75b24dce..a888363092 100644
--- a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.C
+++ b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H
index 6c084418ba..8a644652d0 100644
--- a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H
+++ b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelI.H b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelI.H
index 9a844bc996..9f6d661ec6 100644
--- a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelI.H
+++ b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelIO.C b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelIO.C
index 64c909c903..b95cd14a88 100644
--- a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelIO.C
+++ b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/defineDsmcParcel.C b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/defineDsmcParcel.C
index 6955e86bb8..1e6a6e917b 100644
--- a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/defineDsmcParcel.C
+++ b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/defineDsmcParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.C b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.C
index fbc3eeacfa..b46bb2452f 100644
--- a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.C
+++ b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.H b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.H
index eb1a51a0ea..8cc4bf1184 100644
--- a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.H
+++ b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelBinaryCollisionModels.C b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelBinaryCollisionModels.C
index dc6c7a02d3..b07fd0cb2d 100644
--- a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelBinaryCollisionModels.C
+++ b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelBinaryCollisionModels.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelInflowBoundaryModels.C b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelInflowBoundaryModels.C
index b48db7f42d..364f2a721f 100644
--- a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelInflowBoundaryModels.C
+++ b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelInflowBoundaryModels.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelWallInteractionModels.C b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelWallInteractionModels.C
index 3ebda773e6..08e78b2713 100644
--- a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelWallInteractionModels.C
+++ b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelWallInteractionModels.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.C b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.C
index c22949610e..274b9ff79c 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.C
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
index f6f6e834e9..8550762aaf 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C
index 469824f33a..45b250a743 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
index f394ed7f73..c7bf6a00ab 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H
index ffa6533b50..f01f625e3f 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C
index 1a925d5f15..e248d01161 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H
index a2477cc26b..17e1684ee9 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
index 686d3aa11b..aed19d9d61 100644
--- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.H b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.H
index 19726f5495..e8fc638e55 100644
--- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.H
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.C b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.C
index 81117e2250..6f5fe48f45 100644
--- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.C
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H
index 233aa384e6..764cde1141 100644
--- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C
index 7a49c0e828..b708b2ec8a 100644
--- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.C b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.C
index 34cc217d64..b8a9a88b15 100644
--- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.C
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.H b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.H
index cb07db9aeb..e969da048c 100644
--- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.H
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C b/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C
index aa1d631cfa..947eddda07 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H b/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H
index dc5710f6c6..f42382b7da 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C b/src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C
index 7eb426c8fe..91c103a4aa 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.H b/src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.H
index c6d8f57277..f3745dbc90 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.H
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.C b/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.C
index 20348ee0dc..979030938d 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.C
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H b/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H
index 23fe12b1f5..1c47640fe3 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.C b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.C
index 454787cca6..8d6d983690 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.C
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
index 76c499bc3f..f28a6cec0f 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C
index 6fc1d3442f..ed73f600fc 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.C b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.C
index 49f253a6e0..11f09d9697 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.C
+++ b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H
index 70fe7df8ab..e18af027f9 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H
+++ b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.C b/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.C
index 3fab58170d..e065b54780 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.C
+++ b/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H b/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H
index f4de807404..39989c22e6 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H
+++ b/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.C b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.C
index f54635283d..0388788c8e 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.C
+++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
index 488757ef23..6bf976d081 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
+++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -194,7 +194,7 @@ public:
                                                                               \
     defineTemplateRunTimeSelectionTable                                       \
     (                                                                         \
-        IntegrationScheme<Type>,                                               \
+        IntegrationScheme<Type>,                                              \
         dictionary                                                            \
     );
 
@@ -218,4 +218,3 @@ public:
 #endif
 
 // ************************************************************************* //
-
diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C
index af68aa627b..2d513dc2ad 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C
+++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemeNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemesFwd.H b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemesFwd.H
index 6d12a2f768..bced5e22b2 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemesFwd.H
+++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationSchemesFwd.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/IntegrationScheme/makeIntegrationSchemes.C b/src/lagrangian/intermediate/IntegrationScheme/makeIntegrationSchemes.C
index 3e973e537b..4f934c892f 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/makeIntegrationSchemes.C
+++ b/src/lagrangian/intermediate/IntegrationScheme/makeIntegrationSchemes.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index acc98daf63..486c0959dd 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,10 +26,12 @@ License
 #include "KinematicCloud.H"
 #include "IntegrationScheme.H"
 #include "interpolation.H"
+#include "subCycleTime.H"
 
 #include "DispersionModel.H"
 #include "DragModel.H"
 #include "InjectionModel.H"
+#include "CollisionModel.H"
 #include "PatchInteractionModel.H"
 #include "PostProcessingModel.H"
 #include "SurfaceFilmModel.H"
@@ -87,6 +89,56 @@ void Foam::KinematicCloud<ParcelType>::evolveCloud()
         resetSourceTerms();
     }
 
+    // Sympletic leapfrog integration of particle forces:
+    // + apply half deltaV with stored force
+    // + move positions with new velocity
+    // + calculate forces in new position
+    // + apply half deltaV with new force
+
+    label nSubCycles = collision().nSubCycles();
+
+    if (nSubCycles > 1)
+    {
+        Info<< "    " << nSubCycles << " move-collide subCycles" << endl;
+
+        subCycleTime moveCollideSubCycle
+        (
+            const_cast<Time&>(this->db().time()),
+            nSubCycles
+        );
+
+        while(!(++moveCollideSubCycle).end())
+        {
+            moveCollide(td);
+        }
+
+        moveCollideSubCycle.endSubCycle();
+    }
+    else
+    {
+        moveCollide(td);
+    }
+}
+
+
+template<class ParcelType>
+void  Foam::KinematicCloud<ParcelType>::moveCollide
+(
+    typename ParcelType::trackData& td
+)
+{
+    td.part() = ParcelType::trackData::tpVelocityHalfStep;
+    Cloud<ParcelType>::move(td);
+
+    td.part() = ParcelType::trackData::tpLinearTrack;
+    Cloud<ParcelType>::move(td);
+
+    // td.part() = ParcelType::trackData::tpRotationalTrack;
+    // Cloud<ParcelType>::move(td);
+
+    this->collision().collide();
+
+    td.part() = ParcelType::trackData::tpVelocityHalfStep;
     Cloud<ParcelType>::move(td);
 }
 
@@ -172,6 +224,14 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
             *this
         )
     ),
+    collisionModel_
+    (
+        CollisionModel<KinematicCloud<ParcelType> >::New
+        (
+            particleProperties_,
+            *this
+        )
+    ),
     patchInteractionModel_
     (
         PatchInteractionModel<KinematicCloud<ParcelType> >::New
@@ -281,11 +341,28 @@ void Foam::KinematicCloud<ParcelType>::evolve()
 template<class ParcelType>
 void Foam::KinematicCloud<ParcelType>::info() const
 {
+    vector linearMomentum = linearMomentumOfSystem();
+    reduce(linearMomentum, sumOp<vector>());
+
+    scalar linearKineticEnergy = linearKineticEnergyOfSystem();
+    reduce(linearKineticEnergy, sumOp<scalar>());
+
+    scalar rotationalKineticEnergy = rotationalKineticEnergyOfSystem();
+    reduce(rotationalKineticEnergy, sumOp<scalar>());
+
     Info<< "Cloud: " << this->name() << nl
         << "    Current number of parcels       = "
         << returnReduce(this->size(), sumOp<label>()) << nl
         << "    Current mass in system          = "
-        << returnReduce(massInSystem(), sumOp<scalar>()) << nl;
+        << returnReduce(massInSystem(), sumOp<scalar>()) << nl
+        << "    Linear momentum                 = "
+        << linearMomentum << nl
+        << "   |Linear momentum|                = "
+        << mag(linearMomentum) << nl
+        << "    Linear kinetic energy           = "
+        << linearKineticEnergy << nl
+        << "    Rotational kinetic energy       = "
+        << rotationalKineticEnergy << nl;
     this->injection().info(Info);
     this->surfaceFilm().info(Info);
 }
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index 701dc376e9..c09988c76d 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,6 +34,7 @@ Description
       - Patch interaction model
       - Post-processing model
       - Surface film model
+      - Collision model
 
 SourceFiles
     KinematicCloudI.H
@@ -72,6 +73,9 @@ class DragModel;
 template<class CloudType>
 class InjectionModel;
 
+template<class CloudType>
+class CollisionModel;
+
 template<class CloudType>
 class PatchInteractionModel;
 
@@ -171,6 +175,10 @@ protected:
             autoPtr<InjectionModel<KinematicCloud<ParcelType> > >
                 injectionModel_;
 
+            //- Collision model
+            autoPtr<CollisionModel<KinematicCloud<ParcelType> > >
+                collisionModel_;
+
             //- Patch interaction model
             autoPtr<PatchInteractionModel<KinematicCloud<ParcelType> > >
                 patchInteractionModel_;
@@ -204,6 +212,9 @@ protected:
             //- Evolve the cloud
             void evolveCloud();
 
+            //- Move-collide
+            void moveCollide(typename ParcelType::trackData& td);
+
             //- Post-evolve
             void postEvolve();
 
@@ -317,6 +328,15 @@ public:
                 inline InjectionModel<KinematicCloud<ParcelType> >&
                     injection();
 
+                //- Return const access to the collision model
+                inline
+                const CollisionModel<KinematicCloud<ParcelType> >&
+                    collision() const;
+
+                //- Return reference to the collision model
+                inline CollisionModel<KinematicCloud<ParcelType> >&
+                    collision();
+
                 //- Return const-access to the patch interaction model
                 inline const PatchInteractionModel<KinematicCloud<ParcelType> >&
                     patchInteraction() const;
@@ -359,6 +379,15 @@ public:
             //- Total mass in system
             inline scalar massInSystem() const;
 
+            //- Total linear momentum of the system
+            inline vector linearMomentumOfSystem() const;
+
+            //- Total linear kinetic energy in the system
+            inline scalar linearKineticEnergyOfSystem() const;
+
+            //- Total rotational kinetic energy in the system
+            inline scalar rotationalKineticEnergyOfSystem() const;
+
             //- Print cloud information
             void info() const;
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index 1de33c6e81..ed65e9809b 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -173,6 +173,22 @@ Foam::KinematicCloud<ParcelType>::injection()
 }
 
 
+template<class ParcelType>
+inline const Foam::CollisionModel<Foam::KinematicCloud<ParcelType> >&
+Foam::KinematicCloud<ParcelType>::collision() const
+{
+    return collisionModel_();
+}
+
+
+template<class ParcelType>
+inline Foam::CollisionModel<Foam::KinematicCloud<ParcelType> >&
+Foam::KinematicCloud<ParcelType>::collision()
+{
+    return collisionModel_();
+}
+
+
 template<class ParcelType>
 inline Foam::PostProcessingModel<Foam::KinematicCloud<ParcelType> >&
 Foam::KinematicCloud<ParcelType>::postProcessing()
@@ -219,6 +235,59 @@ inline Foam::scalar Foam::KinematicCloud<ParcelType>::massInSystem() const
 }
 
 
+template<class ParcelType>
+inline Foam::vector
+Foam::KinematicCloud<ParcelType>::linearMomentumOfSystem() const
+{
+    vector linearMomentum(vector::zero);
+
+    forAllConstIter(typename KinematicCloud<ParcelType>, *this, iter)
+    {
+        const ParcelType& p = iter();
+
+        linearMomentum += p.mass()*p.U();
+    }
+
+    return linearMomentum;
+}
+
+
+template<class ParcelType>
+inline Foam::scalar
+Foam::KinematicCloud<ParcelType>::linearKineticEnergyOfSystem() const
+{
+    scalar linearKineticEnergy = 0.0;
+
+    forAllConstIter(typename KinematicCloud<ParcelType>, *this, iter)
+    {
+        const ParcelType& p = iter();
+
+        linearKineticEnergy += 0.5*p.mass()*(p.U() & p.U());
+    }
+
+    return linearKineticEnergy;
+}
+
+
+template<class ParcelType>
+inline Foam::scalar
+Foam::KinematicCloud<ParcelType>::
+rotationalKineticEnergyOfSystem() const
+{
+    scalar rotationalKineticEnergy = 0.0;
+
+    forAllConstIter(typename KinematicCloud<ParcelType>, *this, iter)
+    {
+        const ParcelType& p = iter();
+
+        rotationalKineticEnergy +=
+            0.5*p.momentOfInertia()*(p.omega() & p.omega());
+    }
+
+    return rotationalKineticEnergy;
+}
+
+
 template<class ParcelType>
 inline Foam::Random& Foam::KinematicCloud<ParcelType>::rndGen()
 {
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
index bcf27896a9..bb04cd20c4 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
index e0ddfdae55..1c380a37f9 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
index 1ea4911172..e68f44dba4 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
index 3a559dcfd3..cd9d597b71 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
index 159f2b314b..a6b4de3de6 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H
index b0aaf29f36..87130d22cb 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
index 2eb30c1eb1..deb2fa3daa 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
index ab86e0fc79..1450f8f10c 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
index 7b27f7de07..83e0f5708d 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.C b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.C
index 03439ccfa5..16664e2170 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
index 798c4493e8..3a21b88e4b 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.C b/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.C
index 8ba61e625e..2e0d3941b6 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H
index aedab0914f..239fb98947 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C
index 1bae9adb1c..b18096d3cd 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C
+++ b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H
index df35a18e32..4e34ca58cd 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.C b/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.C
index 80d7a85be8..56a264d27e 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.C
+++ b/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H
index 6e3e9590d6..8fad1577b3 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/clouds/derived/BasicReactingCloud/BasicReactingCloud.H b/src/lagrangian/intermediate/clouds/derived/BasicReactingCloud/BasicReactingCloud.H
index dc739c84f5..27159c7133 100644
--- a/src/lagrangian/intermediate/clouds/derived/BasicReactingCloud/BasicReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/BasicReactingCloud/BasicReactingCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/clouds/derived/BasicReactingMultiphaseCloud/BasicReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/derived/BasicReactingMultiphaseCloud/BasicReactingMultiphaseCloud.H
index 196ccdadfa..8f14d51721 100644
--- a/src/lagrangian/intermediate/clouds/derived/BasicReactingMultiphaseCloud/BasicReactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/BasicReactingMultiphaseCloud/BasicReactingMultiphaseCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H b/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H
index e8d2230a46..fe5de7d6e6 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H b/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H
index 4bb48f5b31..2167953c78 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecord.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecord.C
new file mode 100644
index 0000000000..8ccc725054
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecord.C
@@ -0,0 +1,97 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2009-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "CollisionRecord.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::CollisionRecord<Type>::CollisionRecord()
+:
+    origProcOfOther_(-VGREAT),
+    origIdOfOther_(-VGREAT),
+    data_(pTraits<Type>::zero)
+{}
+
+
+template<class Type>
+Foam::CollisionRecord<Type>::CollisionRecord
+(
+    label origProcOfOther,
+    label origIdOfOther,
+    const Type& data
+)
+:
+    origProcOfOther_(origProcOfOther + 1),
+    origIdOfOther_(origIdOfOther),
+    data_(data)
+{}
+
+
+template<class Type>
+Foam::CollisionRecord<Type>::CollisionRecord(const CollisionRecord<Type>& cR)
+:
+    origProcOfOther_(cR.origProcOfOther() + 1),
+    origIdOfOther_(cR.origIdOfOther_),
+    data_(cR.data_)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::CollisionRecord<Type>::~CollisionRecord()
+{}
+
+
+// * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::CollisionRecord<Type>::operator=(const CollisionRecord<Type>& rhs)
+{
+    // Check for assignment to self
+    if (this == &rhs)
+    {
+        FatalErrorIn
+        (
+            "Foam::CollisionRecord<Type>::operator="
+            "(const Foam::CollisionRecord<Type>&)"
+        )
+            << "Attempted assignment to self"
+            << abort(FatalError);
+    }
+
+    origProcOfOther_ = rhs.origProcOfOther_;
+    origIdOfOther_ = rhs.origIdOfOther_;
+    data_ = rhs.data_;
+}
+
+
+// * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
+
+#include "CollisionRecordIO.C"
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecord.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecord.H
new file mode 100644
index 0000000000..de226c88e6
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecord.H
@@ -0,0 +1,220 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2009-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::CollisionRecord
+
+Description
+
+    Record of a collision between the particle holding the record and
+    the particle with the stored id.
+
+    The access status of the record is to be coded in the
+    origProcOfOther data member.  The actual processor is offset by
+    +1.  A negative value means that the record has not been accessed,
+    positive means that it has.
+
+SourceFiles
+    CollisionRecordI.H
+    CollisionRecord.C
+    CollisionRecordIO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef CollisionRecord_H
+#define CollisionRecord_H
+
+#include "label.H"
+#include "vector.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of friend functions and operators
+template<class Type>
+class CollisionRecord;
+
+template<class Type>
+inline bool operator==
+(
+    const CollisionRecord<Type>&,
+    const CollisionRecord<Type>&
+);
+
+template<class Type>
+inline bool operator!=
+(
+    const CollisionRecord<Type>&,
+    const CollisionRecord<Type>&
+);
+
+template<class Type>
+Istream& operator>>(Istream&, CollisionRecord<Type>&);
+
+template<class Type>
+Ostream& operator<<(Ostream&, const CollisionRecord<Type>&);
+
+
+/*---------------------------------------------------------------------------*\
+                         Class CollisionRecord Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class CollisionRecord
+{
+    // Private data
+
+        //- Originating processor id of other collision partner
+        label origProcOfOther_;
+
+        //- Local particle id on originating processor of other
+        //  collision partner
+        label origIdOfOther_;
+
+        //- Collision data, stored as if the storing particle was the
+        //  first particle (particle A) in the collision.
+        Type data_;
+
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        CollisionRecord();
+
+        //- Construct from components
+        CollisionRecord
+        (
+            label origProcOfOther,
+            label origIdOfOther,
+            const Type& data = pTraits<Type>::zero
+        );
+
+        //- Construct from Istream
+        CollisionRecord(Istream&);
+
+        //- Construct as copy
+        CollisionRecord(const CollisionRecord&);
+
+
+    //- Destructor
+    ~CollisionRecord();
+
+
+    // Member Functions
+
+
+        // Access
+
+            //- Return the origProcOfOther data
+            inline label origProcOfOther() const;
+
+            //- Return the origIdOfOther data
+            inline label origIdOfOther() const;
+
+            //- Return access to the collision data
+            inline const Type& collisionData() const;
+
+            //- Return access to the collision data
+            inline Type& collisionData();
+
+
+        // Check
+
+            inline bool match
+            (
+                label queryOrigProcOfOther,
+                label queryOrigIdOfOther
+            ) const;
+
+            //- Return the accessed status of the record
+            inline bool accessed() const;
+
+
+        // Edit
+
+            //- Set the accessed property of the record to accessed
+            inline void setAccessed();
+
+            //- Set the accessed property of the record to unaccessed
+            inline void setUnaccessed();
+
+
+    // Member Operators
+
+        void operator=(const CollisionRecord&);
+
+
+    // Friend Operators
+
+        friend bool operator== <Type>
+        (
+            const CollisionRecord<Type>&,
+            const CollisionRecord<Type>&
+        );
+
+        friend bool operator!= <Type>
+        (
+            const CollisionRecord<Type>&,
+            const CollisionRecord<Type>&
+        );
+
+
+    // IOstream Operators
+
+        friend Istream& operator>> <Type>
+        (
+            Istream&,
+            CollisionRecord<Type>&
+        );
+
+        friend Ostream& operator<< <Type>
+        (
+            Ostream&,
+            const CollisionRecord<Type>&
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "CollisionRecordI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "CollisionRecord.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecordI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecordI.H
new file mode 100644
index 0000000000..33d60305ce
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecordI.H
@@ -0,0 +1,121 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2009-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+inline bool Foam::CollisionRecord<Type>::match
+(
+    label queryOrigProcOfOther,
+    label queryOrigIdOfOther
+) const
+{
+    return
+    (
+        queryOrigProcOfOther == origProcOfOther()
+     && queryOrigIdOfOther == origIdOfOther()
+    );
+}
+
+
+template<class Type>
+inline Foam::label Foam::CollisionRecord<Type>::origProcOfOther() const
+{
+    return mag(origProcOfOther_) - 1;
+}
+
+
+template<class Type>
+inline Foam::label Foam::CollisionRecord<Type>::origIdOfOther() const
+{
+    return origIdOfOther_;
+}
+
+
+template<class Type>
+inline const Type&
+Foam::CollisionRecord<Type>::collisionData() const
+{
+    return data_;
+}
+
+
+template<class Type>
+inline Type& Foam::CollisionRecord<Type>::collisionData()
+{
+    return data_;
+}
+
+
+template<class Type>
+inline bool Foam::CollisionRecord<Type>::accessed() const
+{
+    return pos(origProcOfOther_);
+}
+
+
+template<class Type>
+inline void Foam::CollisionRecord<Type>::setAccessed()
+{
+    origProcOfOther_ = origProcOfOther() + 1;
+}
+
+
+template<class Type>
+inline void Foam::CollisionRecord<Type>::setUnaccessed()
+{
+    origProcOfOther_ = -(origProcOfOther() + 1);
+}
+
+
+// * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * * //
+
+template<class Type>
+inline bool Foam::operator==
+(
+    const CollisionRecord<Type>& a,
+    const CollisionRecord<Type>& b
+)
+{
+    return
+    (
+        a.origProcOfOther_ == b.origProcOfOther_
+     && a.origIdOfOther_ == b.origIdOfOther_
+     && a.data_ == b.data_
+    );
+}
+
+template<class Type>
+inline bool Foam::operator!=
+(
+    const CollisionRecord<Type>& a,
+    const CollisionRecord<Type>& b
+)
+{
+    return !(a == b);
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecordIO.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecordIO.C
new file mode 100644
index 0000000000..e90611318b
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecord/CollisionRecordIO.C
@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2009-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "CollisionRecord.H"
+#include "IOstreams.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::CollisionRecord<Type>::CollisionRecord(Istream& is)
+:
+    origProcOfOther_(readLabel(is)),
+    origIdOfOther_(readLabel(is)),
+    data_(is)
+{
+    // Check state of Istream
+    is.check("Foam::CollisionRecord<Type>::CollisionRecord(Foam::Istream&)");
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+template<class Type>
+Foam::Istream& Foam::operator>>(Istream& is, CollisionRecord<Type>& cR)
+{
+    is  >> cR.origProcOfOther_ >> cR.origIdOfOther_ >> cR.data_;
+
+    // Check state of Istream
+    is.check
+    (
+        "Foam::Istream&"
+        "Foam::operator>>(Foam::Istream&, Foam::CollisionRecord<Type>&)"
+    );
+
+    return is;
+}
+
+
+template<class Type>
+Foam::Ostream& Foam::operator<<(Ostream& os, const CollisionRecord<Type>& cR)
+{
+    os  << cR.origProcOfOther_
+        << token::SPACE << cR.origIdOfOther_
+        << token::SPACE << cR.data_;
+
+    // Check state of Ostream
+    os.check
+    (
+        "Foam::Ostream& Foam::operator<<(Foam::Ostream&, "
+        "const Foam::CollisionRecord<Type>&)"
+    );
+
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C
new file mode 100644
index 0000000000..f0b4804cf5
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C
@@ -0,0 +1,111 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2009-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "CollisionRecordList.H"
+#include "IOstreams.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::CollisionRecordList<Type>::CollisionRecordList()
+:
+    DynamicList<CollisionRecord<Type> >()
+{}
+
+
+template<class Type>
+Foam::CollisionRecordList<Type>::CollisionRecordList(Istream& is)
+:
+    DynamicList<CollisionRecord<Type> >(is)
+{
+    // Check state of Istream
+    is.check
+    (
+        "Foam::CollisionRecordList<Type>::CollisionRecordList(Foam::Istream&)"
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * /
+
+template<class Type>
+Foam::CollisionRecordList<Type>::~CollisionRecordList()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::CollisionRecord<Type>& Foam::CollisionRecordList<Type>::matchRecord
+(
+    label origProcOfOther,
+    label origIdOfOther
+)
+{
+    // Returning the first record that matches the particle
+    // identifiers.  Two records with the same identification is not
+    // supported.
+
+    forAll(*this, i)
+    {
+        CollisionRecord<Type>& cR = (*this)[i];
+
+        if (cR.match(origProcOfOther, origIdOfOther))
+        {
+            cR.setAccessed();
+
+            return cR;
+        }
+    }
+
+    // Record not found, create a new one and return it as the last
+    // member of the list.  The status of the record will be accessed
+    // by construction.
+
+    append(CollisionRecord<Type>(origProcOfOther, origIdOfOther));
+
+    return (*this)[this->size() - 1];
+}
+
+
+template<class Type>
+void Foam::CollisionRecordList<Type>::update()
+{
+    DynamicList<CollisionRecord<Type> > updatedRecords;
+
+    forAll(*this, i)
+    {
+        if ((*this)[i].accessed())
+        {
+            (*this)[i].setUnaccessed();
+
+            updatedRecords.append((*this)[i]);
+        }
+    }
+
+    DynamicList<CollisionRecord<Type> >::operator=(updatedRecords);
+}
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMolecule.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.H
similarity index 57%
rename from src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMolecule.H
rename to src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.H
index b318cec394..32c7eef6c6 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMolecule.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,21 +22,22 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::referredMolecule
+    Foam::CollisionRecordList
 
 Description
 
 SourceFiles
-    referredMoleculeI.H
-    referredMolecule.C
+    CollisionRecordListI.H
+    CollisionRecordList.C
+    CollisionRecordListIO.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef referredMolecule_H
-#define referredMolecule_H
+#ifndef CollisionRecordList_H
+#define CollisionRecordList_H
 
-#include "vector.H"
-#include "List.H"
+#include "DynamicList.H"
+#include "CollisionRecord.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,79 +45,46 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                      Class referredMolecule Declaration
+                     Class CollisionRecordList Declaration
 \*---------------------------------------------------------------------------*/
 
-class referredMolecule
+template<class Type>
+class CollisionRecordList
+:
+    public DynamicList<CollisionRecord<Type> >
 {
-    // Private data
-
-        label id_;
-
-        vector position_;
-
-        List<vector> sitePositions_;
-
 
 public:
 
     // Constructors
 
         //- Construct null
-        referredMolecule();
+        CollisionRecordList();
 
-        //- Construct from components
-        referredMolecule
-        (
-            const label id,
-            const vector& position,
-            const List<vector>& sitePositions
-        );
+        //- Construct from Istream
+        CollisionRecordList(Istream&);
 
 
     //- Destructor
-    virtual ~referredMolecule();
+    ~CollisionRecordList();
 
 
     // Member Functions
 
-        // Access
-
-            inline label id() const;
-
-            inline const vector& position() const;
-
-            inline const List<vector>& sitePositions() const;
-
-
-    // Friend Operators
-
-        inline friend bool operator==
+        //- Enquires if the proc and id pair of the other particle are
+        //  present in the records.  If so, return access to the
+        //  collisionData and mark the CollisionRecord as accessed this
+        //  step, if not, create the record and return access to it.
+        CollisionRecord<Type>& matchRecord
         (
-            const referredMolecule& a,
-            const referredMolecule& b
+            label origProcOfOther,
+            label origIdOfOther
         );
 
-        inline friend bool operator!=
-        (
-            const referredMolecule& a,
-            const referredMolecule& b
-        );
-
-
-    // IOstream Operators
-
-        friend Istream& operator>>
-        (
-            Istream&,
-            referredMolecule&
-        );
-
-        friend Ostream& operator<<
-        (
-            Ostream&,
-            const referredMolecule&
-        );
+        //- Update the collision records, deleting any records not
+        //  marked as having been accessed, then mark all records as
+        //  not accessed ready for the next evaluation
+        void update();
 };
 
 
@@ -126,7 +94,9 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "referredMoleculeI.H"
+#ifdef NoRepository
+#   include "CollisionRecordList.C"
+#endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index b11d693d95..4d89dedde1 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -219,9 +219,13 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
     nParticle_(p.nParticle_),
     d_(p.d_),
     U_(p.U_),
+    f_(p.f_),
+    angularMomentum_(p.angularMomentum_),
+    torque_(p.torque_),
     rho_(p.rho_),
     tTurb_(p.tTurb_),
     UTurb_(p.UTurb_),
+    collisionRecords_(p.collisionRecords_),
     rhoc_(p.rhoc_),
     Uc_(p.Uc_),
     muc_(p.muc_)
@@ -243,49 +247,87 @@ bool Foam::KinematicParcel<ParcelType>::move(TrackData& td)
     const polyBoundaryMesh& pbMesh = mesh.boundaryMesh();
 
     const scalar deltaT = mesh.time().deltaTValue();
-    scalar tEnd = (1.0 - p.stepFraction())*deltaT;
-    const scalar dtMax = tEnd;
 
-    while (td.keepParticle && !td.switchProcessor && tEnd > ROOTVSMALL)
+    switch (td.part())
     {
-        // Apply correction to position for reduced-D cases
-        meshTools::constrainToMeshCentre(mesh, p.position());
-
-        // 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
-        label cellI = p.cell();
-
-        if (p.active())
+        case TrackData::tpVelocityHalfStep:
         {
-            dt *= p.trackToFace(p.position() + dt*U_, td);
+            // First and last leapfrog velocity adjust part, required
+            // before and after tracking and force calculation
+
+            p.U() += 0.5*deltaT*p.f()/p.mass();
+
+            angularMomentum_ += 0.5*deltaT*torque_;
+
+            break;
         }
 
-        tEnd -= dt;
-        p.stepFraction() = 1.0 - tEnd/deltaT;
-
-        // Avoid problems with extremely small timesteps
-        if (dt > ROOTVSMALL)
+        case TrackData::tpLinearTrack:
         {
-            // Update cell based properties
-            p.setCellValues(td, dt, cellI);
+            scalar tEnd = (1.0 - p.stepFraction())*deltaT;
+            const scalar dtMax = tEnd;
 
-            if (td.cloud().cellValueSourceCorrection())
+            while (td.keepParticle && !td.switchProcessor && tEnd > ROOTVSMALL)
             {
-                p.cellValueSourceCorrection(td, dt, cellI);
+                // Apply correction to position for reduced-D cases
+                meshTools::constrainToMeshCentre(mesh, p.position());
+
+                // 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
+                label cellI = p.cell();
+
+                if (p.active())
+                {
+                    dt *= p.trackToFace(p.position() + dt*U_, td);
+                }
+
+                tEnd -= dt;
+                p.stepFraction() = 1.0 - tEnd/deltaT;
+
+                // 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);
+                }
+
+                if (p.onBoundary() && td.keepParticle)
+                {
+                    if (isA<processorPolyPatch>(pbMesh[p.patch(p.face())]))
+                    {
+                        td.switchProcessor = true;
+                    }
+                }
             }
 
-            p.calc(td, dt, cellI);
+            break;
         }
 
-        if (p.onBoundary() && td.keepParticle)
+        case TrackData::tpRotationalTrack:
         {
-            if (isA<processorPolyPatch>(pbMesh[p.patch(p.face())]))
-            {
-                td.switchProcessor = true;
-            }
+            Info<< "No rotational tracking implementation" << endl;
+
+            break;
+        }
+
+        default:
+        {
+            FatalErrorIn
+            (
+                "KinematicParcel<ParcelType>::move(TrackData& td)"
+            )   << td.part()
+                << " is an invalid part of the tracking method."
+                << abort(FatalError);
         }
     }
 
@@ -407,7 +449,14 @@ template<class ParcelType>
 void Foam::KinematicParcel<ParcelType>::transformProperties(const tensor& T)
 {
     Particle<ParcelType>::transformProperties(T);
+
     U_ = transform(T, U_);
+
+    f_ = transform(T, f_);
+
+    angularMomentum_ = transform(T, angularMomentum_);
+
+    torque_ = transform(T, torque_);
 }
 
 
@@ -426,4 +475,3 @@ void Foam::KinematicParcel<ParcelType>::transformProperties
 #include "KinematicParcelIO.C"
 
 // ************************************************************************* //
-
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index a154bac88b..4dd608c5bb 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,13 +25,15 @@ Class
     Foam::KinematicParcel
 
 Description
-    Kinematic parcel class with one/two-way coupling with the continuous
+    Kinematic parcel class with rotational motion (as spherical
+    particles only) and one/two-way coupling with the continuous
     phase.
 
     Sub-models include:
     - drag
     - turbulent dispersion
     - wall interactions
+    - many-body collisions
 
 SourceFiles
     KinematicParcelI.H
@@ -50,6 +52,7 @@ SourceFiles
 #include "contiguous.H"
 
 #include "KinematicCloud.H"
+#include "CollisionRecordList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -96,6 +99,12 @@ public:
             //- Minimum particle mass [kg]
             const scalar minParticleMass_;
 
+            //- Young's modulus [N/m2]
+            const scalar youngsModulus_;
+
+            //- Poisson's ratio
+            const scalar poissonsRatio_;
+
 
     public:
 
@@ -115,6 +124,12 @@ public:
 
             //- Return const access to the minimum particle mass
             inline scalar minParticleMass() const;
+
+            //- Return const access to Young's Modulus
+            inline scalar youngsModulus() const;
+
+            //- Return const access to Poisson's ratio
+            inline scalar poissonsRatio() const;
     };
 
 
@@ -123,6 +138,18 @@ public:
     :
         public Particle<ParcelType>::trackData
     {
+    public:
+
+        enum trackPart
+        {
+            tpVelocityHalfStep,
+            tpLinearTrack,
+            tpRotationalTrack
+        };
+
+
+    private:
+
         // Private data
 
             //- Reference to the cloud containing this particle
@@ -146,6 +173,10 @@ public:
             //- Local gravitational or other body-force acceleration
             const vector& g_;
 
+            // label specifying which part of the integration
+            // algorithm is taking place
+            trackPart part_;
+
 
    public:
 
@@ -159,7 +190,8 @@ public:
                 const interpolation<scalar>& rhoInterp,
                 const interpolation<vector>& UInterp,
                 const interpolation<scalar>& muInterp,
-                const vector& g
+                const vector& g,
+                trackPart part = tpLinearTrack
             );
 
 
@@ -185,6 +217,12 @@ public:
 
             // Return const access to the gravitational acceleration vector
             inline const vector& g() const;
+
+            //- Return the part of the tracking operation taking place
+            inline trackPart part() const;
+
+            //- Return access to the part of the tracking operation taking place
+            inline trackPart& part();
     };
 
 
@@ -209,6 +247,17 @@ protected:
             //- Velocity of Parcel [m/s]
             vector U_;
 
+            //- Force on particle due to collisions [N]
+            vector f_;
+
+            //- Angular momentum of Parcel in global reference frame
+            // [kg m2/s]
+            vector angularMomentum_;
+
+            //- Torque on particle due to collisions in global
+            //  reference frame [Nm]
+            vector torque_;
+
             //- Density [kg/m3]
             scalar rho_;
 
@@ -218,6 +267,9 @@ protected:
             //- Turbulent velocity fluctuation [m/s]
             vector UTurb_;
 
+            //- Particle collision records
+            CollisionRecordList<vector> collisionRecords_;
+
 
         // Cell-based quantities
 
@@ -286,6 +338,9 @@ public:
             const scalar nParticle0,
             const scalar d0,
             const vector& U0,
+            const vector& f0,
+            const vector& angularMomentum0,
+            const vector& torque0,
             const constantProperties& constProps
         );
 
@@ -326,6 +381,15 @@ public:
             //- Return const access to velocity
             inline const vector& U() const;
 
+            //- Return const access to force
+            inline const vector& f() const;
+
+            //- Return const access to angular momentum
+            inline const vector& angularMomentum() const;
+
+            //- Return const access to torque
+            inline const vector& torque() const;
+
             //- Return const access to density
             inline scalar rho() const;
 
@@ -335,6 +399,9 @@ public:
             //- Return const access to turbulent velocity fluctuation
             inline const vector& UTurb() const;
 
+            //- Return const access to the collision records
+            inline const CollisionRecordList<vector>& collisionRecords() const;
+
 
         // Edit
 
@@ -353,6 +420,15 @@ public:
             //- Return access to velocity
             inline vector& U();
 
+            //- Return access to force
+            inline vector& f();
+
+            //- Return access to angular momentum
+            inline vector& angularMomentum();
+
+            //- Return access to torque
+            inline vector& torque();
+
             //- Return access to density
             inline scalar& rho();
 
@@ -362,6 +438,9 @@ public:
             //- Return access to turbulent velocity fluctuation
             inline vector& UTurb();
 
+            //- Return access to collision records
+            inline CollisionRecordList<vector>& collisionRecords();
+
 
         // Helper functions
 
@@ -379,6 +458,12 @@ public:
             //- Particle mass
             inline scalar mass() const;
 
+            //- Particle moment of inertia around diameter axis
+            inline scalar momentOfInertia() const;
+
+            //- Particle angular velocity
+            inline vector omega() const;
+
             //- Particle volume
             inline scalar volume() const;
 
@@ -574,4 +659,3 @@ public:
 #endif
 
 // ************************************************************************* //
-
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
index 06e62423c8..7f531a05cf 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,6 +41,14 @@ inline Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties
     minParticleMass_
     (
         dimensionedScalar(dict_.lookup("minParticleMass")).value()
+    ),
+    youngsModulus_
+    (
+        dimensionedScalar(dict_.lookup("youngsModulus")).value()
+    ),
+    poissonsRatio_
+    (
+        dimensionedScalar(dict_.lookup("poissonsRatio")).value()
     )
 {}
 
@@ -53,7 +61,8 @@ inline Foam::KinematicParcel<ParcelType>::trackData::trackData
     const interpolation<scalar>& rhoInterp,
     const interpolation<vector>& UInterp,
     const interpolation<scalar>& muInterp,
-    const vector& g
+    const vector& g,
+    trackPart part
 )
 :
     Particle<ParcelType>::trackData(cloud),
@@ -62,7 +71,8 @@ inline Foam::KinematicParcel<ParcelType>::trackData::trackData
     rhoInterp_(rhoInterp),
     UInterp_(UInterp),
     muInterp_(muInterp),
-    g_(g)
+    g_(g),
+    part_(part)
 {}
 
 
@@ -80,9 +90,13 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
     nParticle_(0),
     d_(0.0),
     U_(vector::zero),
+    f_(vector::zero),
+    angularMomentum_(vector::zero),
+    torque_(vector::zero),
     rho_(0.0),
     tTurb_(0.0),
     UTurb_(vector::zero),
+    collisionRecords_(),
     rhoc_(0.0),
     Uc_(vector::zero),
     muc_(0.0)
@@ -99,6 +113,9 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
     const scalar nParticle0,
     const scalar d0,
     const vector& U0,
+    const vector& f0,
+    const vector& angularMomentum0,
+    const vector& torque0,
     const constantProperties& constProps
 )
 :
@@ -108,9 +125,13 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
     nParticle_(nParticle0),
     d_(d0),
     U_(U0),
+    f_(f0),
+    angularMomentum_(angularMomentum0),
+    torque_(torque0),
     rho_(constProps.rho0()),
     tTurb_(0.0),
     UTurb_(vector::zero),
+    collisionRecords_(),
     rhoc_(0.0),
     Uc_(vector::zero),
     muc_(0.0)
@@ -151,6 +172,24 @@ Foam::KinematicParcel<ParcelType>::constantProperties::minParticleMass() const
 }
 
 
+template <class ParcelType>
+inline Foam::scalar
+Foam::KinematicParcel<ParcelType>::
+constantProperties::youngsModulus() const
+{
+    return youngsModulus_;
+}
+
+
+template <class ParcelType>
+inline Foam::scalar
+Foam::KinematicParcel<ParcelType>::
+constantProperties::poissonsRatio() const
+{
+    return poissonsRatio_;
+}
+
+
 // * * * * * * * * * * * trackData Member Functions  * * * * * * * * * * * * //
 
 template <class ParcelType>
@@ -201,7 +240,25 @@ Foam::KinematicParcel<ParcelType>::trackData::g() const
 }
 
 
-// * * * * * * * * * * KinematicParcel Member Functions  * * * * * * * * * * //
+template<class ParcelType>
+inline
+typename Foam::KinematicParcel<ParcelType>::trackData::trackPart
+Foam::KinematicParcel<ParcelType>::trackData::part() const
+{
+    return part_;
+}
+
+
+template<class ParcelType>
+inline
+typename Foam::KinematicParcel<ParcelType>::trackData::trackPart&
+Foam::KinematicParcel<ParcelType>::trackData::part()
+{
+    return part_;
+}
+
+
+// * * * * * * * KinematicParcel Member Functions  * * * * * * * //
 
 template <class ParcelType>
 inline bool Foam::KinematicParcel<ParcelType>::active() const
@@ -238,6 +295,30 @@ inline const Foam::vector& Foam::KinematicParcel<ParcelType>::U() const
 }
 
 
+template <class ParcelType>
+inline const Foam::vector&
+Foam::KinematicParcel<ParcelType>::f() const
+{
+    return f_;
+}
+
+
+template <class ParcelType>
+inline const Foam::vector&
+Foam::KinematicParcel<ParcelType>::angularMomentum() const
+{
+    return angularMomentum_;
+}
+
+
+template <class ParcelType>
+inline const Foam::vector&
+Foam::KinematicParcel<ParcelType>::torque() const
+{
+    return torque_;
+}
+
+
 template <class ParcelType>
 inline Foam::scalar Foam::KinematicParcel<ParcelType>::rho() const
 {
@@ -266,6 +347,14 @@ inline bool& Foam::KinematicParcel<ParcelType>::active()
 }
 
 
+template <class ParcelType>
+inline const Foam::CollisionRecordList<Foam::vector>&
+Foam::KinematicParcel<ParcelType>::collisionRecords() const
+{
+    return collisionRecords_;
+}
+
+
 template <class ParcelType>
 inline Foam::label& Foam::KinematicParcel<ParcelType>::typeId()
 {
@@ -294,6 +383,27 @@ inline Foam::vector& Foam::KinematicParcel<ParcelType>::U()
 }
 
 
+template <class ParcelType>
+inline Foam::vector& Foam::KinematicParcel<ParcelType>::f()
+{
+    return f_;
+}
+
+
+template <class ParcelType>
+inline Foam::vector& Foam::KinematicParcel<ParcelType>::angularMomentum()
+{
+    return angularMomentum_;
+}
+
+
+template <class ParcelType>
+inline Foam::vector& Foam::KinematicParcel<ParcelType>::torque()
+{
+    return torque_;
+}
+
+
 template <class ParcelType>
 inline Foam::scalar& Foam::KinematicParcel<ParcelType>::rho()
 {
@@ -315,13 +425,28 @@ inline Foam::vector& Foam::KinematicParcel<ParcelType>::UTurb()
 }
 
 
+template <class ParcelType>
+inline Foam::CollisionRecordList<Foam::vector>&
+Foam::KinematicParcel<ParcelType>::collisionRecords()
+{
+    return collisionRecords_;
+}
+
+
 template <class ParcelType>
 inline Foam::scalar Foam::KinematicParcel<ParcelType>::wallImpactDistance
 (
     const vector&
 ) const
 {
-    return 0.5*d_;
+    // Do not use a wall impact distance to allow proper multiple face
+    // collisions.  In a twisted mesh the particle can be within range
+    // of a wall but not in the cell attached to a wall face, hence
+    // miss the interaction.
+
+    return 0.0;
+
+    // return 0.5*d_;
 }
 
 
@@ -357,6 +482,22 @@ inline Foam::scalar Foam::KinematicParcel<ParcelType>::mass() const
 }
 
 
+template <class ParcelType>
+inline Foam::scalar
+Foam::KinematicParcel<ParcelType>::momentOfInertia() const
+{
+    return 0.1*mass()*sqr(d_);
+}
+
+
+template <class ParcelType>
+inline Foam::vector
+Foam::KinematicParcel<ParcelType>::omega() const
+{
+    return angularMomentum_/momentOfInertia();
+}
+
+
 template <class ParcelType>
 inline Foam::scalar Foam::KinematicParcel<ParcelType>::volume() const
 {
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
index a334e8b880..6220aade2a 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,6 +38,9 @@ Foam::string Foam::KinematicParcel<ParcelType>::propHeader =
   + " nParticle"
   + " d"
   + " (Ux Uy Uz)"
+  + " (fx fy fz)"
+  + " (angularMomentumx angularMomentumy angularMomentumz)"
+  + " (torquex torquey torquez)"
   + " rho"
   + " tTurb"
   + " (UTurbx UTurby UTurbz)";
@@ -59,9 +62,13 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
     nParticle_(0.0),
     d_(0.0),
     U_(vector::zero),
+    f_(vector::zero),
+    angularMomentum_(vector::zero),
+    torque_(vector::zero),
     rho_(0.0),
     tTurb_(0.0),
     UTurb_(vector::zero),
+    collisionRecords_(),
     rhoc_(0.0),
     Uc_(vector::zero),
     muc_(0.0)
@@ -75,24 +82,32 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
             nParticle_ = readScalar(is);
             d_ = readScalar(is);
             is >> U_;
+            is >> f_;
+            is >> angularMomentum_;
+            is >> torque_;
             rho_ = readScalar(is);
             tTurb_ = readScalar(is);
             is >> UTurb_;
+            is >> collisionRecords_;
         }
         else
         {
             is.read
             (
-                reinterpret_cast<char*>(&typeId_),
+                reinterpret_cast<char*>(&active_),
                 sizeof(active_)
               + sizeof(typeId_)
               + sizeof(nParticle_)
               + sizeof(d_)
               + sizeof(U_)
+              + sizeof(f_)
+              + sizeof(angularMomentum_)
+              + sizeof(torque_)
               + sizeof(rho_)
               + sizeof(tTurb_)
               + sizeof(UTurb_)
             );
+            is  >> collisionRecords_;
         }
     }
 
@@ -131,6 +146,18 @@ void Foam::KinematicParcel<ParcelType>::readFields(Cloud<ParcelType>& c)
     IOField<vector> U(c.fieldIOobject("U", IOobject::MUST_READ));
     c.checkFieldIOobject(c, U);
 
+    IOField<vector> f(c.fieldIOobject("f", IOobject::MUST_READ));
+    c.checkFieldIOobject(c, f);
+
+    IOField<vector> angularMomentum
+    (
+        c.fieldIOobject("angularMomentum", IOobject::MUST_READ)
+    );
+    c.checkFieldIOobject(c, angularMomentum);
+
+    IOField<vector> torque(c.fieldIOobject("torque", IOobject::MUST_READ));
+    c.checkFieldIOobject(c, torque);
+
     IOField<scalar> rho(c.fieldIOobject("rho", IOobject::MUST_READ));
     c.checkFieldIOobject(c, rho);
 
@@ -150,6 +177,8 @@ void Foam::KinematicParcel<ParcelType>::readFields(Cloud<ParcelType>& c)
         p.nParticle_ = nParticle[i];
         p.d_ = d[i];
         p.U_ = U[i];
+        p.f_ = f[i];
+        p.angularMomentum_ = angularMomentum[i];
         p.rho_ = rho[i];
         p.tTurb_ = tTurb[i];
         p.UTurb_ = UTurb[i];
@@ -174,6 +203,12 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
     );
     IOField<scalar> d(c.fieldIOobject("d", IOobject::NO_READ), np);
     IOField<vector> U(c.fieldIOobject("U", IOobject::NO_READ), np);
+    IOField<vector> f(c.fieldIOobject("f", IOobject::NO_READ), np);
+    IOField<vector> angularMomentum
+    (
+        c.fieldIOobject("angularMomentum", IOobject::NO_READ), np
+    );
+    IOField<vector> torque(c.fieldIOobject("torque", 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);
@@ -188,6 +223,9 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
         nParticle[i] = p.nParticle();
         d[i] = p.d();
         U[i] = p.U();
+        f[i] = p.f();
+        angularMomentum[i] = p.angularMomentum();
+        torque[i] = p.torque();
         rho[i] = p.rho();
         tTurb[i] = p.tTurb();
         UTurb[i] = p.UTurb();
@@ -199,6 +237,9 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
     nParticle.write();
     d.write();
     U.write();
+    f.write();
+    angularMomentum.write();
+    torque.write();
     rho.write();
     tTurb.write();
     UTurb.write();
@@ -222,9 +263,13 @@ Foam::Ostream& Foam::operator<<
             << token::SPACE << p.nParticle()
             << token::SPACE << p.d()
             << token::SPACE << p.U()
+            << token::SPACE << p.f()
+            << token::SPACE << p.angularMomentum()
+            << token::SPACE << p.torque()
             << token::SPACE << p.rho()
             << token::SPACE << p.tTurb()
-            << token::SPACE << p.UTurb();
+            << token::SPACE << p.UTurb()
+            << token::SPACE << p.collisionRecords();
     }
     else
     {
@@ -237,10 +282,14 @@ Foam::Ostream& Foam::operator<<
           + sizeof(p.nParticle())
           + sizeof(p.d())
           + sizeof(p.U())
+          + sizeof(p.f())
+          + sizeof(p.angularMomentum())
+          + sizeof(p.torque())
           + sizeof(p.rho())
           + sizeof(p.tTurb())
           + sizeof(p.UTurb())
         );
+        os  << p.collisionRecords();
     }
 
     // Check state of Ostream
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 37cec2deab..6ff07adc81 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
index 633df42eb3..ffb7f9b47e 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -303,6 +303,9 @@ public:
             const scalar nParticle0,
             const scalar d0,
             const vector& U0,
+            const vector& f0,
+            const vector& angularMomentum0,
+            const vector& torque0,
             const scalarField& Y0,
             const scalarField& YGas0,
             const scalarField& YLiquid0,
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
index 3af23755a1..c7a557fba6 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -110,6 +110,9 @@ inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
     const scalar nParticle0,
     const scalar d0,
     const vector& U0,
+    const vector& f0,
+    const vector& angularMomentum0,
+    const vector& torque0,
     const scalarField& Y0,
     const scalarField& YGas0,
     const scalarField& YLiquid0,
@@ -126,6 +129,9 @@ inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
         nParticle0,
         d0,
         U0,
+        f0,
+        angularMomentum0,
+        torque0,
         Y0,
         constProps
     ),
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
index fdfa177344..d167262bd0 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index de8eef0280..08d614ff9b 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index 6c91aee677..38e607bd39 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -252,6 +252,9 @@ public:
             const scalar nParticle0,
             const scalar d0,
             const vector& U0,
+            const vector& f0,
+            const vector& angularMomentum0,
+            const vector& torque0,
             const scalarField& Y0,
             const constantProperties& constProps
         );
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
index 04211229e9..736b230f08 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,6 +95,9 @@ inline Foam::ReactingParcel<ParcelType>::ReactingParcel
     const scalar nParticle0,
     const scalar d0,
     const vector& U0,
+    const vector& f0,
+    const vector& angularMomentum0,
+    const vector& torque0,
     const scalarField& Y0,
     const constantProperties& constProps
 )
@@ -108,6 +111,9 @@ inline Foam::ReactingParcel<ParcelType>::ReactingParcel
         nParticle0,
         d0,
         U0,
+        f0,
+        angularMomentum0,
+        torque0,
         constProps
     ),
     mass0_(0.0),
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
index 71a6b8f134..36ad1b6a6c 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
index 7b6590b14c..6800129a9b 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
index 6ae9d29390..8715aa570e 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -265,6 +265,9 @@ public:
             const scalar nParticle0,
             const scalar d0,
             const vector& U0,
+            const vector& f0,
+            const vector& angularMomentum0,
+            const vector& torque0,
             const constantProperties& constProps
         );
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
index 188de31157..05dce5832d 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,6 +96,9 @@ inline Foam::ThermoParcel<ParcelType>::ThermoParcel
     const scalar nParticle0,
     const scalar d0,
     const vector& U0,
+    const vector& f0,
+    const vector& angularMomentum0,
+    const vector& torque0,
     const constantProperties& constProps
 )
 :
@@ -108,6 +111,9 @@ inline Foam::ThermoParcel<ParcelType>::ThermoParcel
         nParticle0,
         d0,
         U0,
+        f0,
+        angularMomentum0,
+        torque0,
         constProps
     ),
     T_(constProps.T0()),
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
index 6baefc1946..447de83adc 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.C b/src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.C
index 882d8c3cb1..9adeb20838 100644
--- a/src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.H b/src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.H
index 2ffab6b44f..8cd6865a7c 100644
--- a/src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.C
index 9a7d78722d..849575b92f 100644
--- a/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,6 +54,9 @@ Foam::BasicReactingMultiphaseParcel<ThermoType>::BasicReactingMultiphaseParcel
     const scalar nParticle0,
     const scalar d0,
     const vector& U0,
+    const vector& f0,
+    const vector& angularMomentum0,
+    const vector& torque0,
     const scalarField& YGas0,
     const scalarField& YLiquid0,
     const scalarField& YSolid0,
@@ -72,6 +75,9 @@ Foam::BasicReactingMultiphaseParcel<ThermoType>::BasicReactingMultiphaseParcel
         nParticle0,
         d0,
         U0,
+        f0,
+        angularMomentum0,
+        torque0,
         YGas0,
         YLiquid0,
         YSolid0,
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.H
index ac58b9fe33..cc50ae66d1 100644
--- a/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,6 +87,9 @@ public:
              const scalar nParticle0,
              const scalar d0,
              const vector& U0,
+             const vector& f0,
+             const vector& angularMomentum0,
+             const vector& torque0,
              const scalarField& YGas0,
              const scalarField& YLiquid0,
              const scalarField& YSolid0,
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C
index 1a6c1082fb..cbcc47926a 100644
--- a/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C
index 21890776e6..b33358db3f 100644
--- a/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C
+++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,6 +29,7 @@ License
 #include "makeReactingParcelDispersionModels.H"
 #include "makeReactingParcelDragModels.H"
 #include "makeReactingMultiphaseParcelInjectionModels.H" // MP variant
+#include "makeReactingParcelCollisionModels.H"
 #include "makeReactingParcelPatchInteractionModels.H"
 #include "makeReactingParcelPostProcessingModels.H"
 
@@ -52,6 +53,7 @@ namespace Foam
     makeReactingDispersionModels(BasicReactingMultiphaseParcel);
     makeReactingDragModels(BasicReactingMultiphaseParcel);
     makeReactingMultiphaseInjectionModels(BasicReactingMultiphaseParcel);
+    makeReactingCollisionModels(BasicReactingMultiphaseParcel);
     makeReactingPatchInteractionModels(BasicReactingMultiphaseParcel);
     makeReactingPostProcessingModels(BasicReactingMultiphaseParcel);
 
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.C b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.C
index 95d8496b4b..5e173ff85e 100644
--- a/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,6 +49,9 @@ Foam::BasicReactingParcel<ThermoType>::BasicReactingParcel
     const scalar nParticle0,
     const scalar d0,
     const vector& U0,
+    const vector& f0,
+    const vector& angularMomentum0,
+    const vector& torque0,
     const scalarField& Y0,
     const typename ReactingParcel<BasicReactingParcel<ThermoType> >::
         constantProperties& constProps
@@ -63,6 +66,9 @@ Foam::BasicReactingParcel<ThermoType>::BasicReactingParcel
         nParticle0,
         d0,
         U0,
+        f0,
+        angularMomentum0,
+        torque0,
         Y0,
         constProps
     )
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.H b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.H
index 3b2865e18b..dc3d69e75d 100644
--- a/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,6 +86,9 @@ public:
             const scalar nParticle0,
             const scalar d0,
             const vector& U0,
+            const vector& f0,
+            const vector& angularMomentum0,
+            const vector& torque0,
             const scalarField& Y0,
             const typename ReactingParcel<BasicReactingParcel>::
                 constantProperties& constProps
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/defineBasicReactingParcel.C b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/defineBasicReactingParcel.C
index 35e748cd1d..c4dc663cbd 100644
--- a/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/defineBasicReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/defineBasicReactingParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/makeBasicReactingParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/makeBasicReactingParcelSubmodels.C
index 9a7e2f9dea..d2e23542d1 100644
--- a/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/makeBasicReactingParcelSubmodels.C
+++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/makeBasicReactingParcelSubmodels.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,6 +29,7 @@ License
 #include "makeReactingParcelDispersionModels.H"
 #include "makeReactingParcelDragModels.H"
 #include "makeReactingParcelInjectionModels.H"
+#include "makeReactingParcelCollisionModels.H"
 #include "makeReactingParcelPatchInteractionModels.H"
 #include "makeReactingParcelPostProcessingModels.H"
 
@@ -48,6 +49,7 @@ namespace Foam
     makeReactingDispersionModels(BasicReactingParcel);
     makeReactingDragModels(BasicReactingParcel);
     makeReactingInjectionModels(BasicReactingParcel);
+    makeReactingCollisionModels(BasicReactingParcel);
     makeReactingPatchInteractionModels(BasicReactingParcel);
     makeReactingPostProcessingModels(BasicReactingParcel);
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C
index 07a1d98332..61b201f282 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,6 +57,9 @@ Foam::basicKinematicParcel::basicKinematicParcel
     const scalar nParticle0,
     const scalar d0,
     const vector& U0,
+    const vector& f0,
+    const vector& angularMomentum0,
+    const vector& torque0,
     const constantProperties& constProps
 )
 :
@@ -69,6 +72,9 @@ Foam::basicKinematicParcel::basicKinematicParcel
         nParticle0,
         d0,
         U0,
+        f0,
+        angularMomentum0,
+        torque0,
         constProps
     )
 {}
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H
index ba89bb51af..bd86c395b7 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,6 +78,9 @@ public:
             const scalar nParticle0,
             const scalar d0,
             const vector& U0,
+            const vector& f0,
+            const vector& angularMomentum0,
+            const vector& torque0,
             const constantProperties& constProps
         );
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C
index 8b0e8322d0..7e713921da 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C
index 9ff005490b..002e2eb66a 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,6 +29,7 @@ License
 #include "makeParcelDispersionModels.H"
 #include "makeParcelDragModels.H"
 #include "makeParcelInjectionModels.H"
+#include "makeParcelCollisionModels.H"
 #include "makeParcelPatchInteractionModels.H"
 #include "makeParcelPostProcessingModels.H"
 #include "makeKinematicParcelSurfaceFilmModels.H"
@@ -41,6 +42,7 @@ namespace Foam
     makeParcelDispersionModels(basicKinematicParcel);
     makeParcelDragModels(basicKinematicParcel);
     makeParcelInjectionModels(basicKinematicParcel);
+    makeParcelCollisionModels(basicKinematicParcel);
     makeParcelPatchInteractionModels(basicKinematicParcel);
     makeParcelPostProcessingModels(basicKinematicParcel);
     makeKinematicParcelSurfaceFilmModels(basicKinematicParcel);
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C
index bb4978d317..c233efbd6f 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,6 +57,9 @@ Foam::basicThermoParcel::basicThermoParcel
     const scalar nParticle0,
     const scalar d0,
     const vector U0,
+    const vector& f0,
+    const vector& angularMomentum0,
+    const vector& torque0,
     const constantProperties& constProps
 )
 :
@@ -69,6 +72,9 @@ Foam::basicThermoParcel::basicThermoParcel
         nParticle0,
         d0,
         U0,
+        f0,
+        angularMomentum0,
+        torque0,
         constProps
     )
 {}
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
index 35b63178ca..63c5b50557 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,6 +77,9 @@ public:
             const scalar nParticle0,
             const scalar d0,
             const vector U0,
+            const vector& f0,
+            const vector& angularMomentum0,
+            const vector& torque0,
             const constantProperties& constProps
         );
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/defineBasicThermoParcel.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/defineBasicThermoParcel.C
index 9c86a9db67..f235de759e 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/defineBasicThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/defineBasicThermoParcel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
index 3ed5aaddb4..ef873cf15c 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,6 +29,7 @@ License
 #include "makeParcelDispersionModels.H"
 #include "makeParcelDragModels.H"
 #include "makeParcelInjectionModels.H"
+#include "makeParcelCollisionModels.H"
 #include "makeParcelPatchInteractionModels.H"
 #include "makeParcelPostProcessingModels.H"
 
@@ -44,6 +45,7 @@ namespace Foam
     makeParcelDispersionModels(basicThermoParcel);
     makeParcelDragModels(basicThermoParcel);
     makeParcelInjectionModels(basicThermoParcel);
+    makeParcelCollisionModels(basicThermoParcel);
     makeParcelPatchInteractionModels(basicThermoParcel);
     makeParcelPostProcessingModels(basicThermoParcel);
 
diff --git a/src/lagrangian/intermediate/parcels/include/createReactingMultiphaseParcelTypes.H b/src/lagrangian/intermediate/parcels/include/createReactingMultiphaseParcelTypes.H
index 5d9f5c0264..5013e8d905 100644
--- a/src/lagrangian/intermediate/parcels/include/createReactingMultiphaseParcelTypes.H
+++ b/src/lagrangian/intermediate/parcels/include/createReactingMultiphaseParcelTypes.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/createReactingParcelTypes.H b/src/lagrangian/intermediate/parcels/include/createReactingParcelTypes.H
index f6ee7ca108..a530b43f8b 100644
--- a/src/lagrangian/intermediate/parcels/include/createReactingParcelTypes.H
+++ b/src/lagrangian/intermediate/parcels/include/createReactingParcelTypes.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelCollisionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelCollisionModels.H
new file mode 100644
index 0000000000..98ef4bfbe5
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelCollisionModels.H
@@ -0,0 +1,83 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2008-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef makeParcelCollisionModels_H
+#define makeParcelCollisionModels_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "KinematicCloud.H"
+
+#include "NoCollision.H"
+#include "PairCollision.H"
+
+#include "PairSpringSliderDashpot.H"
+
+#include "WallSpringSliderDashpot.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeParcelCollisionModels(ParcelType)                                 \
+                                                                              \
+    makeCollisionModel(KinematicCloud<ParcelType>);                           \
+                                                                              \
+    makeCollisionModelType                                                    \
+    (                                                                         \
+        NoCollision,                                                          \
+        KinematicCloud,                                                       \
+        ParcelType                                                            \
+    );                                                                        \
+                                                                              \
+    makeCollisionModelType                                                    \
+    (                                                                         \
+        PairCollision,                                                        \
+        KinematicCloud,                                                       \
+        ParcelType                                                            \
+    );                                                                        \
+                                                                              \
+    makePairModel(KinematicCloud<ParcelType>);                                \
+                                                                              \
+    makePairModelType                                                         \
+    (                                                                         \
+        PairSpringSliderDashpot,                                              \
+        KinematicCloud,                                                       \
+        ParcelType                                                            \
+    );                                                                        \
+                                                                              \
+    makeWallModel(KinematicCloud<ParcelType>);                                \
+                                                                              \
+    makeWallModelType                                                         \
+    (                                                                         \
+        WallSpringSliderDashpot,                                              \
+        KinematicCloud,                                                       \
+        ParcelType                                                            \
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H
index a5465ec199..20ed09c36b 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelDragModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelDragModels.H
index 3d3ba1c990..a4c5e5f098 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelDragModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelDragModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelHeatTransferModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelHeatTransferModels.H
index 11908f0fee..8218b00a15 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelHeatTransferModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelHeatTransferModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H
index f08a0b21dd..ea8dcd57f4 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelPatchInteractionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelPatchInteractionModels.H
index 85fd13d7ec..ed358a2d4a 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelPatchInteractionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelPatchInteractionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelPostProcessingModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelPostProcessingModels.H
index b0704356e5..ab3055882f 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelPostProcessingModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelPostProcessingModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelCompositionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelCompositionModels.H
index adaae9e5a6..e87b835f5d 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelCompositionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelCompositionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelDevolatilisationModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelDevolatilisationModels.H
index 9015be1ed9..c1d14efcac 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelDevolatilisationModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelDevolatilisationModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H
index 6182be3d66..ca064118da 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelSurfaceReactionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelSurfaceReactionModels.H
index 7259b63c29..4aa621ffb4 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelSurfaceReactionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelSurfaceReactionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelCollisionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelCollisionModels.H
new file mode 100644
index 0000000000..f1bd4af8a1
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelCollisionModels.H
@@ -0,0 +1,109 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2008-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef makeReactingParcelCollisionModels_H
+#define makeReactingParcelCollisionModels_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "thermoPhysicsTypes.H"
+#include "KinematicCloud.H"
+
+#include "NoCollision.H"
+#include "PairCollision.H"
+
+#include "PairSpringSliderDashpot.H"
+
+#include "WallSpringSliderDashpot.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeReactingCollisionModels(ParcelType)                               \
+                                                                              \
+    makeReactingCollisionModelThermoType                                      \
+    (                                                                         \
+        ParcelType,                                                           \
+        constGasThermoPhysics                                                 \
+    );                                                                        \
+                                                                              \
+    makeReactingCollisionModelThermoType                                      \
+    (                                                                         \
+        ParcelType,                                                           \
+        gasThermoPhysics                                                      \
+    );                                                                        \
+                                                                              \
+    makeReactingCollisionModelThermoType                                      \
+    (                                                                         \
+        ParcelType,                                                           \
+        icoPoly8ThermoPhysics                                                 \
+    );
+
+
+#define makeReactingCollisionModelThermoType(ParcelType, ThermoType)          \
+                                                                              \
+    makeCollisionModel(KinematicCloud<ParcelType<ThermoType> >);              \
+                                                                              \
+    makeCollisionModelThermoType                                              \
+    (                                                                         \
+        NoCollision,                                                          \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+                                                                              \
+    makeCollisionModelThermoType                                              \
+    (                                                                         \
+        PairCollision,                                                        \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+                                                                              \
+    makePairModel(KinematicCloud<ParcelType<ThermoType> >);                   \
+                                                                              \
+    makePairModelThermoType                                                   \
+    (                                                                         \
+        PairSpringSliderDashpot,                                              \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+                                                                              \
+    makeWallModel(KinematicCloud<ParcelType<ThermoType> >);                   \
+                                                                              \
+    makeWallModelThermoType                                                   \
+    (                                                                         \
+        WallSpringSliderDashpot,                                              \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelCompositionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelCompositionModels.H
index f0da310f05..8f8fdb7061 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelCompositionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelCompositionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelDispersionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelDispersionModels.H
index b899ab5c16..a010713aaf 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelDispersionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelDispersionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelDragModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelDragModels.H
index 9692af3ac5..05ad04fa29 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelDragModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelDragModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelHeatTransferModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelHeatTransferModels.H
index 5326590766..864177001c 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelHeatTransferModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelHeatTransferModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H
index aa102cadb4..cae3ea5bbc 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelPatchInteractionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelPatchInteractionModels.H
index 8409ca960d..b41f1ce7a4 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelPatchInteractionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelPatchInteractionModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelPhaseChangeModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelPhaseChangeModels.H
index 39bb4ffe75..0505383759 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelPhaseChangeModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelPhaseChangeModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelPostProcessingModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelPostProcessingModels.H
index d549d04e9d..b6a900ddab 100644
--- a/src/lagrangian/intermediate/parcels/include/makeReactingParcelPostProcessingModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelPostProcessingModels.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/particleForces/particleForces.C b/src/lagrangian/intermediate/particleForces/particleForces.C
index 7778736683..5d446037fe 100644
--- a/src/lagrangian/intermediate/particleForces/particleForces.C
+++ b/src/lagrangian/intermediate/particleForces/particleForces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/particleForces/particleForces.H b/src/lagrangian/intermediate/particleForces/particleForces.H
index cc47366533..90c5ecafa4 100644
--- a/src/lagrangian/intermediate/particleForces/particleForces.H
+++ b/src/lagrangian/intermediate/particleForces/particleForces.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
index a0484aa90d..bd01c8b207 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
index 2d79426b1a..51717bca1e 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
index d3eeabc34c..8d92aba2d5 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.C b/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.C
index 484fa75933..d71f3f7b19 100644
--- a/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.C
+++ b/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.H b/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.H
index 5ad4a26c16..23d4996a2a 100644
--- a/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.H
+++ b/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.C
index b9df21cbcd..fca5698857 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H
index cd5d10257e..3a36935c11 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/ConstantIO.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/ConstantIO.C
index 93c42ed379..c9b50ff7c9 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/ConstantIO.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/ConstantIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.C
index c0a7a582f1..cd9f3a4b0c 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H
index bf4af83b0f..c2048c25d3 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryIO.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryIO.C
index 56d17cc32d..6281dfb6d2 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryIO.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryNew.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryNew.C
index 7c3facfed7..3c5650bc84 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryNew.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C
index f194d44c71..40f07345a2 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H
index 05d9a407fc..bdb84e87ee 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/TableIO.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/TableIO.C
index e1f337c283..2b1ba938b1 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/TableIO.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/TableIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/makeDataEntries.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/makeDataEntries.C
index 3212ad9f77..71d7c1d05b 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/makeDataEntries.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/makeDataEntries.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C
index 78f98881c3..75d65677ec 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
index 58110ddf94..47fc1fd30f 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C
index ba7c72cdb9..e50f08bb1e 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionListI.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.C
similarity index 58%
rename from src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionListI.H
rename to src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.C
index cf0387cd76..47db7f93da 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionListI.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,12 +23,42 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+#include "CollisionModel.H"
 
-inline const Foam::interactionLists& Foam::directInteractionList::il() const
-{
-    return il_;
-}
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+template<class CloudType>
+Foam::CollisionModel<CloudType>::CollisionModel(CloudType& owner)
+:
+    dict_(dictionary::null),
+    owner_(owner),
+    coeffDict_(dictionary::null)
+{}
+
+
+template<class CloudType>
+Foam::CollisionModel<CloudType>::CollisionModel
+(
+    const dictionary& dict,
+    CloudType& owner,
+    const word& type
+)
+:
+    dict_(dict),
+    owner_(owner),
+    coeffDict_(dict.subDict(type + "Coeffs"))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::CollisionModel<CloudType>::~CollisionModel()
+{}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "NewCollisionModel.C"
 
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H
new file mode 100644
index 0000000000..3420f8d9e5
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModel.H
@@ -0,0 +1,200 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2009-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::CollisionModel
+
+Description
+    Templated collision model class.
+
+SourceFiles
+    CollisionModel.C
+    NewCollisionModel.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef CollisionModel_H
+#define CollisionModel_H
+
+#include "IOdictionary.H"
+#include "autoPtr.H"
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class CollisionModel Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class CollisionModel
+{
+    // Private data
+
+        //- The cloud dictionary
+        const dictionary& dict_;
+
+        //- Reference to the owner cloud class
+        CloudType& owner_;
+
+        //- The coefficients dictionary
+        const dictionary coeffDict_;
+
+
+protected:
+
+    // Protected data
+
+        //- Convenience typedef for parcel type
+        typedef typename CloudType::parcelType parcelType;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("CollisionModel");
+
+    //- Declare runtime constructor selection table
+    declareRunTimeSelectionTable
+    (
+        autoPtr,
+        CollisionModel,
+        dictionary,
+        (
+            const dictionary& dict,
+            CloudType& owner
+        ),
+        (dict, owner)
+    );
+
+
+    // Constructors
+
+        //- Construct null from owner
+        CollisionModel(CloudType& owner);
+
+        //- Construct from dictionary
+        CollisionModel
+        (
+            const dictionary& dict,
+            CloudType& owner,
+            const word& type
+        );
+
+
+    //- Destructor
+    virtual ~CollisionModel();
+
+
+    //- Selector
+    static autoPtr<CollisionModel<CloudType> > New
+    (
+        const dictionary& dict,
+        CloudType& owner
+    );
+
+
+    // Access
+
+        //- Return the owner cloud dictionary
+        inline const dictionary& dict() const;
+
+        //- Return const access the owner cloud object
+        inline const CloudType& owner() const;
+
+        //- Return non-const access the owner cloud object for manipulation
+        inline CloudType& owner();
+
+        //- Return the coefficients dictionary
+        inline const dictionary& coeffDict() const;
+
+
+    // Member Functions
+
+        //- Return the number of times to subcycle the current
+        //  timestep to meet the criteria of the collision model
+        virtual label nSubCycles() const = 0;
+
+        //- Flag to indicate whether model activates injection model
+        virtual bool active() const = 0;
+
+        // Collision function
+        virtual void collide() = 0;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeCollisionModel(CloudType)                                         \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug(CollisionModel<CloudType>, 0);        \
+                                                                              \
+    defineTemplateRunTimeSelectionTable(CollisionModel<CloudType>, dictionary);
+
+
+#define makeCollisionModelType(SS, CloudType, ParcelType)                     \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+                                                                              \
+    CollisionModel<CloudType<ParcelType> >::                                  \
+        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
+            add##SS##CloudType##ParcelType##ConstructorToTable_;
+
+
+#define makeCollisionModelThermoType(SS, CloudType, ParcelType, ThermoType)   \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug                                       \
+    (                                                                         \
+        SS<CloudType<ParcelType<ThermoType> > >,                              \
+        0                                                                     \
+    );                                                                        \
+                                                                              \
+    CollisionModel<CloudType<ParcelType<ThermoType> > >::                     \
+        adddictionaryConstructorToTable                                       \
+        <SS<CloudType<ParcelType<ThermoType> > > >                            \
+            add##SS##CloudType##ParcelType##ThermoType##ConstructorToTable_;
+
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "CollisionModelI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "CollisionModel.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralListI.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelI.H
similarity index 68%
rename from src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralListI.H
rename to src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelI.H
index 302b09368b..009d1e20c8 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralListI.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/CollisionModelI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,23 +23,33 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+#include "CollisionModel.H"
 
-inline Foam::label Foam::receivingReferralList::sourceProc() const
+template<class CloudType>
+const Foam::dictionary& Foam::CollisionModel<CloudType>::dict() const
 {
-    return sourceProc_;
+    return dict_;
 }
 
 
-// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
-
-inline bool operator!=
-(
-    const Foam::receivingReferralList& a,
-    const Foam::receivingReferralList& b
-)
+template<class CloudType>
+const CloudType& Foam::CollisionModel<CloudType>::owner() const
 {
-    return (!(a == b));
+    return owner_;
+}
+
+
+template<class CloudType>
+CloudType& Foam::CollisionModel<CloudType>::owner()
+{
+    return owner_;
+}
+
+
+template<class CloudType>
+const Foam::dictionary& Foam::CollisionModel<CloudType>::coeffDict() const
+{
+    return coeffDict_;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/NewCollisionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/NewCollisionModel.C
new file mode 100644
index 0000000000..3f06cfbe4e
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/CollisionModel/NewCollisionModel.C
@@ -0,0 +1,65 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2009-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "CollisionModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::autoPtr<Foam::CollisionModel<CloudType> >
+Foam::CollisionModel<CloudType>::New
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+{
+    word CollisionModelType(dict.lookup("CollisionModel"));
+
+    Info<< "Selecting CollisionModel " << CollisionModelType << endl;
+
+    typename dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(CollisionModelType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "CollisionModel<CloudType>::New"
+            "("
+                "const dictionary&, "
+                "CloudType&"
+            ")"
+        )   << "Unknown CollisionModelType type "
+            << CollisionModelType
+            << ", constructor not in hash table" << nl << nl
+            << "    Valid CollisionModel types are:" << nl
+            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
+    }
+
+    return autoPtr<CollisionModel<CloudType> >(cstrIter()(dict, owner));
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMoleculeI.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.C
similarity index 63%
rename from src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMoleculeI.H
rename to src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.C
index 2d22b7a834..f99edcd47f 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMoleculeI.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,52 +23,47 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "NoCollision.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::NoCollision<CloudType>::NoCollision
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+:
+    CollisionModel<CloudType>(owner)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::NoCollision<CloudType>::~NoCollision()
+{}
+
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline Foam::label Foam::referredMolecule::id() const
+template<class CloudType>
+Foam::label Foam::NoCollision<CloudType>::nSubCycles() const
 {
-    return id_;
+    return 1;
 }
 
 
-inline const Foam::vector& Foam::referredMolecule::position() const
+template<class CloudType>
+bool Foam::NoCollision<CloudType>::active() const
 {
-    return position_;
+    return false;
 }
 
 
-inline const Foam::List<Foam::vector>&
-Foam::referredMolecule::sitePositions() const
-{
-    return sitePositions_;
-}
-
-
-// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
-
-inline bool Foam::operator==
-(
-    const Foam::referredMolecule& a,
-    const Foam::referredMolecule& b
-)
-{
-    return
-    (
-        a.id() == b.id()
-     && a.position() == b.position()
-    );
-}
-
-
-inline bool Foam::operator!=
-(
-    const Foam::referredMolecule& a,
-    const Foam::referredMolecule& b
-)
-{
-    return !(a == b);
-}
+template<class CloudType>
+void Foam::NoCollision<CloudType>::collide()
+{}
 
 
 // ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.H
similarity index 64%
rename from src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.H
rename to src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.H
index c3c099097c..5806806892 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,75 +22,68 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::referredCellList
+    Foam::NoCollision
 
 Description
+    Place holder for 'none' option
 
 SourceFiles
-    referredCellListI.H
-    referredCellList.C
+    NoCollision.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef referredCellList_H
-#define referredCellList_H
+#ifndef NoCollision_H
+#define NoCollision_H
 
-#include "referredCell.H"
-#include "molecule.H"
+#include "CollisionModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// Forward declaration of classes
-class interactionLists;
-
 /*---------------------------------------------------------------------------*\
-                      Class referredCellList Declaration
+                        Class NoCollision Declaration
 \*---------------------------------------------------------------------------*/
 
-class referredCellList
+template<class CloudType>
+class NoCollision
 :
-    public List<referredCell>
+    public CollisionModel<CloudType>
 {
-    // Private data
-
-        const interactionLists& il_;
-
-
-    // Private Member Functions
-
-        void buildReferredCellList
-        (
-            bool pointPointListBuild
-        );
-
 
 public:
 
+    //- Runtime type information
+    TypeName("none");
+
+
     // Constructors
 
-        //- Construct lists by searching the mesh
-        referredCellList
+        //- Construct from dictionary
+        NoCollision
         (
-            interactionLists& il,
-            bool pointPointListBuild
+            const dictionary& dict,
+            CloudType& owner
         );
 
-        //- Construct from file
-        referredCellList (interactionLists& il);
-
 
     //- Destructor
-    ~referredCellList();
+    virtual ~NoCollision();
 
 
     // Member Functions
 
-        void referMolecules(const List<DynamicList<molecule*> >& cellOccupancy);
+        //- Return the number of times to subcycle the current
+        //  timestep to meet the criteria of the collision model.  For
+        //  this model this will always be 1.
+        virtual label nSubCycles() const;
 
-        inline const interactionLists& il() const;
+        //- Flag to indicate whether model activates injection model
+        virtual bool active() const;
+
+        // Collision function
+        virtual void collide();
 };
 
 
@@ -100,7 +93,9 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "referredCellListI.H"
+#ifdef NoRepository
+#   include "NoCollision.C"
+#endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
new file mode 100644
index 0000000000..967acf0640
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
@@ -0,0 +1,568 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2009-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "PairCollision.H"
+#include "PairModel.H"
+#include "WallModel.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::scalar Foam::PairCollision<CloudType>::cosPhiMinFlatWall = 1 - SMALL;
+
+template<class CloudType>
+Foam::scalar Foam::PairCollision<CloudType>::flatWallDuplicateExclusion =
+    sqrt(3*SMALL);
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class CloudType>
+void Foam::PairCollision<CloudType>::preInteraction()
+{
+    // Set accumulated quantities to zero
+    forAllIter(typename CloudType, this->owner(), iter)
+    {
+        typename CloudType::parcelType& p = iter();
+
+        p.f() = vector::zero;
+
+        p.torque() = vector::zero;
+    }
+
+    buildCellOccupancy();
+}
+
+
+template<class CloudType>
+void Foam::PairCollision<CloudType>::parcelInteraction()
+{
+    PstreamBuffers pBufs(Pstream::nonBlocking);
+
+    il_.sendReferredData(cellOccupancy_, pBufs);
+
+    realRealInteraction();
+
+    il_.receiveReferredData(pBufs);
+
+    realReferredInteraction();
+}
+
+
+template<class CloudType>
+void Foam::PairCollision<CloudType>::realRealInteraction()
+{
+    // Direct interaction list (dil)
+    const labelListList& dil = il_.dil();
+
+    typename CloudType::parcelType* pA_ptr = NULL;
+    typename CloudType::parcelType* pB_ptr = NULL;
+
+    forAll(dil, realCellI)
+    {
+        // Loop over all Parcels in cell A (a)
+        forAll(cellOccupancy_[realCellI], a)
+        {
+            pA_ptr = cellOccupancy_[realCellI][a];
+
+            forAll(dil[realCellI], interactingCells)
+            {
+                List<typename CloudType::parcelType*> cellBParcels =
+                    cellOccupancy_[dil[realCellI][interactingCells]];
+
+                // Loop over all Parcels in cell B (b)
+                forAll(cellBParcels, b)
+                {
+                    pB_ptr = cellBParcels[b];
+
+                    evaluatePair(*pA_ptr, *pB_ptr);
+                }
+            }
+
+            // Loop over the other Parcels in cell A (aO)
+            forAll(cellOccupancy_[realCellI], aO)
+            {
+                pB_ptr = cellOccupancy_[realCellI][aO];
+
+                // Do not double-evaluate, compare pointers, arbitrary
+                // order
+                if (pB_ptr > pA_ptr)
+                {
+                    evaluatePair(*pA_ptr, *pB_ptr);
+                }
+            }
+        }
+    }
+}
+
+
+template<class CloudType>
+void Foam::PairCollision<CloudType>::realReferredInteraction()
+{
+    // Referred interaction list (ril)
+    const labelListList& ril = il_.ril();
+
+    List<IDLList<typename CloudType::parcelType> >& referredParticles =
+    il_.referredParticles();
+
+    // Loop over all referred cells
+    forAll(ril, refCellI)
+    {
+        IDLList<typename CloudType::parcelType>& refCellRefParticles =
+        referredParticles[refCellI];
+
+        const labelList& realCells = ril[refCellI];
+
+        // Loop over all referred parcels in the referred cell
+
+        forAllIter
+        (
+            typename IDLList<typename CloudType::parcelType>,
+            refCellRefParticles,
+            referredParcel
+        )
+        {
+            // Loop over all real cells in that the referred cell is
+            // to supply interactions to
+
+            forAll(realCells, realCellI)
+            {
+                List<typename CloudType::parcelType*> realCellParcels =
+                    cellOccupancy_[realCells[realCellI]];
+
+                forAll(realCellParcels, realParcelI)
+                {
+                    evaluatePair
+                    (
+                        *realCellParcels[realParcelI],
+                        referredParcel()
+                    );
+                }
+            }
+        }
+    }
+}
+
+
+template<class CloudType>
+void Foam::PairCollision<CloudType>::wallInteraction()
+{
+    const polyMesh& mesh = this->owner().mesh();
+
+    const labelListList& dil = il_.dil();
+
+    const labelListList directWallFaces = il_.dwfil();
+
+    // Storage for the wall interaction sites
+    DynamicList<point> flatSites;
+    DynamicList<scalar> flatSiteExclusionDistancesSqr;
+    DynamicList<point> otherSites;
+    DynamicList<scalar> otherSiteDistances;
+    DynamicList<point> sharpSites;
+    DynamicList<scalar> sharpSiteExclusionDistancesSqr;
+
+    forAll(dil, realCellI)
+    {
+        // The real wall faces in range of this real cell
+        const labelList& realWallFaces = directWallFaces[realCellI];
+
+        // Loop over all Parcels in cell
+        forAll(cellOccupancy_[realCellI], cellParticleI)
+        {
+            flatSites.clear();
+            flatSiteExclusionDistancesSqr.clear();
+            otherSites.clear();
+            otherSiteDistances.clear();
+            sharpSites.clear();
+            sharpSiteExclusionDistancesSqr.clear();
+
+            typename CloudType::parcelType& p =
+            *cellOccupancy_[realCellI][cellParticleI];
+
+            const point& pos = p.position();
+
+            scalar r = p.d()/2;
+
+            // real wallFace interactions
+
+            forAll(realWallFaces, realWallFaceI)
+            {
+                label realFaceI = realWallFaces[realWallFaceI];
+
+                pointHit nearest = mesh.faces()[realFaceI].nearestPoint
+                (
+                    pos,
+                    mesh.points()
+                );
+
+                if (nearest.distance() < r)
+                {
+                    vector normal = mesh.faceAreas()[realFaceI];
+
+                    normal /= mag(normal);
+
+                    const vector& nearPt = nearest.rawPoint();
+
+                    vector pW = nearPt - pos;
+
+                    scalar normalAlignment = normal & pW/mag(pW);
+
+                    if (normalAlignment > cosPhiMinFlatWall)
+                    {
+                        // Guard against a flat interaction being
+                        // present on the boundary of two or more
+                        // faces, which would create duplicate contact
+                        // points. Duplicates are discarded.
+                        if
+                        (
+                            !duplicatePointInList
+                            (
+                                flatSites,
+                                nearPt,
+                                sqr(r*flatWallDuplicateExclusion)
+                            )
+                        )
+                        {
+                            flatSites.append(nearPt);
+
+                            flatSiteExclusionDistancesSqr.append
+                            (
+                                sqr(r) - sqr(nearest.distance())
+                            );
+                        }
+                    }
+                    else
+                    {
+                        otherSites.append(nearPt);
+
+                        otherSiteDistances.append(nearest.distance());
+                    }
+                }
+            }
+
+            // referred wallFace interactions
+
+            // The labels of referred wall faces in range of this real cell
+            const labelList& cellRefWallFaces = il_.rwfilInverse()[realCellI];
+
+            forAll(cellRefWallFaces, rWFI)
+            {
+                const referredWallFace& rwf =
+                il_.referredWallFaces()[cellRefWallFaces[rWFI]];
+
+                const pointField& pts = rwf.points();
+
+                pointHit nearest = rwf.nearestPoint(pos, pts);
+
+                if (nearest.distance() < r)
+                {
+                    vector normal = rwf.normal(pts);
+
+                    normal /= mag(normal);
+
+                    const vector& nearPt = nearest.rawPoint();
+
+                    vector pW = nearPt - pos;
+
+                    scalar normalAlignment = normal & pW/mag(pW);
+
+                    if (normalAlignment > cosPhiMinFlatWall)
+                    {
+                        // Guard against a flat interaction being
+                        // present on the boundary of two or more
+                        // faces, which would create duplicate contact
+                        // points. Duplicates are discarded.
+                        if
+                        (
+                            !duplicatePointInList
+                            (
+                                flatSites,
+                                nearPt,
+                                sqr(r*flatWallDuplicateExclusion)
+                            )
+                        )
+                        {
+                            flatSites.append(nearPt);
+
+                            flatSiteExclusionDistancesSqr.append
+                            (
+                                sqr(r) - sqr(nearest.distance())
+                            );
+                        }
+                    }
+                    else
+                    {
+                        otherSites.append(nearPt);
+
+                        otherSiteDistances.append(nearest.distance());
+                    }
+                }
+            }
+
+            // All flat interaction sites found, now classify the
+            // other sites as being in range of a flat interaction, or
+            // a sharp interaction, being aware of not duplicating the
+            // sharp interaction sites.
+
+            // The "other" sites need to evaluated in order of
+            // ascending distance to their nearest point so that
+            // grouping occurs around the closest in any group
+
+            labelList sortedOtherSiteIndices;
+
+            sortedOrder(otherSiteDistances, sortedOtherSiteIndices);
+
+            forAll(sortedOtherSiteIndices, siteI)
+            {
+                label orderedIndex = sortedOtherSiteIndices[siteI];
+
+                const point& otherPt = otherSites[orderedIndex];
+
+                if
+                (
+                    !duplicatePointInList
+                    (
+                        flatSites,
+                        otherPt,
+                        flatSiteExclusionDistancesSqr
+                    )
+                )
+                {
+                    // Not in range of a flat interaction, must be a
+                    // sharp interaction.
+
+                    if
+                    (
+                        !duplicatePointInList
+                        (
+                            sharpSites,
+                            otherPt,
+                            sharpSiteExclusionDistancesSqr
+                        )
+                    )
+                    {
+                        sharpSites.append(otherPt);
+
+                        sharpSiteExclusionDistancesSqr.append
+                        (
+                            sqr(r) - sqr(otherSiteDistances[orderedIndex])
+                        );
+                    }
+                }
+            }
+
+            evaluateWall(p, flatSites, sharpSites);
+        }
+    }
+}
+
+
+template<class CloudType>
+bool Foam::PairCollision<CloudType>::duplicatePointInList
+(
+    const DynamicList<point>& existingPoints,
+    const point& pointToTest,
+    scalar duplicateRangeSqr
+) const
+{
+    forAll(existingPoints, i)
+    {
+        if (magSqr(existingPoints[i] - pointToTest) < duplicateRangeSqr)
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+
+template<class CloudType>
+bool Foam::PairCollision<CloudType>::duplicatePointInList
+(
+    const DynamicList<point>& existingPoints,
+    const point& pointToTest,
+    const scalarList& duplicateRangeSqr
+) const
+{
+    forAll(existingPoints, i)
+    {
+        if (magSqr(existingPoints[i] - pointToTest) < duplicateRangeSqr[i])
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+
+template<class CloudType>
+void Foam::PairCollision<CloudType>::postInteraction()
+{
+    // Delete any collision records where no collision occurred this step
+
+    forAllIter(typename CloudType, this->owner(), iter)
+    {
+        typename CloudType::parcelType& p = iter();
+
+        p.collisionRecords().update();
+    }
+}
+
+
+template<class CloudType>
+void Foam::PairCollision<CloudType>::buildCellOccupancy()
+{
+    forAll(cellOccupancy_, cO)
+    {
+        cellOccupancy_[cO].clear();
+    }
+
+    forAllIter(typename CloudType, this->owner(), iter)
+    {
+        cellOccupancy_[iter().cell()].append(&iter());
+    }
+}
+
+
+template<class CloudType>
+void Foam::PairCollision<CloudType>::evaluatePair
+(
+    typename CloudType::parcelType& pA,
+    typename CloudType::parcelType& pB
+) const
+{
+    pairModel_->evaluatePair(pA, pB);
+}
+
+
+template<class CloudType>
+void Foam::PairCollision<CloudType>::evaluateWall
+(
+    typename CloudType::parcelType& p,
+    const List<point>& flatSites,
+    const List<point>& sharpSites
+) const
+{
+    wallModel_->evaluateWall(p, flatSites, sharpSites);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::PairCollision<CloudType>::PairCollision
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+:
+    CollisionModel<CloudType>(dict, owner, typeName),
+    cellOccupancy_(owner.mesh().nCells()),
+    pairModel_
+    (
+        PairModel<CloudType>::New
+        (
+            this->coeffDict(),
+            this->owner()
+        )
+    ),
+    wallModel_
+    (
+        WallModel<CloudType>::New
+        (
+            this->coeffDict(),
+            this->owner()
+        )
+    ),
+    il_
+    (
+        owner.mesh(),
+        readScalar(this->coeffDict().lookup("maxInteractionDistance")),
+        Switch(this->coeffDict().lookup("writeReferredParticleCloud"))
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::PairCollision<CloudType>::~PairCollision()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::label Foam::PairCollision<CloudType>::nSubCycles() const
+{
+    label nSubCycles = 1;
+
+    if (pairModel_->controlsTimestep())
+    {
+        label nPairSubCycles = returnReduce
+        (
+            pairModel_->nSubCycles(), maxOp<label>()
+        );
+
+        nSubCycles = max(nSubCycles, nPairSubCycles);
+    }
+
+    if (wallModel_->controlsTimestep())
+    {
+        label nWallSubCycles = returnReduce
+        (
+            wallModel_->nSubCycles(), maxOp<label>()
+        );
+
+        nSubCycles = max(nSubCycles, nWallSubCycles);
+    }
+
+    return nSubCycles;
+}
+
+
+template<class CloudType>
+bool Foam::PairCollision<CloudType>::active() const
+{
+    return true;
+}
+
+
+template<class CloudType>
+void Foam::PairCollision<CloudType>::collide()
+{
+    preInteraction();
+
+    parcelInteraction();
+
+    wallInteraction();
+
+    postInteraction();
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H
new file mode 100644
index 0000000000..8582db464e
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.H
@@ -0,0 +1,193 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2009-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::PairCollision
+
+Description
+
+SourceFiles
+    PairCollision.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef PairCollision_H
+#define PairCollision_H
+
+#include "CollisionModel.H"
+#include "InteractionLists.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+
+template<class CloudType>
+class PairModel;
+
+template<class CloudType>
+class WallModel;
+
+
+/*---------------------------------------------------------------------------*\
+                     Class PairCollision Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class PairCollision
+:
+    public CollisionModel<CloudType>
+{
+    // Static data
+
+        //- Tolerance to determine flat wall interactions
+        static scalar cosPhiMinFlatWall;
+
+        //- Distance to multiply the distance to a wall with within
+        //  which a duplicate flat wall interaction is defined.  If
+        //  cosPhiFlatWall = 1 - e, this = sqrt(2e - e^2) < sqrt(3e)
+        //  for all e < 1, giving a safe tolerance (i.e. no double
+        //  interactions next to each other.)
+        static scalar flatWallDuplicateExclusion;
+
+
+    // Private data
+
+        //- Cell occupancy information for each parcel
+        List<DynamicList<typename CloudType::parcelType*> > cellOccupancy_;
+
+        //- PairModel to calculate the interaction between two parcels
+        autoPtr<PairModel<CloudType> > pairModel_;
+
+        //- WallModel to calculate the interaction between the parcel and walls
+        autoPtr<WallModel<CloudType> > wallModel_;
+
+        //- Interactions lists determining which cells are in
+        //  interaction range of each other
+        InteractionLists<typename CloudType::parcelType> il_;
+
+
+    // Private member functions
+
+        //- Pre collision tasks
+        void preInteraction();
+
+        //- Interactions between parcels
+        void parcelInteraction();
+
+        //- Interactions between real (on-processor) particles
+        void realRealInteraction();
+
+        //- Interactions between real and referred (off processor) particles
+        void realReferredInteraction();
+
+        //- Interactions with walls
+        void wallInteraction();
+
+        bool duplicatePointInList
+        (
+            const DynamicList<point>& existingPoints,
+            const point& pointToTest,
+            scalar duplicateRangeSqr
+        ) const;
+
+        bool duplicatePointInList
+        (
+            const DynamicList<point>& existingPoints,
+            const point& pointToTest,
+            const scalarList& duplicateRangeSqr
+        ) const;
+
+        //- Post collision tasks
+        void postInteraction();
+
+        //- Build the cell occupancy information for each parcel
+        void buildCellOccupancy();
+
+        //- Calculate the pair force between parcels
+        void evaluatePair
+        (
+            typename CloudType::parcelType& pA,
+            typename CloudType::parcelType& pB
+        ) const;
+
+        //- Calculate the wall forces on a parcel
+        void evaluateWall
+        (
+            typename CloudType::parcelType& p,
+            const List<point>& flatSites,
+            const List<point>& sharpSites
+        ) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("PairCollision");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        PairCollision
+        (
+            const dictionary& dict,
+            CloudType& owner
+        );
+
+
+    //- Destructor
+    virtual ~PairCollision();
+
+
+    // Member Functions
+
+        //- Return the number of times to subcycle the current
+        //  timestep to meet the criteria of the collision model.
+        virtual label nSubCycles() const;
+
+        //- Flag to indicate whether model activates injection model
+        virtual bool active() const;
+
+        // Collision function
+        virtual void collide();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "PairCollision.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/NewPairModel.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/NewPairModel.C
new file mode 100644
index 0000000000..2cee6e8981
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/NewPairModel.C
@@ -0,0 +1,66 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2008-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "PairModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::autoPtr<Foam::PairModel<CloudType> >
+Foam::PairModel<CloudType>::New
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+{
+    word PairModelType(dict.lookup("PairModel"));
+
+    Info<< "Selecting PairModel " << PairModelType
+        << endl;
+
+    typename dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(PairModelType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "PairModel<CloudType>::New"
+            "("
+                "const dictionary&, "
+                "CloudType&"
+            ")"
+        )   << "Unknown PairModelType type "
+            << PairModelType
+            << ", constructor not in hash table" << nl << nl
+            << "    Valid PairModel types are:" << nl
+            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
+    }
+
+    return autoPtr<PairModel<CloudType> >(cstrIter()(dict, owner));
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionListsI.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.C
similarity index 60%
rename from src/lagrangian/molecularDynamics/molecule/interactionLists/interactionListsI.H
rename to src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.C
index 344acb2713..79adb906c1 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionListsI.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,55 +23,58 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+#include "PairModel.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::PairModel<CloudType>::PairModel
+(
+    const dictionary& dict,
+    CloudType& owner,
+    const word& type
+)
+:
+    dict_(dict),
+    owner_(owner),
+    coeffDict_(dict.subDict(type + "Coeffs"))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::PairModel<CloudType>::~PairModel()
+{}
+
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-const Foam::polyMesh& Foam::interactionLists::mesh() const
+template<class CloudType>
+const CloudType&
+Foam::PairModel<CloudType>::owner() const
 {
-    return mesh_;
+    return owner_;
 }
 
 
-const Foam::directInteractionList& Foam::interactionLists::dil() const
+template<class CloudType>
+const Foam::dictionary& Foam::PairModel<CloudType>::dict() const
 {
-    return dil_;
+    return dict_;
 }
 
 
-inline const Foam::referredCellList& Foam::interactionLists::ril() const
+template<class CloudType>
+const Foam::dictionary&
+Foam::PairModel<CloudType>::coeffDict() const
 {
-    return ril_;
-}
-
-
-inline Foam::referredCellList& Foam::interactionLists::ril()
-{
-    return ril_;
-}
-
-
-inline const Foam::List<Foam::sendingReferralList>&
-    Foam::interactionLists::cellSendingReferralLists() const
-{
-    return cellSendingReferralLists_;
-}
-
-
-inline const Foam::List<Foam::receivingReferralList>&
-    Foam::interactionLists::cellReceivingReferralLists() const
-{
-    return cellReceivingReferralLists_;
-}
-
-
-inline Foam::label Foam::interactionLists::nInteractingProcs() const
-{
-    return cellReceivingReferralLists_.size();
+    return coeffDict_;
 }
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "NewPairModel.C"
 
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H
new file mode 100644
index 0000000000..1b6d1e56be
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairModel/PairModel.H
@@ -0,0 +1,191 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2008-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::PairModel
+
+Description
+    Templated pair interaction class
+
+SourceFiles
+    PairModel.C
+    NewPairModel.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef PairModel_H
+#define PairModel_H
+
+#include "IOdictionary.H"
+#include "autoPtr.H"
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                          Class PairModel Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class PairModel
+{
+    // Private data
+
+        //- The cloud dictionary
+        const dictionary& dict_;
+
+        //- Reference to the owner cloud class
+        CloudType& owner_;
+
+        //- The coefficients dictionary
+        const dictionary coeffDict_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("PairModel");
+
+    //- Declare runtime constructor selection table
+    declareRunTimeSelectionTable
+    (
+        autoPtr,
+        PairModel,
+        dictionary,
+        (
+            const dictionary& dict,
+            CloudType& owner
+        ),
+        (dict, owner)
+    );
+
+
+    // Constructors
+
+        //- Construct from components
+        PairModel
+        (
+            const dictionary& dict,
+            CloudType& owner,
+            const word& type
+        );
+
+
+    //- Destructor
+    virtual ~PairModel();
+
+
+    //- Selector
+    static autoPtr<PairModel<CloudType> > New
+    (
+        const dictionary& dict,
+        CloudType& owner
+    );
+
+
+    // Access
+
+        //- Return the owner cloud object
+        const CloudType& owner() const;
+
+        //- Return the dictionary
+        const dictionary& dict() const;
+
+        //- Return the coefficients dictionary
+        const dictionary& coeffDict() const;
+
+
+    // Member Functions
+
+        //- Whether the PairModel has a timestep limit that will
+        //  require subCycling
+        virtual bool controlsTimestep() const = 0;
+
+        //- For PairModels that control the timestep, calculate the
+        //  number of subCycles needed to satisfy the minimum
+        //  allowable timestep
+        virtual label nSubCycles() const = 0;
+
+        //- Calculate the pair interaction between parcels
+        virtual void evaluatePair
+        (
+            typename CloudType::parcelType& pA,
+            typename CloudType::parcelType& pB
+        ) const = 0;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makePairModel(CloudType)                                              \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug(PairModel<CloudType>, 0);             \
+                                                                              \
+    defineTemplateRunTimeSelectionTable                                       \
+    (                                                                         \
+        PairModel<CloudType>,                                                 \
+        dictionary                                                            \
+    );
+
+
+#define makePairModelType(SS, CloudType, ParcelType)                          \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+                                                                              \
+    PairModel<CloudType<ParcelType> >::                                       \
+        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
+            add##SS##CloudType##ParcelType##ConstructorToTable_;
+
+
+#define makePairModelThermoType(SS, CloudType, ParcelType, ThermoType)        \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug                                       \
+    (                                                                         \
+        SS<CloudType<ParcelType<ThermoType> > >,                              \
+        0                                                                     \
+    );                                                                        \
+                                                                              \
+    PairModel<CloudType<ParcelType<ThermoType> > >::                          \
+        adddictionaryConstructorToTable                                       \
+            <SS<CloudType<ParcelType<ThermoType> > > >                        \
+            add##SS##CloudType##ParcelType##ThermoType##ConstructorToTable_;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "PairModel.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
new file mode 100644
index 0000000000..bbefa136ca
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
@@ -0,0 +1,251 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2008-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "PairSpringSliderDashpot.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template <class CloudType>
+void Foam::PairSpringSliderDashpot<CloudType>::findMinMaxProperties
+(
+    scalar& RMin,
+    scalar& rhoMax,
+    scalar& UMagMax
+) const
+{
+    RMin = VGREAT;
+    rhoMax = -VGREAT;
+    UMagMax = -VGREAT;
+
+    forAllConstIter(typename CloudType, this->owner(), iter)
+    {
+        const typename CloudType::parcelType& p = iter();
+
+        // Finding minimum diameter to avoid excessive arithmetic
+
+        RMin = min(p.d(), RMin);
+
+        rhoMax = max(p.rho(), rhoMax);
+
+        UMagMax = max
+        (
+            mag(p.U()) + mag(p.omega())*p.d()/2,
+            UMagMax
+        );
+    }
+
+    // Transform the minimum diameter into minimum radius
+    //     rMin = dMin/2
+    // then rMin into minimum R,
+    //     1/RMin = 1/rMin + 1/rMin,
+    //     RMin = rMin/2 = dMin/4
+
+    RMin /= 4.0;
+
+    // Multiply by two to create the worst-case relative velocity
+
+    UMagMax = 2*UMagMax;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::PairSpringSliderDashpot<CloudType>::PairSpringSliderDashpot
+(
+    const dictionary& dict,
+    CloudType& cloud
+)
+:
+    PairModel<CloudType>(dict, cloud, typeName),
+    Estar_(),
+    Gstar_(),
+    alpha_(dimensionedScalar(this->coeffDict().lookup("alpha")).value()),
+    b_(dimensionedScalar(this->coeffDict().lookup("b")).value()),
+    mu_(dimensionedScalar(this->coeffDict().lookup("mu")).value()),
+    collisionResolutionSteps_
+    (
+        readScalar
+        (
+            this->coeffDict().lookup("collisionResolutionSteps")
+        )
+    )
+{
+    scalar nu = this->owner().constProps().poissonsRatio();
+
+    scalar E = this->owner().constProps().youngsModulus();
+
+    Estar_ = E/(2.0*(1.0 - sqr(nu)));
+
+    scalar G = E/(2.0*(1.0 + nu));
+
+    Gstar_ = G/(2.0*(2.0 - nu));
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::PairSpringSliderDashpot<CloudType>::~PairSpringSliderDashpot()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+bool Foam::PairSpringSliderDashpot<CloudType>::controlsTimestep() const
+{
+    return true;
+}
+
+
+template<class CloudType>
+Foam::label Foam::PairSpringSliderDashpot<CloudType>::nSubCycles() const
+{
+    if (!(this->owner().size()))
+    {
+        return 1;
+    }
+
+    scalar RMin;
+    scalar rhoMax;
+    scalar UMagMax;
+
+    findMinMaxProperties(RMin, rhoMax, UMagMax);
+
+    // Note:  pi^(7/5)*(5/4)^(2/5) = 5.429675
+    scalar minCollisionDeltaT =
+        5.429675
+       *RMin
+       *pow(rhoMax/(Estar_*sqrt(UMagMax) + VSMALL), 0.4)
+       /collisionResolutionSteps_;
+
+    return ceil(this->owner().time().deltaTValue()/minCollisionDeltaT);
+}
+
+
+template<class CloudType>
+void Foam::PairSpringSliderDashpot<CloudType>::evaluatePair
+(
+    typename CloudType::parcelType& pA,
+    typename CloudType::parcelType& pB
+) const
+{
+    vector r_AB = (pA.position() - pB.position());
+
+    scalar normalOverlapMag = 0.5*(pA.d() + pB.d()) - mag(r_AB);
+
+    if (normalOverlapMag > 0)
+    {
+        //Particles in collision
+
+        vector rHat_AB = r_AB/(mag(r_AB) + VSMALL);
+
+        vector U_AB = pA.U() - pB.U();
+
+        // Effective radius
+        scalar R = 0.5*pA.d()*pB.d()/(pA.d() + pB.d());
+
+        // Effective mass
+        scalar M = pA.mass()*pB.mass()/(pA.mass() + pB.mass());
+
+        scalar kN = (4.0/3.0)*sqrt(R)*Estar_;
+
+        scalar etaN = alpha_*sqrt(M*kN)*pow025(normalOverlapMag);
+
+        // Normal force
+        vector fN_AB =
+            rHat_AB
+           *(kN*pow(normalOverlapMag, b_) - etaN*(U_AB & rHat_AB));
+
+        pA.f() += fN_AB;
+        pB.f() += -fN_AB;
+
+        vector USlip_AB =
+            U_AB - (U_AB & rHat_AB)*rHat_AB
+          + (pA.omega() ^ (pA.d()/2*-rHat_AB))
+          - (pB.omega() ^ (pB.d()/2*rHat_AB));
+
+        scalar deltaT = this->owner().mesh().time().deltaTValue();
+
+        vector& tangentialOverlap_AB =
+            pA.collisionRecords().matchRecord
+            (
+                pB.origProc(),
+                pB.origId()
+            ).collisionData();
+
+        vector& tangentialOverlap_BA =
+            pB.collisionRecords().matchRecord
+            (
+                pA.origProc(),
+                pA.origId()
+            ).collisionData();
+
+        vector deltaTangentialOverlap_AB = USlip_AB * deltaT;
+
+        tangentialOverlap_AB += deltaTangentialOverlap_AB;
+        tangentialOverlap_BA += -deltaTangentialOverlap_AB;
+
+        scalar tangentialOverlapMag = mag(tangentialOverlap_AB);
+
+        if (tangentialOverlapMag > VSMALL)
+        {
+            scalar kT = 8.0*sqrt(R*normalOverlapMag)*Gstar_;
+
+            scalar& etaT = etaN;
+
+            // Tangential force
+            vector fT_AB;
+
+            if (kT*tangentialOverlapMag > mu_*mag(fN_AB))
+            {
+                // Tangential force greater than sliding friction,
+                // particle slips
+
+                fT_AB = -mu_*mag(fN_AB)*USlip_AB/mag(USlip_AB);
+
+                tangentialOverlap_AB = vector::zero;
+                tangentialOverlap_BA = vector::zero;
+            }
+            else
+            {
+                fT_AB =
+                -kT*tangentialOverlapMag
+               *tangentialOverlap_AB/tangentialOverlapMag
+              - etaT*USlip_AB;
+            }
+
+            pA.f() += fT_AB;
+            pB.f() += -fT_AB;
+
+            pA.torque() += (pA.d()/2*-rHat_AB) ^ fT_AB;
+            pB.torque() += (pB.d()/2*rHat_AB) ^ -fT_AB;
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H
new file mode 100644
index 0000000000..819e9a835b
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.H
@@ -0,0 +1,139 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2008-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::PairSpringSliderDashpot
+
+Description
+    Pair forces between particles colliding with a spring, slider, damper model
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef PairSpringSliderDashpot_H
+#define PairSpringSliderDashpot_H
+
+#include "PairModel.H"
+#include "CollisionRecord.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+                    Class PairSpringSliderDashpot Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class PairSpringSliderDashpot
+:
+    public PairModel<CloudType>
+{
+    // Private data
+
+        //- Effective Young's modulus value, assuming both particles have
+        //  the same E value
+        scalar Estar_;
+
+        //- Effective shear modulus value, assuming both particles have
+        //  the same Poisson's ratio and Young's modulus
+        scalar Gstar_;
+
+        //- Poisson's ratio of both particles
+        scalar sigma_;
+
+        //- alpha-coefficient, related to coefficient of restitution
+        scalar alpha_;
+
+        //- Spring power (b = 1 for linear, b = 3/2 for Hertzian)
+        scalar b_;
+
+        //- Coefficient of friction in for tangential sliding
+        scalar mu_;
+
+        //- The number of steps over which to resolve the minimum
+        //  harmonic approximation of the collision period
+        scalar collisionResolutionSteps_;
+
+
+    // Private Member Functions
+
+        //- Find the appropriate properties for determining the minimum
+        //- allowable timestep
+        void findMinMaxProperties
+        (
+            scalar& RMin,
+            scalar& rhoMax,
+            scalar& vMagMax
+        ) const;
+
+public:
+
+    //- Runtime type information
+    TypeName("PairSpringSliderDashpot");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        PairSpringSliderDashpot(const dictionary& dict, CloudType& cloud);
+
+
+    //- Destructor
+    virtual ~PairSpringSliderDashpot();
+
+
+    // Member Functions
+
+        //- Whether the PairModel has a timestep limit that will
+        //  require subCycling
+        virtual bool controlsTimestep() const;
+
+        //- For PairModels that control the timestep, calculate the
+        //  number of subCycles needed to satisfy the minimum
+        //  allowable timestep
+        virtual label nSubCycles() const;
+
+        //- Calculate the pair interaction between parcels
+        virtual void evaluatePair
+        (
+            typename CloudType::parcelType& pA,
+            typename CloudType::parcelType& pB
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "PairSpringSliderDashpot.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/NewWallModel.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/NewWallModel.C
new file mode 100644
index 0000000000..3cb4cc24d4
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/NewWallModel.C
@@ -0,0 +1,66 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2008-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "WallModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::autoPtr<Foam::WallModel<CloudType> >
+Foam::WallModel<CloudType>::New
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+{
+    word WallModelType(dict.lookup("WallModel"));
+
+    Info<< "Selecting WallModel " << WallModelType
+        << endl;
+
+    typename dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(WallModelType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "WallModel<CloudType>::New"
+            "("
+                "const dictionary&, "
+                "CloudType&"
+            ")"
+        )   << "Unknown WallModelType type "
+            << WallModelType
+            << ", constructor not in hash table" << nl << nl
+            << "    Valid WallModel types are:" << nl
+            << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError);
+    }
+
+    return autoPtr<WallModel<CloudType> >(cstrIter()(dict, owner));
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMolecule.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.C
similarity index 58%
rename from src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMolecule.C
rename to src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.C
index e1933eb1c6..d8f1ffa84e 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMolecule.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,65 +21,60 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-\*----------------------------------------------------------------------------*/
+\*---------------------------------------------------------------------------*/
 
-#include "referredMolecule.H"
+#include "WallModel.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::referredMolecule::referredMolecule()
-{}
-
-
-Foam::referredMolecule::referredMolecule
+template<class CloudType>
+Foam::WallModel<CloudType>::WallModel
 (
-    const label id,
-    const vector& position,
-    const List<vector>& sitePositions
+    const dictionary& dict,
+    CloudType& owner,
+    const word& type
 )
 :
-    id_(id),
-    position_(position),
-    sitePositions_(sitePositions)
+    dict_(dict),
+    owner_(owner),
+    coeffDict_(dict.subDict(type + "Coeffs"))
 {}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::referredMolecule::~referredMolecule()
+template<class CloudType>
+Foam::WallModel<CloudType>::~WallModel()
 {}
 
 
-// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::Istream& Foam::operator>>
-(
-    Istream& is,
-    referredMolecule& rM
-)
+template<class CloudType>
+const CloudType&
+Foam::WallModel<CloudType>::owner() const
 {
-    is >> rM.id_ >> rM.position_ >> rM.sitePositions_;
-
-    is.check("Istream& operator<<(Istream& f, const referredMolecule& sRL");
-
-    return is;
+    return owner_;
 }
 
 
-Foam::Ostream& Foam::operator<<
-(
-    Ostream& os,
-    const referredMolecule& rM
-)
+template<class CloudType>
+const Foam::dictionary& Foam::WallModel<CloudType>::dict() const
 {
-    os  << rM.id()
-        << token::SPACE << rM.position()
-        << token::SPACE << rM.sitePositions();
-
-    os.check("Ostream& operator<<(Ostream& f, const referredMolecule& rM");
-
-    return os;
+    return dict_;
 }
 
 
+template<class CloudType>
+const Foam::dictionary&
+Foam::WallModel<CloudType>::coeffDict() const
+{
+    return coeffDict_;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "NewWallModel.C"
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H
new file mode 100644
index 0000000000..7088c4df05
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallModel/WallModel.H
@@ -0,0 +1,192 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2008-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::WallModel
+
+Description
+    Templated wall interaction class
+
+SourceFiles
+    WallModel.C
+    NewWallModel.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef WallModel_H
+#define WallModel_H
+
+#include "IOdictionary.H"
+#include "autoPtr.H"
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                          Class WallModel Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class WallModel
+{
+    // Private data
+
+        //- The cloud dictionary
+        const dictionary& dict_;
+
+        //- Reference to the owner cloud class
+        CloudType& owner_;
+
+        //- The coefficients dictionary
+        const dictionary coeffDict_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("WallModel");
+
+    //- Declare runtime constructor selection table
+    declareRunTimeSelectionTable
+    (
+        autoPtr,
+        WallModel,
+        dictionary,
+        (
+            const dictionary& dict,
+            CloudType& owner
+        ),
+        (dict, owner)
+    );
+
+
+    // Constructors
+
+        //- Construct from components
+        WallModel
+        (
+            const dictionary& dict,
+            CloudType& owner,
+            const word& type
+        );
+
+
+    //- Destructor
+    virtual ~WallModel();
+
+
+    //- Selector
+    static autoPtr<WallModel<CloudType> > New
+    (
+        const dictionary& dict,
+        CloudType& owner
+    );
+
+
+    // Access
+
+        //- Return the owner cloud object
+        const CloudType& owner() const;
+
+        //- Return the dictionary
+        const dictionary& dict() const;
+
+        //- Return the coefficients dictionary
+        const dictionary& coeffDict() const;
+
+
+    // Member Functions
+
+        //- Whether the WallModel has a timestep limit that will
+        //  require subCycling
+        virtual bool controlsTimestep() const = 0;
+
+        //- For WallModels that control the timestep, calculate the
+        //  number of subCycles needed to satisfy the minimum
+        //  allowable timestep
+        virtual label nSubCycles() const = 0;
+
+        //- Calculate the wall interaction for a parcel
+        virtual void evaluateWall
+        (
+            typename CloudType::parcelType& p,
+            const List<point>& flatSites,
+            const List<point>& sharpSites
+        ) const = 0;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeWallModel(CloudType)                                              \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug(WallModel<CloudType>, 0);             \
+                                                                              \
+    defineTemplateRunTimeSelectionTable                                       \
+    (                                                                         \
+        WallModel<CloudType>,                                                 \
+        dictionary                                                            \
+    );
+
+
+#define makeWallModelType(SS, CloudType, ParcelType)                          \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+                                                                              \
+    WallModel<CloudType<ParcelType> >::                                       \
+        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
+            add##SS##CloudType##ParcelType##ConstructorToTable_;
+
+
+#define makeWallModelThermoType(SS, CloudType, ParcelType, ThermoType)        \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug                                       \
+    (                                                                         \
+        SS<CloudType<ParcelType<ThermoType> > >,                              \
+        0                                                                     \
+    );                                                                        \
+                                                                              \
+    WallModel<CloudType<ParcelType<ThermoType> > >::                          \
+        adddictionaryConstructorToTable                                       \
+            <SS<CloudType<ParcelType<ThermoType> > > >                        \
+            add##SS##CloudType##ParcelType##ThermoType##ConstructorToTable_;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "WallModel.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
new file mode 100644
index 0000000000..ba22ef3842
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
@@ -0,0 +1,193 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2008-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "WallSpringSliderDashpot.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template <class CloudType>
+void Foam::WallSpringSliderDashpot<CloudType>::findMinMaxProperties
+(
+    scalar& rMin,
+    scalar& rhoMax,
+    scalar& UMagMax
+) const
+{
+    rMin = VGREAT;
+    rhoMax = -VGREAT;
+    UMagMax = -VGREAT;
+
+    forAllConstIter(typename CloudType, this->owner(), iter)
+    {
+        const typename CloudType::parcelType& p = iter();
+
+        // Finding minimum diameter to avoid excessive arithmetic
+        rMin = min(p.d(), rMin);
+
+        rhoMax = max(p.rho(), rhoMax);
+
+        UMagMax = max
+        (
+            mag(p.U()) + mag(p.omega())*p.d()/2,
+            UMagMax
+        );
+    }
+
+    // Transform the minimum diameter into minimum radius
+    //     rMin = dMin/2
+
+    rMin /= 2.0;
+}
+
+template <class CloudType>
+void Foam::WallSpringSliderDashpot<CloudType>::evaluateWall
+(
+    typename CloudType::parcelType& p,
+    const point& site,
+    scalar pNu,
+    scalar pE,
+    scalar Estar,
+    scalar kN
+) const
+{
+    vector r_PW = p.position() - site;
+
+    scalar normalOverlapMag = p.d()/2 - mag(r_PW);
+
+    vector rHat_PW = r_PW/(mag(r_PW) + VSMALL);
+
+    scalar etaN = alpha_*sqrt(p.mass()*kN)*pow025(normalOverlapMag);
+
+    vector fN_PW =
+    rHat_PW
+    *(kN*pow(normalOverlapMag, b_) - etaN*(p.U() & rHat_PW));
+
+    p.f() += fN_PW;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::WallSpringSliderDashpot<CloudType>::WallSpringSliderDashpot
+(
+    const dictionary& dict,
+    CloudType& cloud
+)
+:
+    WallModel<CloudType>(dict, cloud, typeName),
+    E_(dimensionedScalar(this->coeffDict().lookup("youngsModulus")).value()),
+    nu_(dimensionedScalar(this->coeffDict().lookup("poissonsRatio")).value()),
+    alpha_(dimensionedScalar(this->coeffDict().lookup("alpha")).value()),
+    b_(dimensionedScalar(this->coeffDict().lookup("b")).value()),
+    mu_(dimensionedScalar(this->coeffDict().lookup("mu")).value()),
+    collisionResolutionSteps_
+    (
+        readScalar
+        (
+            this->coeffDict().lookup("collisionResolutionSteps")
+        )
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::WallSpringSliderDashpot<CloudType>::~WallSpringSliderDashpot()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+bool Foam::WallSpringSliderDashpot<CloudType>::controlsTimestep() const
+{
+    return true;
+}
+
+
+template<class CloudType>
+Foam::label Foam::WallSpringSliderDashpot<CloudType>::nSubCycles() const
+{
+    if (!(this->owner().size()))
+    {
+        return 1;
+    }
+
+    scalar rMin;
+    scalar rhoMax;
+    scalar UMagMax;
+
+    findMinMaxProperties(rMin, rhoMax, UMagMax);
+
+    scalar pNu = this->owner().constProps().poissonsRatio();
+
+    scalar pE = this->owner().constProps().youngsModulus();
+
+    scalar Estar = 1/((1 - sqr(pNu))/pE + (1 - sqr(nu_))/E_);
+
+    // Note:  pi^(7/5)*(5/4)^(2/5) = 5.429675
+    scalar minCollisionDeltaT =
+        5.429675
+       *rMin
+       *pow(rhoMax/(Estar*sqrt(UMagMax) + VSMALL), 0.4)
+       /collisionResolutionSteps_;
+
+    return ceil(this->owner().time().deltaTValue()/minCollisionDeltaT);
+}
+
+
+template<class CloudType>
+void Foam::WallSpringSliderDashpot<CloudType>::evaluateWall
+(
+    typename CloudType::parcelType& p,
+    const List<point>& flatSites,
+    const List<point>& sharpSites
+) const
+{
+    scalar pNu = this->owner().constProps().poissonsRatio();
+
+    scalar pE = this->owner().constProps().youngsModulus();
+
+    scalar Estar = 1/((1 - sqr(pNu))/pE + (1 - sqr(nu_))/E_);
+
+    scalar kN = (4.0/3.0)*sqrt(p.d()/2)*Estar;
+
+    forAll(flatSites, siteI)
+    {
+        evaluateWall(p, flatSites[siteI], pNu, pE, Estar, kN);
+    }
+
+    forAll(sharpSites, siteI)
+    {
+        // Treating sharp sites like flat sites
+
+        evaluateWall(p, sharpSites[siteI], pNu, pE, Estar, kN);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H
new file mode 100644
index 0000000000..fcc83e22e6
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.H
@@ -0,0 +1,147 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2008-2010 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::WallSpringSliderDashpot
+
+Description
+    Forces between particles and walls, interacting with a spring,
+    slider, damper model
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef WallSpringSliderDashpot_H
+#define WallSpringSliderDashpot_H
+
+#include "WallModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+                    Class WallSpringSliderDashpot Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class WallSpringSliderDashpot
+:
+    public WallModel<CloudType>
+{
+    // Private data
+
+        //- Young's modulus of the wall
+        scalar E_;
+
+        //- Poisson's ratio of the wall
+        scalar nu_;
+
+        //- alpha-coefficient, related to coefficient of restitution
+        scalar alpha_;
+
+        //- Spring power (b = 1 for linear, b = 3/2 for Hertzian)
+        scalar b_;
+
+        //- Coefficient of friction in for tangential sliding
+        scalar mu_;
+
+        //- The number of steps over which to resolve the minimum
+        //  harmonic approximation of the collision period
+        scalar collisionResolutionSteps_;
+
+
+    // Private Member Functions
+
+        //- Find the appropriate properties for determining the minimum
+        //- allowable timestep
+        void findMinMaxProperties
+        (
+            scalar& rMin,
+            scalar& rhoMax,
+            scalar& vMagMax
+        ) const;
+
+        //- Calculate the wall interaction for a parcel at a given site
+        void evaluateWall
+        (
+            typename CloudType::parcelType& p,
+            const point& site,
+            scalar pNu,
+            scalar pE,
+            scalar Estar,
+            scalar kN
+        ) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("WallSpringSliderDashpot");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        WallSpringSliderDashpot(const dictionary& dict, CloudType& cloud);
+
+
+    //- Destructor
+    virtual ~WallSpringSliderDashpot();
+
+
+    // Member Functions
+
+        //- Whether the WallModel has a timestep limit that will
+        //  require subCycling
+        virtual bool controlsTimestep() const;
+
+        //- For WallModels that control the timestep, calculate the
+        //  number of subCycles needed to satisfy the minimum
+        //  allowable timestep
+        virtual label nSubCycles() const;
+
+        //- Calculate the wall interaction for a parcel
+        virtual void evaluateWall
+        (
+            typename CloudType::parcelType& p,
+            const List<point>& flatSites,
+            const List<point>& sharpSites
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "WallSpringSliderDashpot.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.C
index 8e6853593a..650fd4881b 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
index 7b8d29ca07..68ebe671c1 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C
index 8c907403d1..975f81caef 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
index 82c2d8ee46..6cc31f406e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
index c94f4b3cee..ebeacc186e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
index 9262c9b73f..d214303427 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H
index e5e7830817..eb4c97e061 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C
index c3341a5a52..f44c197bb9 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H
index aa7b1b9958..a8bba39ef4 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
index 78bf0aaac4..20368957d7 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H
index a12b18e55a..b9663a9059 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C
index 9138509a35..28e0cef24c 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H
index a01ed90bbd..67d0e36f94 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModelNew.C
index 7dab108c5b..04f6c2622a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.C
index dd931aa9d9..d76a5bb8c3 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.H b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.H
index 634db80864..6e354c236e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.C
index 90d9a8100a..fafc2e3cb7 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.H b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.H
index cd019029ef..ca56f3782e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
index 2230e01e65..cb665641cc 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
index 006159ec20..6246f4cdc9 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C
index 802d624047..1d3f49aaa5 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H
index 451ed6d1cb..5401deebee 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 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 3adaae633c..533febfadc 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) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 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 66949537ca..f2aebb0fd8 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) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 52a64faa82..84d959976d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index 0f7efefbf1..d7309f5a0a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelI.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelI.H
index a3e6231c56..65f9b3cac0 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelI.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C
index 5eb805d6bc..22aee47ba0 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
index 17a1f7183d..413af8a073 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
index e0f980b989..d888c47582 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
index 52a8751500..9b9ec19084 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
index e6975d558f..7d8305088f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
index d1dae4b151..1545215930 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
index 74cd9511c1..6dea7c9dd1 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
index 661c7e566f..6c49b07fc8 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
index fc6c8d86cb..f8d5840ffe 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
index 072426c5a0..b9fd7b819e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H
index eb96c47ddc..4fa8900423 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionData.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionData.C
index 39ddfa4519..1ec86c548c 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionData.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionData.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionData.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionData.H
index b7db1aeafe..661171e68a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionData.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionData.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
index e86ddefb42..6947fc93bf 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
index dbbec7ba5e..95a4b04f99 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C
index a3989151d1..e8b8f4fd99 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.C
index 5161f5ae03..7120783307 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H
index 41ac5c3575..e9cc326c30 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
index cd57acd282..7d89c40df6 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H
index 6912c3c2fd..476bd7d63a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.C b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.C
index 9d609ff5c1..98211b4c25 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.H b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.H
index 55c22ccff3..fad85a4487 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.C b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.C
index 51f0e6e31d..8f23f91c6f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H
index 2145cc8def..9cc1b3ef40 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessingI.H b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessingI.H
index 31e1a07d4c..4365b87c33 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessingI.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessingI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.C
index 6bfb6e016c..701af4757b 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.H b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.H
index d8454e9eb7..8942dec879 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelI.H b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelI.H
index b6d2d460e8..1004d532b8 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelI.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelNew.C b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelNew.C
index 7fff48227e..111d6bcbee 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
index bc97c3e685..e1a3a54f4e 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
index f48ddd9a67..3c05f8e261 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C
index b77c92cff0..e97728a6c8 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C
index b635a49e77..16f577f7a7 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H
index 80982b1856..4cad8f2a18 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.C
index bcbc069f38..4c0f3f332e 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H
index e489f14225..9323b5b0af 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
index 3ae9579d05..00b6667f9d 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
index 0b98ead126..52cf535665 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
index 403c7fe9b4..45a8b67d55 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
index f284cc21a9..a7d7cdd3d1 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
index 8550bf3919..260de0b836 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
index 3108a8fc37..3876791b5b 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
index cd595e0a47..149bd70e52 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
index f05a0eb661..99e39651f7 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C
index 297a43dd57..9931cc93ab 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
index 431dfd4f38..4d5d644c80 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
index eea38ba3e0..48dfb19f4c 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C
index 6e3ab3fa1d..81b87a7c74 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
index d5be203a04..e5572dd884 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C
index 5eeec98177..2ae1ee3b2a 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
index 6dcca937f6..0bfe2cb022 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
index 6cc7313812..d09c8d9b74 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
index 51ed127ae3..04a6c63b01 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
index 2362e4f6cc..5536d896a1 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
index 4aced34fa9..4d68b40b09 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
index 81cd6b4b73..2307ca2005 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C
index aaaf060bd0..18ecbaf48e 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
index 2cdd3d5a44..e0d0d060d0 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C
index 9aa949f4c4..a6d711b6a1 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
index 447bab9473..a2a0d3c1eb 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C
index e1b9990b2f..151b562b58 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
index 1170ec97ac..f609752bf4 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
index 9019f02140..a71af0d37e 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C
index f86d523b2c..c98b95f9ba 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.C
index 8cca2889dd..baa929804b 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H
index 9c0159fbaf..62a07aa496 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.C
index 93aa10e30c..6860b04ca5 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.H b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.H
index 840380c991..6d2f9e6a6e 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
index 2387e6794f..88c13c4f8f 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
index 35087fd7c9..fa009ff00e 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
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 a6fdfaf267..e281f448e1 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
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 a3ed290d02..80054b3711 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C
index 0672bbdbcd..7e1ef00671 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
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 d4f87ee83b..df6ce1ef79 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C
index 01c8470ddd..1d9c964d4f 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H
index 2725d87b93..0311ad3096 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorI.H b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorI.H
index 49672d3043..42d0cec63d 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorI.H
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorIO.C b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorIO.C
index c511eadab5..1e891fcb36 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorIO.C
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C
index a32dd94cff..1eedef0e4c 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H
index 9bf6d1442c..f0c26f9b1b 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunctionI.H b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunctionI.H
index 5a7db7f380..752facb6f9 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunctionI.H
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunctionI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunctionIO.C b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunctionIO.C
index a36a5d2422..48b2d74228 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunctionIO.C
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunctionIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
index 42a34782c6..1110415d10 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.H b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.H
index e06962a661..02f347d170 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.H
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distributionI.H b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distributionI.H
index 4514801ceb..344567114b 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distributionI.H
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distributionI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/molecule/Make/files b/src/lagrangian/molecularDynamics/molecule/Make/files
index b7a6935bcd..9086ba7ffa 100644
--- a/src/lagrangian/molecularDynamics/molecule/Make/files
+++ b/src/lagrangian/molecularDynamics/molecule/Make/files
@@ -1,27 +1,9 @@
-interactionLists = interactionLists
-referredMolecule = $(interactionLists)/referredMolecule
-referredCellList = $(interactionLists)/referredCellList
-referredCell = $(interactionLists)/referredCell
-referralLists = $(interactionLists)/referralLists
-directInteractionList = $(interactionLists)/directInteractionList
+reducedUnits/reducedUnits.C
+reducedUnits/reducedUnitsIO.C
 
-$(referralLists)/sendingReferralList.C
-$(referralLists)/receivingReferralList.C
-$(referredCellList)/referredCellList.C
-$(referredCell)/referredCell.C
-$(referredMolecule)/referredMolecule.C
-$(directInteractionList)/directInteractionList.C
-$(interactionLists)/interactionLists.C
+molecule/molecule.C
+molecule/moleculeIO.C
 
-reducedUnits = reducedUnits
-$(reducedUnits)/reducedUnits.C
-$(reducedUnits)/reducedUnitsIO.C
-
-molecule = molecule
-$(molecule)/molecule.C
-$(molecule)/moleculeIO.C
-
-moleculeCloud = moleculeCloud
-$(moleculeCloud)/moleculeCloud.C
+moleculeCloud/moleculeCloud.C
 
 LIB = $(FOAM_LIBBIN)/libmolecule
diff --git a/src/lagrangian/molecularDynamics/molecule/Make/options b/src/lagrangian/molecularDynamics/molecule/Make/options
index 9354036e6f..1bdb57a0d0 100644
--- a/src/lagrangian/molecularDynamics/molecule/Make/options
+++ b/src/lagrangian/molecularDynamics/molecule/Make/options
@@ -1,11 +1,13 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/molecularDynamics/potential/lnInclude \
     -I$(LIB_SRC)/lagrangian/molecularDynamics/molecularMeasurements/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
+    -lmeshTools \
     -llagrangian \
     -lpotential \
     -lmolecularMeasurements
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.C
deleted file mode 100644
index 56d1e2046d..0000000000
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.C
+++ /dev/null
@@ -1,346 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-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 3 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, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "directInteractionList.H"
-#include "interactionLists.H"
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void Foam::directInteractionList::buildDirectInteractionList
-(
-    bool pointPointListBuild
-)
-{
-    Info<< nl << "Building list of direct interaction neighbours" << endl;
-
-    const polyMesh& mesh(il_.mesh());
-
-    List<DynamicList<label> > directInteractionList(mesh.nCells());
-
-    if (pointPointListBuild)
-    {
-        Info<< tab << "Point-Point direct interaction list build." << endl;
-
-        label pointJIndex;
-
-        forAll(mesh.points(), pointIIndex)
-        {
-            for
-            (
-                pointJIndex = pointIIndex;
-                pointJIndex != mesh.points().size();
-                ++pointJIndex
-            )
-            {
-                if (il_.testPointPointDistance(pointIIndex, pointJIndex))
-                {
-                    const labelList& ptICells
-                    (
-                        mesh.pointCells()[pointIIndex]
-                    );
-
-                    const labelList& ptJCells
-                    (
-                        mesh.pointCells()[pointJIndex]
-                    );
-
-                    forAll(ptICells, pIC)
-                    {
-                        const label cellI(ptICells[pIC]);
-
-                        forAll(ptJCells, pJC)
-                        {
-                            const label cellJ(ptJCells[pJC]);
-
-                            if (cellJ > cellI)
-                            {
-                                if
-                                (
-                                    findIndex
-                                    (
-                                        directInteractionList[cellI],
-                                        cellJ
-                                    )
-                                 == -1
-                                )
-                                {
-                                    directInteractionList[cellI].append(cellJ);
-                                }
-                            }
-
-                            if (cellI > cellJ)
-                            {
-                                if
-                                (
-                                    findIndex
-                                    (
-                                        directInteractionList[cellJ],
-                                        cellI
-                                    )
-                                 ==
-                                    -1
-                                )
-                                {
-                                    directInteractionList[cellJ].append(cellI);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-    else
-    {
-        Info<< tab << "Point-Face, Edge-Edge direct interaction list build."
-            << endl;
-
-        forAll(mesh.points(), p)
-        {
-            forAll(mesh.faces(), f)
-            {
-                if (il_.testPointFaceDistance(p, f))
-                {
-                    const labelList& pCells(mesh.pointCells()[p]);
-
-                    const label cellO(mesh.faceOwner()[f]);
-
-                    forAll(pCells, pC)
-                    {
-                        const label cellI(pCells[pC]);
-
-                        // cells are not added to their own DIL
-
-                        if (cellO > cellI)
-                        {
-                            if
-                            (
-                                findIndex
-                                (
-                                    directInteractionList[cellI],
-                                    cellO
-                                )
-                             ==
-                                -1
-                            )
-                            {
-                                directInteractionList[cellI].append(cellO);
-                            }
-                        }
-
-                        if (cellI > cellO)
-                        {
-                            if
-                            (
-                                findIndex
-                                (
-                                    directInteractionList[cellO],
-                                    cellI
-                                )
-                             ==
-                                -1
-                            )
-                            {
-                                directInteractionList[cellO].append(cellI);
-                            }
-                        }
-
-                        if (mesh.isInternalFace(f))
-                        {
-                            // boundary faces will not have neighbour
-                            // information
-
-                            const label cellN(mesh.faceNeighbour()[f]);
-
-                            if (cellN > cellI)
-                            {
-                                if
-                                (
-                                    findIndex
-                                    (
-                                        directInteractionList[cellI],
-                                        cellN
-                                    )
-                                 ==
-                                    -1
-                                )
-                                {
-                                    directInteractionList[cellI].append(cellN);
-                                }
-                            }
-
-                            if (cellI > cellN)
-                            {
-                                if
-                                (
-                                    findIndex
-                                    (
-                                        directInteractionList[cellN],
-                                        cellI
-                                    )
-                                 ==
-                                    -1
-                                )
-                                {
-                                    directInteractionList[cellN].append(cellI);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        label edgeJIndex;
-
-        forAll(mesh.edges(), edgeIIndex)
-        {
-            const edge& eI(mesh.edges()[edgeIIndex]);
-
-            for
-            (
-                edgeJIndex = edgeIIndex + 1;
-                edgeJIndex != mesh.edges().size();
-                ++edgeJIndex
-            )
-            {
-                const edge& eJ(mesh.edges()[edgeJIndex]);
-
-                if (il_.testEdgeEdgeDistance(eI, eJ))
-                {
-                    const labelList& eICells(mesh.edgeCells()[edgeIIndex]);
-
-                    const labelList& eJCells(mesh.edgeCells()[edgeJIndex]);
-
-                    forAll(eICells, eIC)
-                    {
-                        const label cellI(eICells[eIC]);
-
-                        forAll(eJCells, eJC)
-                        {
-                            const label cellJ(eJCells[eJC]);
-
-                            if (cellJ > cellI)
-                            {
-                                if
-                                (
-                                    findIndex
-                                    (
-                                        directInteractionList[cellI],
-                                        cellJ
-                                    )
-                                 ==
-                                    -1
-                                )
-                                {
-                                    directInteractionList[cellI].append(cellJ);
-                                }
-                            }
-
-                            if (cellI > cellJ)
-                            {
-                                if
-                                (
-                                    findIndex
-                                    (
-                                        directInteractionList[cellJ],
-                                        cellI
-                                    )
-                                 ==
-                                    -1
-                                )
-                                {
-                                    directInteractionList[cellJ].append(cellI);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    forAll(directInteractionList, transDIL)
-    {
-        (*this)[transDIL].transfer
-        (
-            directInteractionList[transDIL].shrink()
-        );
-    }
-
-    // sorting DILs
-
-    forAll((*this), dIL)
-    {
-        sort((*this)[dIL]);
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::directInteractionList::directInteractionList
-(
-    const interactionLists& il,
-    bool pointPointListBuild
-)
-:
-    labelListList(il.mesh().nCells()),
-    il_(il)
-{
-    if ((*this).size() > 1)
-    {
-        buildDirectInteractionList(pointPointListBuild);
-    }
-    else if ((*this).size() == 1)
-    {
-        Info<< nl
-            << "Single cell mesh, no direct interaction lists required."
-            << endl;
-
-        (*this)[0].setSize(0);
-    }
-}
-
-
-Foam::directInteractionList::directInteractionList
-(
-    const interactionLists& il
-)
-:
-    labelListList(il.mesh().nCells()),
-    il_(il)
-{
-    Info<< "Read directInteractionList from disk not implemented" << endl;
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::directInteractionList::~directInteractionList()
-{}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.H
deleted file mode 100644
index 4583b84429..0000000000
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.H
+++ /dev/null
@@ -1,124 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-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 3 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, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::directInteractionList
-
-Description
-
-SourceFiles
-    directInteractionListI.H
-    directInteractionList.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef directInteractionList_H
-#define directInteractionList_H
-
-#include "polyMesh.H"
-#include "List.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// Forward declaration of classes
-class interactionLists;
-
-/*---------------------------------------------------------------------------*\
-                           Class directInteractionList Declaration
-\*---------------------------------------------------------------------------*/
-
-class directInteractionList
-:
-    public labelListList
-{
-    // Private data
-
-        const interactionLists& il_;
-
-
-    // Private Member Functions
-
-        void buildDirectInteractionList
-        (
-            bool pointPointListBuild
-        );
-
-        //- Disallow default bitwise copy construct
-        directInteractionList(const directInteractionList&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const directInteractionList&);
-
-
-public:
-
-    // Constructors
-
-        //- Construct lists by searching the mesh
-        directInteractionList
-        (
-            const interactionLists& il,
-            bool pointPointListBuild
-        );
-
-        //- Construct from file
-        directInteractionList
-        (
-            const interactionLists& il
-        );
-
-
-    //- Destructor
-    ~directInteractionList();
-
-
-    // Member Functions
-
-        // Access
-
-        inline const interactionLists& il() const;
-
-
-    // IOstream Operators
-
-        friend Istream& operator>>(Istream&, directInteractionList&);
-        friend Ostream& operator<<(Ostream&, const directInteractionList&);
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "directInteractionListI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.C
deleted file mode 100644
index a0ff1b2645..0000000000
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.C
+++ /dev/null
@@ -1,691 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-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 3 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, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "interactionLists.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-Foam::scalar Foam::interactionLists::transTol = 1e-12;
-
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void Foam::interactionLists::buildCellReferralLists()
-{
-    Info<< nl << "Determining molecule referring schedule" << endl;
-
-    const referredCellList& refIntL(ril());
-
-    DynamicList<label> referralProcs;
-
-    // Run through all referredCells to build list of interacting processors
-
-    forAll(refIntL, rIL)
-    {
-        const referredCell& rC(refIntL[rIL]);
-
-        if (findIndex(referralProcs, rC.sourceProc()) == -1)
-        {
-            referralProcs.append(rC.sourceProc());
-        }
-    }
-
-    referralProcs.shrink();
-
-//     Pout << "referralProcs: " << nl << referralProcs << endl;
-
-    List<DynamicList<label> > cellSendingReferralLists(referralProcs.size());
-
-    List<DynamicList<DynamicList<label> > >
-        cellReceivingReferralLists(referralProcs.size());
-
-    // Run through all referredCells again building up send and receive info
-
-    forAll(refIntL, rIL)
-    {
-        const referredCell& rC(refIntL[rIL]);
-
-        label rPI = findIndex(referralProcs, rC.sourceProc());
-
-        DynamicList<DynamicList<label> >& rRL(cellReceivingReferralLists[rPI]);
-
-        DynamicList<label>& sRL(cellSendingReferralLists[rPI]);
-
-        label existingSource = findIndex(sRL, rC.sourceCell());
-
-        // Check to see if this source cell has already been allocated to
-        // come to this processor.  If not, add the source cell to the sending
-        // list and add the current referred cell to the receiving list.
-
-        // It shouldn't be possible for the sending and receiving lists to be
-        // different lengths, because their append operations happen at the
-        // same time.
-
-        if (existingSource == -1)
-        {
-            sRL.append(rC.sourceCell());
-
-            rRL.append
-            (
-                DynamicList<label> (labelList(1,rIL))
-            );
-        }
-        else
-        {
-            rRL[existingSource].append(rIL);
-
-            rRL[existingSource].shrink();
-        }
-    }
-
-    forAll(referralProcs, rPI)
-    {
-        DynamicList<DynamicList<label> >& rRL(cellReceivingReferralLists[rPI]);
-
-        DynamicList<label>& sRL(cellSendingReferralLists[rPI]);
-
-        sRL.shrink();
-
-        rRL.shrink();
-    }
-
-    // It is assumed that cell exchange is reciprocal, if proc A has cells to
-    // send to proc B, then proc B must have some to send to proc A.
-
-    cellReceivingReferralLists_.setSize(referralProcs.size());
-
-    cellSendingReferralLists_.setSize(referralProcs.size());
-
-    forAll(referralProcs, rPI)
-    {
-        DynamicList<DynamicList<label> >& rRL(cellReceivingReferralLists[rPI]);
-
-        labelListList translLL(rRL.size());
-
-        forAll(rRL, rRLI)
-        {
-            translLL[rRLI] = rRL[rRLI];
-        }
-
-        cellReceivingReferralLists_[rPI] = receivingReferralList
-        (
-            referralProcs[rPI],
-            translLL
-        );
-    }
-
-    // Send sendingReferralLists to each interacting processor.
-
-    forAll(referralProcs, rPI)
-    {
-
-        DynamicList<label>& sRL(cellSendingReferralLists[rPI]);
-
-        if (referralProcs[rPI] != Pstream::myProcNo())
-        {
-            if (Pstream::parRun())
-            {
-                OPstream toInteractingProc
-                (
-                    Pstream::blocking,
-                    referralProcs[rPI]
-                );
-
-                toInteractingProc << sendingReferralList
-                (
-                    Pstream::myProcNo(),
-                    sRL
-                );
-            }
-        }
-    }
-
-    // Receive sendingReferralLists from each interacting processor.
-
-    forAll(referralProcs, rPI)
-    {
-        if (referralProcs[rPI] != Pstream::myProcNo())
-        {
-            if (Pstream::parRun())
-            {
-                IPstream fromInteractingProc
-                (
-                    Pstream::blocking,
-                    referralProcs[rPI]
-                );
-
-                fromInteractingProc >> cellSendingReferralLists_[rPI];
-            }
-        }
-        else
-        {
-            cellSendingReferralLists_[rPI] = sendingReferralList
-            (
-                Pstream::myProcNo(),
-                cellSendingReferralLists[rPI]
-            );
-        }
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-
-Foam::interactionLists::interactionLists
-(
-    const polyMesh& mesh,
-    scalar rCutMaxSqr,
-    bool pointPointListBuild
-)
-:
-    mesh_(mesh),
-    rCutMaxSqr_(rCutMaxSqr),
-    dil_(*this, pointPointListBuild),
-    ril_(*this, pointPointListBuild),
-    cellSendingReferralLists_(),
-    cellReceivingReferralLists_()
-{
-    buildCellReferralLists();
-}
-
-
-Foam::interactionLists::interactionLists(const polyMesh& mesh)
-:
-    mesh_(mesh),
-    dil_(*this),
-    ril_(*this)
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::interactionLists::~interactionLists()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-bool Foam::interactionLists::testPointPointDistance
-(
-    const label ptI,
-    const label ptJ
-) const
-{
-    return (magSqr(mesh_.points()[ptI] - mesh_.points()[ptJ]) <= rCutMaxSqr_);
-}
-
-
-bool Foam::interactionLists::testEdgeEdgeDistance
-(
-    const edge& eI,
-    const edge& eJ
-) const
-{
-    const vector& eJs(mesh_.points()[eJ.start()]);
-    const vector& eJe(mesh_.points()[eJ.end()]);
-
-    return testEdgeEdgeDistance(eI, eJs, eJe);
-}
-
-
-bool Foam::interactionLists::testPointFaceDistance
-(
-    const label p,
-    const label faceNo
-) const
-{
-    const vector& pointPosition(mesh_.points()[p]);
-
-    return testPointFaceDistance(pointPosition, faceNo);
-}
-
-
-bool Foam::interactionLists::testPointFaceDistance
-(
-    const label p,
-    const referredCell& refCell
-) const
-{
-    const vector& pointPosition(mesh_.points()[p]);
-
-    forAll(refCell.faces(), rCF)
-    {
-        if
-        (
-            testPointFaceDistance
-            (
-                pointPosition,
-                refCell.faces()[rCF],
-                refCell.vertexPositions(),
-                refCell.faceCentres()[rCF],
-                refCell.faceAreas()[rCF]
-            )
-        )
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-
-bool Foam::interactionLists::testPointFaceDistance
-(
-    const vectorList& pointsToTest,
-    const label faceNo
-) const
-{
-    forAll(pointsToTest, pTT)
-    {
-        const vector& p(pointsToTest[pTT]);
-
-        // if any point in the list is in range of the face
-        // then the rest do not need to be tested and
-        // true can be returned
-
-        if (testPointFaceDistance(p, faceNo))
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-
-bool Foam::interactionLists::testPointFaceDistance
-(
-    const vector& p,
-    const label faceNo
-) const
-{
-    const face& faceToTest(mesh_.faces()[faceNo]);
-
-    const vector& faceC(mesh_.faceCentres()[faceNo]);
-
-    const vector& faceA(mesh_.faceAreas()[faceNo]);
-
-    const vectorList& points(mesh_.points());
-
-    return testPointFaceDistance
-    (
-        p,
-        faceToTest,
-        points,
-        faceC,
-        faceA
-    );
-}
-
-
-bool Foam::interactionLists::testPointFaceDistance
-(
-    const vector& p,
-    const labelList& faceToTest,
-    const vectorList& points,
-    const vector& faceC,
-    const vector& faceA
-) const
-{
-    vector faceN(faceA/mag(faceA));
-
-    scalar perpDist((p - faceC) & faceN);
-
-    if (magSqr(perpDist) > rCutMaxSqr_)
-    {
-        return false;
-    }
-
-    vector pointOnPlane = (p - faceN * perpDist);
-
-    if (magSqr(faceC - pointOnPlane) < rCutMaxSqr_*1e-8)
-    {
-        // If pointOnPlane is very close to the face centre
-        // then defining the local axes will be inaccurate
-        // and it is very likely that pointOnPlane will be
-        // inside the face, so return true if the points
-        // are in range to be safe
-
-        return (magSqr(pointOnPlane - p) <= rCutMaxSqr_);
-    }
-
-    vector xAxis = (faceC - pointOnPlane)/mag(faceC - pointOnPlane);
-
-    vector yAxis =
-        ((faceC - pointOnPlane) ^ faceN)
-       /mag((faceC - pointOnPlane) ^ faceN);
-
-    List<vector2D> local2DVertices(faceToTest.size());
-
-    forAll(faceToTest, fTT)
-    {
-        const vector& V(points[faceToTest[fTT]]);
-
-        if (magSqr(V-p) <= rCutMaxSqr_)
-        {
-            return true;
-        }
-
-        local2DVertices[fTT] = vector2D
-        (
-            ((V - pointOnPlane) & xAxis),
-            ((V - pointOnPlane) & yAxis)
-        );
-    }
-
-    scalar localFaceCx((faceC - pointOnPlane) & xAxis);
-
-    scalar la_valid = -1;
-
-    forAll(local2DVertices, fV)
-    {
-        const vector2D& va(local2DVertices[fV]);
-
-        const vector2D& vb
-        (
-            local2DVertices[(fV + 1) % local2DVertices.size()]
-        );
-
-        if (mag(vb.y()-va.y()) > SMALL)
-        {
-            scalar la =
-                (
-                    va.x() - va.y()*((vb.x() - va.x())/(vb.y() - va.y()))
-                )
-               /localFaceCx;
-
-            scalar lv = -va.y()/(vb.y() - va.y());
-
-
-            if (la >= 0 && la <= 1 && lv >= 0 && lv <= 1)
-            {
-                la_valid = la;
-
-                break;
-            }
-        }
-    }
-
-    if (la_valid < 0)
-    {
-        // perpendicular point inside face, nearest point is pointOnPlane;
-        return (magSqr(pointOnPlane-p) <= rCutMaxSqr_);
-    }
-    else
-    {
-        // perpendicular point outside face, nearest point is
-        // on edge that generated la_valid;
-        return
-        (
-            magSqr(pointOnPlane + la_valid*(faceC - pointOnPlane) - p)
-         <= rCutMaxSqr_
-        );
-    }
-
-    // if the algorithm hasn't returned anything by now then something has
-    // gone wrong.
-
-    FatalErrorIn
-    (
-        "interactionLists::testPointFaceDistance"
-        "("
-            "const vector&, "
-            "const labelList&, "
-            "const vectorList&, "
-            "const vector&, "
-            "const vector&"
-        ") const"
-    )   << "point " << p << " to face " << faceToTest
-        << " comparison did not find a nearest point"
-        << " to be inside or outside face."
-        << abort(FatalError);
-
-    return false;
-}
-
-
-bool Foam::interactionLists::testEdgeEdgeDistance
-(
-    const edge& eI,
-    const vector& eJs,
-    const vector& eJe
-) const
-{
-    vector a(eI.vec(mesh_.points()));
-    vector b(eJe - eJs);
-
-    const vector& eIs(mesh_.points()[eI.start()]);
-
-    vector c(eJs - eIs);
-
-    vector crossab = a ^ b;
-    scalar magCrossSqr = magSqr(crossab);
-
-    if (magCrossSqr > VSMALL)
-    {
-        // If the edges are parallel then a point-face
-        // search will pick them up
-
-        scalar s = ((c ^ b) & crossab)/magCrossSqr;
-        scalar t = ((c ^ a) & crossab)/magCrossSqr;
-
-        // Check for end points outside of range 0..1
-        // If the closest point is outside this range
-        // a point-face search will have found it.
-
-        return
-        (
-            s >= 0
-         && s <= 1
-         && t >= 0
-         && t <= 1
-         && magSqr(eIs + a*s - eJs - b*t) <= rCutMaxSqr_
-        );
-    }
-
-    return false;
-}
-
-
-const Foam::labelList Foam::interactionLists::realCellsInRangeOfSegment
-(
-    const labelList& segmentFaces,
-    const labelList& segmentEdges,
-    const labelList& segmentPoints
-) const
-{
-    DynamicList<label> realCellsFoundInRange;
-
-    forAll(segmentFaces, sF)
-    {
-        const label f = segmentFaces[sF];
-
-        forAll(mesh_.points(), p)
-        {
-            if (testPointFaceDistance(p, f))
-            {
-                const labelList& pCells(mesh_.pointCells()[p]);
-
-                forAll(pCells, pC)
-                {
-                    const label cellI(pCells[pC]);
-
-                    if (findIndex(realCellsFoundInRange, cellI) == -1)
-                    {
-                        realCellsFoundInRange.append(cellI);
-                    }
-                }
-            }
-        }
-    }
-
-    forAll(segmentPoints, sP)
-    {
-        const label p = segmentPoints[sP];
-
-        forAll(mesh_.faces(), f)
-        {
-            if (testPointFaceDistance(p, f))
-            {
-                const label cellO(mesh_.faceOwner()[f]);
-
-                if (findIndex(realCellsFoundInRange, cellO) == -1)
-                {
-                    realCellsFoundInRange.append(cellO);
-                }
-
-                if (mesh_.isInternalFace(f))
-                {
-                    // boundary faces will not have neighbour information
-
-                    const label cellN(mesh_.faceNeighbour()[f]);
-
-                    if (findIndex(realCellsFoundInRange, cellN) == -1)
-                    {
-                        realCellsFoundInRange.append(cellN);
-                    }
-                }
-            }
-        }
-    }
-
-    forAll(segmentEdges, sE)
-    {
-        const edge& eJ(mesh_.edges()[segmentEdges[sE]]);
-
-        forAll(mesh_.edges(), edgeIIndex)
-        {
-            const edge& eI(mesh_.edges()[edgeIIndex]);
-
-            if (testEdgeEdgeDistance(eI, eJ))
-            {
-                const labelList& eICells(mesh_.edgeCells()[edgeIIndex]);
-
-                forAll(eICells, eIC)
-                {
-                    const label cellI(eICells[eIC]);
-
-                    if (findIndex(realCellsFoundInRange, cellI) == -1)
-                    {
-                        realCellsFoundInRange.append(cellI);
-                    }
-                }
-            }
-        }
-    }
-
-    return realCellsFoundInRange.shrink();
-}
-
-
-const Foam::labelList Foam::interactionLists::referredCellsInRangeOfSegment
-(
-    const List<referredCell>& referredInteractionList,
-    const labelList& segmentFaces,
-    const labelList& segmentEdges,
-    const labelList& segmentPoints
-) const
-{
-    DynamicList<label> referredCellsFoundInRange;
-
-    forAll(segmentFaces, sF)
-    {
-        const label f = segmentFaces[sF];
-
-        forAll(referredInteractionList, rIL)
-        {
-            const vectorList& refCellPoints
-                = referredInteractionList[rIL].vertexPositions();
-
-            if (testPointFaceDistance(refCellPoints, f))
-            {
-                if (findIndex(referredCellsFoundInRange, rIL) == -1)
-                {
-                    referredCellsFoundInRange.append(rIL);
-                }
-            }
-        }
-    }
-
-    forAll(segmentPoints, sP)
-    {
-        const label p = segmentPoints[sP];
-
-        forAll(referredInteractionList, rIL)
-        {
-            const referredCell& refCell(referredInteractionList[rIL]);
-
-            if (testPointFaceDistance(p, refCell))
-            {
-                if (findIndex(referredCellsFoundInRange, rIL) == -1)
-                {
-                    referredCellsFoundInRange.append(rIL);
-                }
-            }
-        }
-    }
-
-    forAll(segmentEdges, sE)
-    {
-        const edge& eI(mesh_.edges()[segmentEdges[sE]]);
-
-        forAll(referredInteractionList, rIL)
-        {
-            const vectorList& refCellPoints
-                = referredInteractionList[rIL].vertexPositions();
-
-            const edgeList& refCellEdges
-                = referredInteractionList[rIL].edges();
-
-            forAll(refCellEdges, rCE)
-            {
-                const edge& eJ(refCellEdges[rCE]);
-
-                if
-                (
-                    testEdgeEdgeDistance
-                    (
-                        eI,
-                        refCellPoints[eJ.start()],
-                        refCellPoints[eJ.end()]
-                    )
-                )
-                {
-                    if (findIndex(referredCellsFoundInRange, rIL) == -1)
-                    {
-                        referredCellsFoundInRange.append(rIL);
-                    }
-                }
-            }
-        }
-    }
-
-    return referredCellsFoundInRange.shrink();
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.H
deleted file mode 100644
index 86caab7317..0000000000
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.H
+++ /dev/null
@@ -1,214 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-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 3 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, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::interactionLists
-
-Description
-
-SourceFiles
-    interactionListsI.H
-    interactionLists.C
-    interactionListsIO.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef interactionLists_H
-#define interactionLists_H
-
-#include "polyMesh.H"
-#include "vector2D.H"
-#include "directInteractionList.H"
-#include "referredCell.H"
-#include "referredCellList.H"
-#include "sendingReferralList.H"
-#include "receivingReferralList.H"
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                       Class interactionLists Declaration
-\*---------------------------------------------------------------------------*/
-
-class interactionLists
-{
-    // Private data
-
-        const polyMesh& mesh_;
-
-        scalar rCutMaxSqr_;
-
-        directInteractionList dil_;
-
-        referredCellList ril_;
-
-        List<sendingReferralList> cellSendingReferralLists_;
-
-        List<receivingReferralList> cellReceivingReferralLists_;
-
-
-    // Private Member Functions
-
-        //- Build referralLists which define how to send information
-        // to referredCells to source cells
-        void buildCellReferralLists();
-
-        //- Disallow default bitwise copy construct
-        interactionLists(const interactionLists&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const interactionLists&);
-
-
-public:
-
-    // Static data members
-
-        //- Tolerance for checking that faces on a patch segment
-        static scalar transTol;
-
-
-    // Constructors
-
-        //- Construct and create all information from the mesh
-        interactionLists
-        (
-            const polyMesh& mesh,
-            scalar rCutMaxSqr,
-            bool pointPointListBuild = false
-        );
-
-        //- Construct from file
-        interactionLists(const polyMesh& mesh);
-
-
-    //- Destructor
-    ~interactionLists();
-
-
-    // Member Functions
-
-            bool testPointPointDistance
-            (
-                const label ptI,
-                const label ptJ
-            ) const;
-
-            bool testPointFaceDistance
-            (
-                const label p,
-                const label faceNo
-            ) const;
-
-            bool testPointFaceDistance
-            (
-                const label p,
-                const referredCell& refCell
-            ) const;
-
-            bool testPointFaceDistance
-            (
-                const vectorList& pointsToTest,
-                const label faceNo
-            ) const;
-
-            bool testPointFaceDistance
-            (
-                const vector& p,
-                const label faceNo
-            ) const;
-
-            bool testPointFaceDistance
-            (
-                const vector& p,
-                const labelList& faceToTest,
-                const vectorList& points,
-                const vector& faceC,
-                const vector& faceA
-            ) const;
-
-            bool testEdgeEdgeDistance
-            (
-                const edge& eI,
-                const edge& eJ
-            ) const;
-
-            bool testEdgeEdgeDistance
-            (
-                const edge& eI,
-                const vector& eJs,
-                const vector& eJe
-            ) const;
-
-            const labelList realCellsInRangeOfSegment
-            (
-                const labelList& segmentFaces,
-                const labelList& segmentEdges,
-                const labelList& segmentPoints
-            ) const;
-
-            const labelList referredCellsInRangeOfSegment
-            (
-                const List<referredCell>& referredInteractionList,
-                const labelList& segmentFaces,
-                const labelList& segmentEdges,
-                const labelList& segmentPoints
-            ) const;
-
-
-        // Access
-
-            inline const polyMesh& mesh() const;
-
-            inline const directInteractionList& dil() const;
-
-            inline const referredCellList& ril() const;
-            inline referredCellList& ril();
-
-            inline const List<sendingReferralList>&
-                cellSendingReferralLists() const;
-
-            inline const List<receivingReferralList>&
-                cellReceivingReferralLists() const;
-
-            inline label nInteractingProcs() const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "interactionListsI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.C
deleted file mode 100644
index 602ab7b497..0000000000
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.C
+++ /dev/null
@@ -1,174 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-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 3 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, see <http://www.gnu.org/licenses/>.
-
-\*----------------------------------------------------------------------------*/
-
-#include "receivingReferralList.H"
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::receivingReferralList::receivingReferralList()
-:
-    labelListList(),
-    sourceProc_(-1)
-{}
-
-
-Foam::receivingReferralList::receivingReferralList
-(
-    const label sourceProc,
-    const labelListList& refCellsToSendTo
-)
-:
-    labelListList(refCellsToSendTo),
-    sourceProc_(sourceProc)
-{}
-
-
-Foam::receivingReferralList::receivingReferralList
-(
-    const receivingReferralList& rL
-)
-:
-    labelListList(rL),
-    sourceProc_(rL.sourceProc())
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::receivingReferralList::~receivingReferralList()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-void Foam::receivingReferralList::operator=(const receivingReferralList& rhs)
-{
-    // Check for assignment to self
-    if (this == &rhs)
-    {
-        FatalErrorIn
-        (
-            "Foam::receivingReferralList::operator="
-            "(const Foam::receivingReferralList&)"
-        )
-            << "Attempted assignment to self"
-            << abort(FatalError);
-    }
-
-    labelListList::operator=(rhs);
-
-    sourceProc_ = rhs.sourceProc();
-}
-
-
-// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
-
-bool operator==
-(
-    const Foam::receivingReferralList& a,
-    const Foam::receivingReferralList& b
-)
-{
-    // Trivial reject: lists are different size
-    if (a.size() != b.size())
-    {
-        return false;
-    }
-
-    // Or if source processors are not the same.
-    if (a.sourceProc() != b.sourceProc())
-    {
-        return false;
-    }
-
-    Foam::List<bool> fnd(a.size(), false);
-
-    forAll(b, bI)
-    {
-        Foam::labelList curLList = b[bI];
-
-        bool found = false;
-
-        forAll(a, aI)
-        {
-            if (a[aI] == curLList)
-            {
-                found = true;
-                fnd[aI] = true;
-                break;
-            }
-        }
-
-        if (!found)
-        {
-            return false;
-        }
-    }
-
-    // check if all LLists on a were marked
-    bool result = true;
-
-    forAll(fnd, aI)
-    {
-        result = (result && fnd[aI]);
-    }
-
-    return result;
-}
-
-
-Foam::Istream& Foam::operator>>(Istream& is, receivingReferralList& rRL)
-{
-    is  >> rRL.sourceProc_ >> static_cast<labelListList&>(rRL);
-
-    is.check
-    (
-        "Istream& operator<<(Istream& f, const receivingReferralList& rRL"
-    );
-
-    return is;
-}
-
-
-Foam::Ostream& Foam::operator<<
-(
-    Ostream& os,
-    const receivingReferralList& rRL
-)
-{
-    os  << rRL.sourceProc() << token::SPACE
-        << static_cast< const labelListList& >(rRL);
-
-    os.check
-    (
-        "Ostream& operator<<(Ostream& f, const receivingReferralList& rRL"
-    );
-
-    return os;
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.H
deleted file mode 100644
index 048cb5c2e6..0000000000
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.H
+++ /dev/null
@@ -1,136 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-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 3 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, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::receivingReferralList
-
-Description
-
-SourceFiles
-    receivingReferralListI.H
-    receivingReferralList.C
-    receivingReferralListIO.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef receivingReferralList_H
-#define receivingReferralList_H
-
-#include "labelList.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                    Class receivingReferralList Declaration
-\*---------------------------------------------------------------------------*/
-
-class receivingReferralList
-:
-    public labelListList
-{
-    // Private data
-
-        label sourceProc_;
-
-
-public:
-
-    // Constructors
-
-        //- Construct null
-        receivingReferralList();
-
-        //- Construct from components
-        receivingReferralList
-        (
-            const label sourceProc,
-            const labelListList& refCellsToSendTo
-        );
-
-        //- Construct as copy
-        receivingReferralList(const receivingReferralList&);
-
-
-    //- Destructor
-    ~receivingReferralList();
-
-
-    // Member Functions
-
-        // Access
-
-            inline label sourceProc() const;
-
-
-    // Member Operators
-
-        void operator=(const receivingReferralList&);
-
-
-    // Friend Operators
-
-        friend bool operator==
-        (
-            const receivingReferralList& a,
-            const receivingReferralList& b
-        );
-
-        inline friend bool operator!=
-        (
-            const receivingReferralList& a,
-            const receivingReferralList& b
-        );
-
-
-    // IOstream Operators
-
-        friend Istream& operator>>
-        (
-            Istream&,
-            receivingReferralList&
-        );
-
-        friend Ostream& operator<<
-        (
-            Ostream&,
-            const receivingReferralList&
-        );
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "receivingReferralListI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.C
deleted file mode 100644
index 71e98e13c2..0000000000
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.C
+++ /dev/null
@@ -1,171 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-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 3 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, see <http://www.gnu.org/licenses/>.
-
-\*----------------------------------------------------------------------------*/
-
-#include "sendingReferralList.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::sendingReferralList::sendingReferralList()
-:
-    labelList(),
-    destinationProc_(-1)
-{}
-
-
-Foam::sendingReferralList::sendingReferralList
-(
-    const label destinationProc,
-    const labelList& cellsToSend
-)
-:
-    labelList(cellsToSend),
-    destinationProc_(destinationProc)
-{}
-
-
-Foam::sendingReferralList::sendingReferralList
-(
-    const sendingReferralList& rL
-)
-:
-    labelList(rL),
-    destinationProc_(rL.destinationProc())
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::sendingReferralList::~sendingReferralList()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-void Foam::sendingReferralList::operator=(const sendingReferralList& rhs)
-{
-    // Check for assignment to self
-    if (this == &rhs)
-    {
-        FatalErrorIn
-        (
-            "Foam::sendingReferralList::"
-            "operator=(const Foam::sendingReferralList&)"
-        )
-            << "Attempted assignment to self"
-            << abort(FatalError);
-    }
-
-    labelList::operator=(rhs);
-
-    destinationProc_ = rhs.destinationProc();
-}
-
-
-// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
-
-bool operator==
-(
-    const Foam::sendingReferralList& a,
-    const Foam::sendingReferralList& b
-)
-{
-    // Trivial reject: lists are different size
-    if (a.size() != b.size())
-    {
-        return false;
-    }
-
-    // Or if source processors are not the same.
-    if (a.destinationProc() != b.destinationProc())
-    {
-        return false;
-    }
-
-    Foam::List<bool> fnd(a.size(), false);
-
-    forAll(b, bI)
-    {
-        Foam::label curLabel = b[bI];
-
-        bool found = false;
-
-        forAll(a, aI)
-        {
-            if (a[aI] == curLabel)
-            {
-                found = true;
-                fnd[aI] = true;
-                break;
-            }
-        }
-
-        if (!found)
-        {
-            return false;
-        }
-    }
-
-    // check if all labels on a were marked
-    bool result = true;
-
-    forAll(fnd, aI)
-    {
-        result = (result && fnd[aI]);
-    }
-
-    return result;
-}
-
-
-Foam::Istream& Foam::operator>>
-(
-    Istream& is,
-    sendingReferralList& sRL
-)
-{
-    is  >> sRL.destinationProc_ >> static_cast<labelList&>(sRL);
-
-    is.check("Istream& operator<<(Istream& f, const sendingReferralList& sRL");
-
-    return is;
-}
-
-
-Foam::Ostream& Foam::operator<<
-(
-    Ostream& os,
-    const sendingReferralList& rL
-)
-{
-    os  << rL.destinationProc() << token::SPACE
-        << static_cast< const labelList& >(rL);
-
-    os.check("Ostream& operator<<(Ostream& f, const sendingReferralList& rL");
-
-    return os;
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCell/referredCell.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCell/referredCell.C
deleted file mode 100644
index 391e38f2e8..0000000000
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCell/referredCell.C
+++ /dev/null
@@ -1,448 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-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 3 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, see <http://www.gnu.org/licenses/>.
-
-\*----------------------------------------------------------------------------*/
-
-#include "referredCell.H"
-#include "interactionLists.H"
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void referredCell::setConstructionData
-(
-    const polyMesh& mesh,
-    const label sourceCell
-)
-{
-    // Points
-
-    const labelList& points = mesh.cellPoints()[sourceCell];
-
-    vectorList sourceCellVertices(points.size());
-
-    forAll(sourceCellVertices, sCV)
-    {
-        sourceCellVertices[sCV] = mesh.points()[points[sCV]];
-    }
-
-    vertexPositions_ = referPositions(sourceCellVertices);
-
-
-    // Edges
-
-    const labelList& edges = mesh.cellEdges()[sourceCell];
-
-    edgeList sourceCellEdges(edges.size());
-
-    forAll(sourceCellEdges, sCE)
-    {
-        sourceCellEdges[sCE] = mesh.edges()[edges[sCE]];
-    }
-
-    locallyMapEdgeList(points, sourceCellEdges);
-
-
-    // Faces
-
-    labelList faces(mesh.cells()[sourceCell]);
-
-    vectorList sourceCellFaceCentres(faces.size());
-
-    vectorList sourceCellFaceAreas(faces.size());
-
-    labelListList sourceCellFaces(faces.size());
-
-    forAll(faces, f)
-    {
-        sourceCellFaces[f] = mesh.faces()[faces[f]];
-
-        sourceCellFaceCentres[f] = mesh.faceCentres()[faces[f]];
-
-        sourceCellFaceAreas[f] = mesh.faceAreas()[faces[f]];
-    }
-
-    locallyMapFaceList(points, sourceCellFaces);
-
-    faceCentres_ = referPositions(sourceCellFaceCentres);
-
-    faceAreas_ = rotateVectors(sourceCellFaceAreas);
-}
-
-
-void referredCell::locallyMapEdgeList
-(
-    const labelList& points,
-    const edgeList& sourceCellEdges
-)
-{
-    edges_.setSize(sourceCellEdges.size());
-
-    forAll(sourceCellEdges, sCE)
-    {
-        const edge& e(sourceCellEdges[sCE]);
-
-        edges_[sCE].start() = findIndex(points, e.start());
-
-        edges_[sCE].end() = findIndex(points, e.end());
-
-        if
-        (
-            edges_[sCE].start() == -1
-         || edges_[sCE].end() == -1
-        )
-        {
-            FatalErrorIn("Foam::referredCell::locallyMapEdgeList")
-                << "edgeList and points labelList for "
-                << "referred cell do not match: "
-                << nl << "points: " << points
-                << nl << "egdes: " << sourceCellEdges
-                << abort(FatalError);
-        }
-    }
-}
-
-
-void referredCell::locallyMapFaceList
-(
-    const labelList& points,
-    const labelListList& sourceCellFaces
-)
-{
-    faces_.setSize(sourceCellFaces.size());
-
-    forAll(sourceCellFaces, sCF)
-    {
-        const labelList& sourceCellFace(sourceCellFaces[sCF]);
-
-        labelList& localFace(faces_[sCF]);
-
-        localFace.setSize(sourceCellFace.size());
-
-        forAll(sourceCellFace, p)
-        {
-            localFace[p] = findIndex(points, sourceCellFace[p]);
-
-            if (localFace[p] == -1)
-            {
-                FatalErrorIn("Foam::referredCell::locallyMapEdgeList")
-                    << "edgeList and points labelList for "
-                    << "referred cell do not match: "
-                    << nl << "points: " << points
-                    << nl << "faces: " << sourceCellFaces
-                    << abort(FatalError);
-            }
-        }
-    }
-}
-
-
-vector referredCell::referPosition(const vector& positionToRefer)
-{
-    return offset_ + (rotation_ & positionToRefer);
-}
-
-
-vectorList referredCell::referPositions(const vectorList& positionsToRefer)
-{
-    return offset_ + (rotation_ & positionsToRefer);
-}
-
-
-vector referredCell::rotateVector(const vector& vectorToRotate)
-{
-    return rotation_ & vectorToRotate;
-}
-
-
-vectorList referredCell::rotateVectors(const vectorList& vectorsToRotate)
-{
-    return rotation_ & vectorsToRotate;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-referredCell::referredCell()
-:
-    DynamicList<referredMolecule>(),
-    sourceProc_(-1),
-    sourceCell_(-1),
-    vertexPositions_(),
-    offset_(vector::zero),
-    rotation_(I)
-{}
-
-
-referredCell::referredCell
-(
-    const polyMesh& mesh,
-    const label sourceProc,
-    const label sourceCell,
-    const vector& offset,
-    const tensor& rotation
-)
-:
-    DynamicList<referredMolecule>(),
-    sourceProc_(sourceProc),
-    sourceCell_(sourceCell),
-    offset_(offset),
-    rotation_(rotation)
-{
-    setConstructionData(mesh, sourceCell);
-}
-
-
-referredCell::referredCell
-(
-    const label sourceProc,
-    const label sourceCell,
-    const vectorList& vertexPositions,
-    const edgeList& localEdges,
-    const labelListList& localFaces,
-    const vectorList& faceCentres,
-    const vectorList& faceAreas,
-    const vector& offset,
-    const tensor& rotation
-)
-:
-    DynamicList<referredMolecule>(),
-    sourceProc_(sourceProc),
-    sourceCell_(sourceCell),
-    edges_(localEdges),
-    faces_(localFaces),
-    offset_(offset),
-    rotation_(rotation)
-{
-    // Supplied vertexPositions, faceCentres and faceAreas are of the
-    // "original" cell, and need to be transformed to the referred
-    // locations on construction
-
-    vertexPositions_ = referPositions(vertexPositions);
-
-    faceCentres_ = referPositions(faceCentres);
-
-    faceAreas_ = rotateVectors(faceAreas);
-}
-
-
-referredCell::referredCell
-(
-    const polyMesh& mesh,
-    const label sourceProc,
-    const label sourceCell,
-    const vector& cS,
-    const vector& cD,
-    const vector& nS,
-    const vector& nD
-)
-:
-    DynamicList<referredMolecule>(),
-    sourceProc_(sourceProc),
-    sourceCell_(sourceCell)
-{
-    // It is assumed that the vectors originating from the faces being referred
-    // here are correct periodic faces - i.e. they have the same area etc.
-
-    vector nA = -nS/mag(nS);
-    vector nB = nD/mag(nD);
-
-    rotation_ = rotationTensor(nA, nB);
-
-    offset_ = cD - (rotation_ & cS);
-
-    // Allow sourceCell = -1 to create a dummy referredCell
-    // to obtain the transformation
-
-    if (sourceCell >= 0)
-    {
-        setConstructionData(mesh, sourceCell);
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-referredCell::~referredCell()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-referredCell referredCell::reRefer
-(
-    const vector& cS,
-    const vector& cD,
-    const vector& nS,
-    const vector& nD
-)
-{
-    vector nA = -nS/mag(nS);
-    vector nB = nD/mag(nD);
-
-    tensor newRotation = rotationTensor(nA, nB);
-
-    vector newOffset = cD - (newRotation & cS);
-
-    tensor reReferredRotation = newRotation & rotation_;
-
-    vector reReferredOffset = newOffset + (newRotation & offset_);
-
-    return referredCell
-    (
-        sourceProc_,
-        sourceCell_,
-        rotation_.T() & (vertexPositions_ - offset_),
-        edges_,
-        faces_,
-        rotation_.T() & (faceCentres_ - offset_),
-        rotation_.T() & (faceAreas_),
-        reReferredOffset,
-        reReferredRotation
-    );
-}
-
-
-vector referredCell::referPosition(const vector& positionToRefer) const
-{
-    return offset_ + (rotation_ & positionToRefer);
-}
-
-
-vectorList referredCell::referPosition
-(
-    const vectorList& positionsToRefer
-) const
-{
-    return offset_ + (rotation_ & positionsToRefer);
-}
-
-
-vector referredCell::rotateVector(const vector& vectorToRotate) const
-{
-    return rotation_ & vectorToRotate;
-}
-
-
-vectorList referredCell::rotateVectors(const vectorList& vectorsToRotate) const
-{
-    return rotation_ & vectorsToRotate;
-}
-
-
-void referredCell::referInMols(const List<referredMolecule>& incomingMols)
-{
-    clear();
-
-    forAll(incomingMols, iM)
-    {
-        append
-        (
-            referredMolecule
-            (
-                incomingMols[iM].id(),
-                referPosition
-                (
-                    incomingMols[iM].position()
-                ),
-                referPosition
-                (
-                    incomingMols[iM].sitePositions()
-                )
-            )
-        );
-    }
-
-    shrink();
-}
-
-
-bool referredCell::duplicate(const referredCell& refCellDupl) const
-{
-    return
-    (
-        sourceProc_ == refCellDupl.sourceProc()
-     && sourceCell_ == refCellDupl.sourceCell()
-     && mag(offset_ - refCellDupl.offset()) < interactionLists::transTol
-    );
-}
-
-
-bool referredCell::duplicate(const label procNo,const label nCells) const
-{
-    return
-    (
-        sourceProc_ == procNo
-     && sourceCell_ < nCells
-     && mag(offset_) < interactionLists::transTol
-    );
-}
-
-
-// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
-
-Istream& operator>>(Istream& is, referredCell& rC)
-{
-
-    is  >> rC.sourceProc_
-        >> rC.sourceCell_
-        >> rC.vertexPositions_
-        >> rC.edges_
-        >> rC.faces_
-        >> rC.faceCentres_
-        >> rC.faceAreas_
-        >> rC.offset_
-        >> rC.rotation_;
-
-    is.check("Istream& operator<<(Istream& f, const referredCell& rC");
-
-    return is;
-}
-
-
-Ostream& operator<<(Ostream& os, const referredCell& rC)
-{
-
-    os  << rC.sourceProc()
-        << token::SPACE << rC.sourceCell()
-        << token::SPACE << rC.vertexPositions()
-        << token::SPACE << rC.edges()
-        << token::SPACE << rC.faces()
-        << token::SPACE << rC.faceCentres()
-        << token::SPACE << rC.faceAreas()
-        << token::SPACE << rC.offset()
-        << token::SPACE << rC.rotation();
-
-    os.check("Ostream& operator<<(Ostream& f, const referredCell& rC");
-
-    return os;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-}  // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCell/referredCell.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCell/referredCell.H
deleted file mode 100644
index 9c3b2004ca..0000000000
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCell/referredCell.H
+++ /dev/null
@@ -1,275 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-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 3 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, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::referredCell
-
-Description
-
-SourceFiles
-    referredCellI.H
-    referredCell.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef referredCell_H
-#define referredCell_H
-
-#include "vector.H"
-#include "vectorList.H"
-#include "tensor.H"
-#include "transform.H"
-#include "DynamicList.H"
-#include "labelList.H"
-#include "edgeList.H"
-#include "polyMesh.H"
-
-#include "referredMolecule.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                          Class referredCell Declaration
-\*---------------------------------------------------------------------------*/
-
-class referredCell
-:
-    public DynamicList<referredMolecule>
-{
-    // Private data
-
-        label sourceProc_;
-
-        label sourceCell_;
-
-        //- Referred vertex positions
-        vectorList vertexPositions_;
-
-        edgeList edges_;
-
-        labelListList faces_;
-
-        vectorList faceCentres_;
-
-        vectorList faceAreas_;
-
-        labelList realCellsForInteraction_;
-
-        vector offset_;
-
-        tensor rotation_;
-
-
-    // Private Member Functions
-
-        void setConstructionData
-        (
-            const polyMesh& mesh,
-            const label sourceCell
-        );
-
-        void locallyMapEdgeList
-        (
-            const labelList& points,
-            const edgeList& sourceCellEdges
-        );
-
-        void locallyMapFaceList
-        (
-            const labelList& points,
-            const labelListList& sourceCellFaces
-        );
-
-        vector referPosition(const vector& positionToRefer);
-
-        vectorList referPositions(const vectorList& positionsToRefer);
-
-        vector rotateVector(const vector& vectorToRotate);
-
-        vectorList rotateVectors(const vectorList& vectorsToRotate);
-
-
-public:
-
-    // Constructors
-
-        //- Construct null
-
-        referredCell();
-
-        //- Construct from components with external edge information
-        referredCell
-        (
-            const polyMesh& mesh,
-            const label sourceProc,
-            const label sourceCell,
-            const vector& offset,
-            const tensor& rotation
-        );
-
-        //- Construct from components with existing local edge information
-        referredCell
-        (
-            const label sourceProc,
-            const label sourceCell,
-            const vectorList& vertexPositions,
-            const edgeList& localEdges,
-            const labelListList& localFaces,
-            const vectorList& faceCentres,
-            const vectorList& faceAreas,
-            const vector& offset,
-            const tensor& rotation
-        );
-
-        //- Construct from pair of face centers (c) and plain
-        //  face normals (n) (no need to make unit vectors or
-        //  reverse one direction)
-        //  Order of vectors important (S = source, D = Destination).
-        //  External edge information.
-
-        referredCell
-        (
-            const polyMesh& mesh,
-            const label sourceProc,
-            const label sourceCell,
-            const vector& cS,
-            const vector& cD,
-            const vector& nS,
-            const vector& nD
-        );
-
-
-    //- Destructor
-    virtual ~referredCell();
-
-
-    // Member Functions
-
-        //- Take this referredCell object that has already had its transform
-        //  calculated and refer it on again, retaining same source info.
-        referredCell reRefer
-        (
-            const vector& cS,
-            const vector& cD,
-            const vector& nS,
-            const vector& nD
-        );
-
-        //- Use internal transformatation values to transform the given
-        //  postion to its new location.
-        vector referPosition(const vector& positionToRefer) const;
-
-        //- Use internal transformatation values to transform the given
-        //  list of postions to their new locations.
-        vectorList referPosition(const vectorList& positionsToRefer) const;
-
-        //- Use internal transformatation values to rotate the given vector
-        vector rotateVector(const vector& vectorToRotate) const;
-
-        //- Use internal transformatation values to rotate the given
-        // list of vectors
-        vectorList rotateVectors(const vectorList& vectorsToRotate) const;
-
-        //- referInMols clears, the stored list of referred mols and takes
-        //  in a list of referred mols coming from a source processor,
-        //  transformingtheir positions
-        void referInMols(const List<referredMolecule>& incomingMols);
-
-        //- duplicate() function to test whether a referred or real cell
-        //  supplied by arguement is a duplicate of this referredCell.
-        //  Can be used bi-directionally - i.e. can be called on an existing
-        //  referred cell with a proposed referredCell as argument,
-        //  or vice versa.  Can only be called by a proposed referredCell with
-        //  a real cell index as arguement to test to see if the proposed
-        //  referredCell is a duplicate.
-        //  A duplicate cell is defined as one which has the same source
-        //  processor, source cell, and an equal offset. Real cells have zero
-        //  offset by definition.
-        bool duplicate(const referredCell& refCellDupl) const;
-
-        bool duplicate(const label procNo, const label nCells) const;
-
-
-        // Access
-
-            inline label sourceProc() const;
-
-            inline label sourceCell() const;
-
-            inline const vector& offset() const;
-
-            inline const tensor& rotation() const;
-
-            inline const vectorList& vertexPositions() const;
-
-            inline const edgeList& edges() const;
-
-            inline const labelListList& faces() const;
-
-            inline const vectorList& faceCentres() const;
-
-            inline const vectorList& faceAreas() const;
-
-            inline labelList& realCells();
-
-            inline const labelList& realCellsForInteraction() const;
-
-
-    // Friend Operators
-
-        inline friend bool operator==
-        (
-            const referredCell& a,
-            const referredCell& b
-        );
-
-        inline friend bool operator!=
-        (
-            const referredCell& a,
-            const referredCell& b
-        );
-
-
-    // IOstream Operators
-
-        friend Istream& operator>>(Istream&, referredCell&);
-        friend Ostream& operator<<(Ostream&, const referredCell&);
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "referredCellI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCell/referredCellI.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCell/referredCellI.H
deleted file mode 100644
index 9b50531f92..0000000000
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCell/referredCellI.H
+++ /dev/null
@@ -1,126 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-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 3 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, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-inline label referredCell::sourceProc() const
-{
-    return sourceProc_;
-}
-
-
-inline label referredCell::sourceCell() const
-{
-    return sourceCell_;
-}
-
-
-inline const vector& referredCell::offset() const
-{
-    return offset_;
-}
-
-
-inline const tensor& referredCell::rotation() const
-{
-    return rotation_;
-}
-
-
-inline const vectorList& referredCell::vertexPositions() const
-{
-    return vertexPositions_;
-}
-
-
-inline const edgeList& referredCell::edges() const
-{
-    return edges_;
-}
-
-
-inline const labelListList& referredCell::faces() const
-{
-    return faces_;
-}
-
-
-inline const vectorList& referredCell::faceCentres() const
-{
-    return faceCentres_;
-}
-
-
-inline const vectorList& referredCell::faceAreas() const
-{
-    return faceAreas_;
-}
-
-
-inline labelList& referredCell::realCells()
-{
-    return realCellsForInteraction_;
-}
-
-
-inline const labelList& referredCell::realCellsForInteraction() const
-{
-    return realCellsForInteraction_;
-}
-
-
-// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
-
-inline bool operator==
-(
-    const referredCell& a,
-    const referredCell& b
-)
-{
-    return const_cast<referredCell&>(a).duplicate
-    (
-        const_cast<const referredCell&>(b)
-    );
-}
-
-
-inline bool operator!=
-(
-    const referredCell& a,
-    const referredCell& b
-)
-{
-    return !(a == b);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C
deleted file mode 100644
index b0d951113b..0000000000
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C
+++ /dev/null
@@ -1,1583 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-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 3 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, see <http://www.gnu.org/licenses/>.
-
-\*----------------------------------------------------------------------------*/
-
-#include "referredCellList.H"
-#include "interactionLists.H"
-#include "polyBoundaryMeshEntries.H"
-#include "PstreamCombineReduceOps.H"
-#include "Time.H"
-#include "globalMeshData.H"
-#include "processorPolyPatch.H"
-#include "cyclicPolyPatch.H"
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void Foam::referredCellList::buildReferredCellList
-(
-    bool pointPointListBuild
-)
-{
-    Info<< nl << "Building list of referred interaction neighbours" << endl;
-
-    const polyMesh& mesh(il_.mesh());
-
-    DynamicList<referredCell> referredInteractionList;
-
-    // realCellsWithinRCutMaxOfAnyReferringPatch
-    DynamicList<label> rCellsWRRP;
-
-    // realFacesWithinRCutMaxOfAnyReferringPatch
-    DynamicList<label> rFacesWRRP;
-
-    // realEdgesWithinRCutMaxOfAnyReferringPatch
-    DynamicList<label> rEdgesWRRP;
-
-    // realPointsWithinRCutMaxOfAnyReferringPatch
-    DynamicList<label> rPointsWRRP;
-
-    labelListList processorPatchSegmentMapping
-    (
-        mesh.globalData().processorPatches().size()
-    );
-
-    List<vectorList> allNeighbourFaceCentres
-    (
-        mesh.globalData().processorPatches().size()
-    );
-
-    List<vectorList> allNeighbourFaceAreas
-    (
-        mesh.globalData().processorPatches().size()
-    );
-
-    label nUndecomposedPatches = 0;
-
-    if (Pstream::parRun())
-    {
-        dictionary patchDictionary;
-
-        DynamicList<word> patchNames;
-
-        Time undecomposedTime
-        (
-            Time::controlDictName,
-            mesh.time().rootPath(),
-            mesh.time().caseName().path()
-        );
-
-        IOobject undecomposedBoundaryHeader
-        (
-            "boundary",
-            undecomposedTime.constant(),
-            polyMesh::meshSubDir,
-            undecomposedTime,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE,
-            false
-        );
-
-        if (undecomposedBoundaryHeader.headerOk())
-        {
-            polyBoundaryMeshEntries undecomposedPatchEntries
-            (
-                undecomposedBoundaryHeader
-            );
-
-            forAll(undecomposedPatchEntries, patchi)
-            {
-                patchNames.append
-                (
-                    undecomposedPatchEntries[patchi].keyword()
-                );
-
-                patchDictionary.add
-                (
-                    undecomposedPatchEntries[patchi]
-                );
-            }
-        }
-        else
-        {
-            FatalErrorIn
-            (
-                "referredCellList::buildReferredCellList(bool)"
-            )   << "unable to read undecomposed boundary file from "
-                << "constant/polyMesh" << nl
-                << abort(FatalError);
-        }
-
-        labelIOList faceProcAddressing
-        (
-            IOobject
-            (
-                "faceProcAddressing",
-                mesh.time().constant(),
-                polyMesh::meshSubDir,
-                mesh,
-                IOobject::MUST_READ,
-                IOobject::NO_WRITE,
-                false
-            )
-        );
-
-        labelList procPatches(mesh.globalData().processorPatches());
-
-        nUndecomposedPatches = patchNames.size();
-
-        // processorPatchSegmentMapping works by mapping the original patch and
-        // half that a face on a processor patch was on before decomposition.
-        // This creates a patch segment for each half of each original (cyclic)
-        // patch which can be assessed separately.  There are n =
-        // patchNames.size() original patches, k = 0 to n-1.  The mapping is:
-        // value = 0: originally an internal face value = k, was originally on
-        // the on the patch k-1, 1st half value = -k, was originally on the on
-        // the patch k-1, 2nd half
-
-        forAll(procPatches,pP)
-        {
-            const processorPolyPatch& patch = refCast<const processorPolyPatch>
-            (
-                mesh.boundaryMesh()[procPatches[pP]]
-            );
-
-            labelList& procPatchSegMap = processorPatchSegmentMapping[pP];
-
-            procPatchSegMap.setSize(patch.size());
-
-            forAll(patch, pI)
-            {
-                label decomposedMeshFace = patch.start() + pI;
-
-                label faceProcAdd = faceProcAddressing[decomposedMeshFace];
-
-                label globalFace = abs(faceProcAdd)-1;
-
-                label minStart = -1;
-
-                forAll(patchNames, pN)
-                {
-                    if (patchDictionary.found(patchNames[pN]))
-                    {
-                        const dictionary& patchDict =
-                        patchDictionary.subDict(patchNames[pN]);
-
-                        label startFace
-                        (
-                            readLabel
-                            (
-                                patchDict.lookup("startFace")
-                            )
-                        );
-
-                        label nFaces(readLabel(patchDict.lookup("nFaces")));
-
-                        if (minStart < 0 || startFace < minStart)
-                        {
-                            minStart = startFace;
-                        }
-
-                        if
-                        (
-                            globalFace >= startFace
-                         && globalFace < startFace + nFaces/2
-                        )
-                        {
-                            procPatchSegMap[pI] = pN + 1;
-                        }
-                        else if
-                        (
-                            globalFace >= startFace + nFaces/2
-                         && globalFace < startFace + nFaces
-                        )
-                        {
-                            procPatchSegMap[pI] = -(pN + 1);
-                        }
-                    }
-                }
-
-                if (globalFace < minStart)
-                {
-                    procPatchSegMap[pI] = 0;
-                }
-            }
-        }
-
-        forAll(procPatches,pP)
-        {
-            const processorPolyPatch& patch = refCast<const processorPolyPatch>
-            (
-                mesh.boundaryMesh()[procPatches[pP]]
-            );
-
-            {
-                OPstream toNeighbProc
-                (
-                    Pstream::blocking,
-                    patch.neighbProcNo()
-                );
-
-                toNeighbProc << patch.faceCentres() << patch.faceAreas();
-            }
-        }
-
-        forAll(procPatches,pP)
-        {
-            const processorPolyPatch& patch = refCast<const processorPolyPatch>
-            (
-                mesh.boundaryMesh()[procPatches[pP]]
-            );
-
-            vectorList& neighbFaceCentres = allNeighbourFaceCentres[pP];
-
-            neighbFaceCentres.setSize(patch.size());
-
-            vectorList& neighbFaceAreas = allNeighbourFaceAreas[pP];
-
-            neighbFaceAreas.setSize(patch.size());
-
-            {
-                IPstream fromNeighbProc
-                (
-                    Pstream::blocking,
-                    patch.neighbProcNo()
-                );
-
-                fromNeighbProc >> neighbFaceCentres >> neighbFaceAreas;
-            }
-        }
-
-        // *************************************************************
-        // Tests that all processor patch segments from different
-        // original patches prior to decomposition produce the same
-        // transform. Check before 1st iteration.
-        // *************************************************************
-
-        forAll(procPatches,pP)
-        {
-            const processorPolyPatch& patch = refCast<const processorPolyPatch>
-            (
-                mesh.boundaryMesh()[procPatches[pP]]
-            );
-
-            const vectorList& neighbFaceCentres = allNeighbourFaceCentres[pP];
-
-            const vectorList& neighbFaceAreas = allNeighbourFaceAreas[pP];
-
-            label nUP;
-
-            for
-            (
-                nUP = -nUndecomposedPatches;
-                nUP <= nUndecomposedPatches;
-                nUP++
-            )
-            {
-                DynamicList<vector> refOff;
-
-                DynamicList<tensor> refTrans;
-
-                forAll(patch, faceI)
-                {
-                    if (processorPatchSegmentMapping[pP][faceI] == nUP)
-                    {
-                        referredCell testRefCell
-                        (
-                            mesh,
-                            -1,
-                            -1,
-                            patch.faceCentres()[faceI],
-                            neighbFaceCentres[faceI],
-                            patch.faceNormals()[faceI],
-                            neighbFaceAreas[faceI]
-                            /(mag(neighbFaceAreas[faceI]) + VSMALL)
-                        );
-
-                        refOff.append(testRefCell.offset());
-
-                        refTrans.append(testRefCell.rotation());
-                    }
-                }
-
-                refOff.shrink();
-
-                refTrans.shrink();
-
-                if (refOff.size())
-                {
-                    if
-                    (
-                        sum(mag(refOff-refOff[0]))/refOff.size()
-                            > interactionLists::transTol
-                     || sum(mag(refTrans-refTrans[0]))/refTrans.size()
-                            > interactionLists::transTol
-                    )
-                    {
-                        FatalErrorIn
-                        (
-                            "referredCellList::buildReferredCellList(bool)"
-                        )   << "Face pairs on patch " << patch.name()
-                            << ", segment " << patchNames[nUP]
-                            << " do not give the same referring "
-                            << " transformations to within tolerance of "
-                            << interactionLists::transTol << nl
-                            << " Referring offsets:" << refOff << nl
-                            << " Average sum of mag difference: "
-                            << sum(mag(refOff-refOff[0]))/refOff.size() << nl
-                            << " Referring transforms:" << refTrans << nl
-                            << " Average sum of mag difference: "
-                            << sum(mag(refTrans-refTrans[0]))/refTrans.size()
-                            << nl << abort(FatalError);
-                    }
-                }
-            }
-        }
-    }
-
-    label cellsReferredThisIteration = 1;
-
-    label iterationNo = 0;
-
-    while (cellsReferredThisIteration)
-    {
-        label refIntListStartSize = referredInteractionList.size();
-
-        forAll(mesh.boundaryMesh(), patchI)
-        {
-            // Treat local cyclics on each processor before processor
-            // boundaries.  Separate treatment allows the serial version to run
-            // transparently.
-
-            if (isA<cyclicPolyPatch>(mesh.boundaryMesh()[patchI]))
-            {
-                const cyclicPolyPatch& patch = refCast<const cyclicPolyPatch>
-                (
-                    mesh.boundaryMesh()[patchI]
-                );
-
-                if (patch.size())
-                {
-                    if (iterationNo == 0)
-                    {
-                        // Tests that all combinations of face pairs produce the
-                        // same transform.  Only check on 1st iteration.
-
-                        label faceL;
-                        // A face in the 1st half of the patch
-
-                        label faceM;
-                        // Face corresponding to faceL in the 2nd half of the
-                        // patch. Assumes correct face ordering.
-
-                        vectorList refOff(patch.size()/2);
-
-                        List<tensor> refTrans(patch.size()/2);
-
-                        for
-                        (
-                            faceL = 0, faceM = patch.size()/2;
-                            faceL < patch.size()/2;
-                            faceL++, faceM++
-                        )
-                        {
-                            referredCell testRefCell
-                            (
-                                mesh,
-                                -1,
-                                -1,
-                                patch.faceCentres()[faceL],
-                                patch.faceCentres()[faceM],
-                                patch.faceNormals()[faceL],
-                                patch.faceNormals()[faceM]
-                            );
-
-                            refOff[faceL] = testRefCell.offset();
-
-                            refTrans[faceL] = testRefCell.rotation();
-                        }
-
-                        if
-                        (
-                            sum(mag(refOff - refOff[0]))/(patch.size()/2)
-                                > interactionLists::transTol
-                         || sum(mag(refTrans - refTrans[0]))/(patch.size()/2)
-                                > interactionLists::transTol
-                        )
-                        {
-                            FatalErrorIn
-                            (
-                                "referredCellList::buildReferredCellList(bool)"
-                            )   << "Face pairs on patch " << patch.name()
-                                << " do not give the same referring "
-                                << " transformations to within tolerance of "
-                                << interactionLists::transTol << nl
-                                << " Referring offsets:" << refOff << nl
-                                << " Average sum of mag difference: "
-                                << sum(mag(refOff-refOff[0]))/refOff.size()
-                                << nl
-                                << " Referring transforms:" << refTrans << nl
-                                << " Average sum of mag difference: "
-                                << sum(mag(refTrans-refTrans[0]))
-                                   /refTrans.size()
-                                << nl << abort(FatalError);
-                        }
-                    }
-
-                    // *********************************************************
-                    // 1st half of face list - 1st side of boundary
-                    // *********************************************************
-
-                    label faceI;
-
-                    DynamicList<label> meshFacesOnThisSegment;
-
-                    for (faceI = 0; faceI < patch.size()/2; faceI++)
-                    {
-                        // unable to use the normal accessors for the polyPatch
-                        // because points on separate halves need used
-                        // separately
-
-                        meshFacesOnThisSegment.append(faceI + patch.start());
-                    }
-
-                    meshFacesOnThisSegment.shrink();
-
-                    DynamicList<label> meshEdgesOnThisSegment;
-
-                    DynamicList<label> meshPointsOnThisSegment;
-
-                    forAll(meshFacesOnThisSegment, mFOTS)
-                    {
-                        const label segFace = meshFacesOnThisSegment[mFOTS];
-
-                        const labelList& faceEdges = mesh.faceEdges()[segFace];
-
-                        forAll(faceEdges, fE)
-                        {
-                            const label faceEdge(faceEdges[fE]);
-
-                            if
-                            (
-                                findIndex
-                                (
-                                    meshEdgesOnThisSegment,
-                                    faceEdge
-                                ) == -1
-                            )
-                            {
-                                meshEdgesOnThisSegment.append(faceEdge);
-                            }
-                        }
-
-                        const face& facePoints(mesh.faces()[segFace]);
-
-                        forAll(facePoints, fP)
-                        {
-                            const label facePoint(facePoints[fP]);
-
-                            if
-                            (
-                                findIndex
-                                (
-                                    meshPointsOnThisSegment,
-                                    facePoint
-                                )
-                             ==
-                                -1
-                            )
-                            {
-                                meshPointsOnThisSegment.append(facePoint);
-                            }
-                        }
-                    }
-
-                    meshEdgesOnThisSegment.shrink();
-
-                    meshPointsOnThisSegment.shrink();
-
-                    if (iterationNo == 0)
-                    {
-                        // Assessing real cells in range is only required on
-                        // the 1st iteration because they do not change from
-                        // iteration to iteration.
-
-                        labelList realCellsFoundInRange
-                        (
-                            il_.realCellsInRangeOfSegment
-                            (
-                                meshFacesOnThisSegment,
-                                meshEdgesOnThisSegment,
-                                meshPointsOnThisSegment
-                            )
-                        );
-
-                        forAll(realCellsFoundInRange,cFIR)
-                        {
-                            const label realCell = realCellsFoundInRange[cFIR];
-
-                            referredCell cellToRefer
-                            (
-                                mesh,
-                                Pstream::myProcNo(),
-                                realCell,
-                                patch.faceCentres()[0],
-                                patch.faceCentres()[patch.size()/2],
-                                patch.faceNormals()[0],
-                                patch.faceNormals()[patch.size()/2]
-                            );
-
-                            // Test all existing referred and real cells to
-                            // check duplicates are not being made or cells
-                            // aren't being referred back onto themselves
-
-                            bool addCellToRefer = true;
-
-                            // Check if cellToRefer is an existing referred cell
-
-                            forAll(referredInteractionList, rIL)
-                            {
-                                if
-                                (
-                                    cellToRefer.duplicate
-                                    (
-                                        referredInteractionList[rIL]
-                                    )
-                                )
-                                {
-                                    addCellToRefer = false;
-
-                                    break;
-                                }
-                            }
-
-                            // Check for cellToRefer being referred back
-                            // ontop of a real cell
-
-                            if
-                            (
-                                cellToRefer.duplicate
-                                (
-                                    Pstream::myProcNo(),
-                                    mesh.nCells()
-                                )
-                            )
-                            {
-                                addCellToRefer = false;
-                            }
-
-                            if (addCellToRefer)
-                            {
-                                referredInteractionList.append(cellToRefer);
-                            }
-
-                            // add real cells found in range of cyclic patch
-                            // to whole mesh list
-
-                            if (findIndex (rCellsWRRP, realCell) == -1)
-                            {
-                                rCellsWRRP.append(realCell);
-                            }
-                        }
-                    }
-
-                    referredInteractionList.shrink();
-
-                    labelList referredCellsFoundInRange
-                    (
-                        il_.referredCellsInRangeOfSegment
-                        (
-                            referredInteractionList,
-                            meshFacesOnThisSegment,
-                            meshEdgesOnThisSegment,
-                            meshPointsOnThisSegment
-                        )
-                    );
-
-                    forAll(referredCellsFoundInRange,cFIR)
-                    {
-                        referredCell& existingRefCell =
-                            referredInteractionList
-                            [
-                                referredCellsFoundInRange[cFIR]
-                            ];
-
-                        referredCell cellToReRefer =
-                            existingRefCell.reRefer
-                            (
-                                patch.faceCentres()[0],
-                                patch.faceCentres()[patch.size()/2],
-                                patch.faceNormals()[0],
-                                patch.faceNormals()[patch.size()/2]
-                            );
-
-                        // Test all existing referred and real cells to check
-                        // duplicates are not being made or cells aren't being
-                        // referred back onto themselves
-
-                        bool addCellToReRefer = true;
-
-                        // Check if cellToRefer is an existing referred cell
-
-                        forAll(referredInteractionList, rIL)
-                        {
-                            if
-                            (
-                                cellToReRefer.duplicate
-                                (
-                                    referredInteractionList[rIL]
-                                )
-                            )
-                            {
-                                addCellToReRefer = false;
-
-                                break;
-                            }
-                        }
-
-                        // Check for cellToRefer being referred back
-                        // ontop of a real cell
-
-                        if
-                        (
-                            cellToReRefer.duplicate
-                            (
-                                Pstream::myProcNo(),
-                                mesh.nCells()
-                            )
-                        )
-                        {
-                            addCellToReRefer = false;
-                        }
-
-                        if (addCellToReRefer)
-                        {
-                            referredInteractionList.append(cellToReRefer);
-                        }
-                    }
-
-                    // *********************************************************
-                    // 2nd half of face list - 2nd side of boundary
-                    // *********************************************************
-
-                    meshFacesOnThisSegment.clear();
-
-                    for (faceI = patch.size()/2; faceI < patch.size(); faceI++)
-                    {
-                        // unable to use the normal accessors for the polyPatch
-                        // because points on separate halves need used
-                        // separately
-
-                        meshFacesOnThisSegment.append(faceI + patch.start());
-                    }
-
-                    meshFacesOnThisSegment.shrink();
-
-                    meshEdgesOnThisSegment.clear();
-
-                    meshPointsOnThisSegment.clear();
-
-                    forAll(meshFacesOnThisSegment, mFOTS)
-                    {
-                        const label segFace = meshFacesOnThisSegment[mFOTS];
-
-                        const labelList& faceEdges = mesh.faceEdges()[segFace];
-
-                        forAll(faceEdges, fE)
-                        {
-                            const label faceEdge(faceEdges[fE]);
-
-                            if
-                            (
-                                findIndex
-                                (
-                                    meshEdgesOnThisSegment,
-                                    faceEdge
-                                )
-                             ==
-                                -1
-                            )
-                            {
-                                meshEdgesOnThisSegment.append(faceEdge);
-                            }
-                        }
-
-                        const face& facePoints(mesh.faces()[segFace]);
-
-                        forAll(facePoints, fP)
-                        {
-                            const label facePoint(facePoints[fP]);
-
-                            if
-                            (
-                                findIndex
-                                (
-                                    meshPointsOnThisSegment,
-                                    facePoint
-                                )
-                             ==
-                                -1
-                            )
-                            {
-                                meshPointsOnThisSegment.append(facePoint);
-                            }
-                        }
-                    }
-
-                    meshEdgesOnThisSegment.shrink();
-
-                    meshPointsOnThisSegment.shrink();
-
-                    if (iterationNo == 0)
-                    {
-                        // Assessing real cells in range is only required on
-                        // the 1st iteration because they do not change from
-                        // iteration to iteration.
-
-                        labelList realCellsFoundInRange
-                        (
-                            il_.realCellsInRangeOfSegment
-                            (
-                                meshFacesOnThisSegment,
-                                meshEdgesOnThisSegment,
-                                meshPointsOnThisSegment
-                            )
-                        );
-
-                        forAll(realCellsFoundInRange,cFIR)
-                        {
-                            const label realCell = realCellsFoundInRange[cFIR];
-
-                            referredCell cellToRefer
-                            (
-                                mesh,
-                                Pstream::myProcNo(),
-                                realCell,
-                                patch.faceCentres()[patch.size()/2],
-                                patch.faceCentres()[0],
-                                patch.faceNormals()[patch.size()/2],
-                                patch.faceNormals()[0]
-                            );
-
-                            // Test all existing referred and real cells to
-                            // check duplicates are not being made or cells
-                            // aren't being referred back onto themselves
-
-                            bool addCellToRefer = true;
-
-                            // Check if cellToRefer is an existing referred cell
-
-                            forAll(referredInteractionList, rIL)
-                            {
-                                if
-                                (
-                                    cellToRefer.duplicate
-                                    (
-                                        referredInteractionList[rIL]
-                                    )
-                                )
-                                {
-                                    addCellToRefer = false;
-
-                                    break;
-                                }
-                            }
-
-                            // Check for cellToRefer being referred back
-                            // ontop of a real cell
-
-                            if
-                            (
-                                cellToRefer.duplicate
-                                (
-                                    Pstream::myProcNo(),
-                                    mesh.nCells()
-                                )
-                            )
-                            {
-                                addCellToRefer = false;
-                            }
-
-                            if (addCellToRefer)
-                            {
-                                referredInteractionList.append(cellToRefer);
-                            }
-
-                            // add real cells found in range of cyclic patch
-                            // to whole mesh list
-
-                            if (findIndex (rCellsWRRP, realCell) == -1)
-                            {
-                                rCellsWRRP.append(realCell);
-                            }
-                        }
-                    }
-
-                    referredInteractionList.shrink();
-
-                    referredCellsFoundInRange =
-                        il_.referredCellsInRangeOfSegment
-                        (
-                            referredInteractionList,
-                            meshFacesOnThisSegment,
-                            meshEdgesOnThisSegment,
-                            meshPointsOnThisSegment
-                        );
-
-                    forAll(referredCellsFoundInRange,cFIR)
-                    {
-                        referredCell& existingRefCell =
-                            referredInteractionList
-                            [
-                                referredCellsFoundInRange[cFIR]
-                            ];
-
-                        referredCell cellToReRefer =
-                            existingRefCell.reRefer
-                            (
-                                patch.faceCentres()[patch.size()/2],
-                                patch.faceCentres()[0],
-                                patch.faceNormals()[patch.size()/2],
-                                patch.faceNormals()[0]
-                            );
-
-                        // Test all existing referred and real cells to check
-                        // duplicates are not being made or cells aren't being
-                        // referred back onto themselves
-
-                        bool addCellToReRefer = true;
-
-                        // Check if cellToRefer is an existing referred cell
-
-                        forAll(referredInteractionList, rIL)
-                        {
-                            if
-                            (
-                                cellToReRefer.duplicate
-                                (
-                                    referredInteractionList[rIL]
-                                )
-                            )
-                            {
-                                addCellToReRefer = false;
-
-                                break;
-                            }
-                        }
-
-                        // Check for cellToRefer being referred back
-                        // ontop of a real cell
-
-                        if
-                        (
-                            cellToReRefer.duplicate
-                            (
-                                Pstream::myProcNo(),
-                                mesh.nCells()
-                            )
-                        )
-                        {
-                            addCellToReRefer = false;
-                        }
-
-                        if (addCellToReRefer)
-                        {
-                            referredInteractionList.append(cellToReRefer);
-                        }
-                    }
-                }
-            }
-        }
-
-        if (Pstream::parRun())
-        {
-            labelList procPatches(mesh.globalData().processorPatches());
-
-            forAll(procPatches,pP)
-            {
-                const processorPolyPatch& patch =
-                    refCast<const processorPolyPatch>
-                    (
-                        mesh.boundaryMesh()[procPatches[pP]]
-                    );
-
-                DynamicList<referredCell> referredCellsToTransfer;
-
-                const vectorList& neighbFaceCentres =
-                    allNeighbourFaceCentres[pP];
-
-                const vectorList& neighbFaceAreas = allNeighbourFaceAreas[pP];
-
-                label nUP;
-
-                for
-                (
-                    nUP = -nUndecomposedPatches;
-                    nUP <= nUndecomposedPatches;
-                    nUP++
-                )
-                {
-                    // faceT is used to specify one face on this patch segment
-                    // that will be used to calculate the transformation values.
-                    // All faces are guaranteed to produce the same transform
-                    // because of the checks carried out at the start of the
-                    // function.  Setting to -1 until the 1st face on this
-                    // segment is found.
-
-                    label faceT = -1;
-
-                    DynamicList<label> meshFacesOnThisSegment;
-
-                    forAll(patch, faceI)
-                    {
-                        if (processorPatchSegmentMapping[pP][faceI] == nUP)
-                        {
-                            if (faceT == -1)
-                            {
-                                faceT = faceI;
-                            }
-
-                            meshFacesOnThisSegment.append
-                            (
-                                faceI + patch.start()
-                            );
-                        }
-                    }
-
-                    meshFacesOnThisSegment.shrink();
-
-                    DynamicList<label> meshEdgesOnThisSegment;
-
-                    DynamicList<label> meshPointsOnThisSegment;
-
-                    forAll(meshFacesOnThisSegment, mFOTS)
-                    {
-                        const label segFace = meshFacesOnThisSegment[mFOTS];
-
-                        const labelList& faceEdges = mesh.faceEdges()[segFace];
-
-                        forAll(faceEdges, fE)
-                        {
-                            const label faceEdge(faceEdges[fE]);
-
-                            if
-                            (
-                                findIndex
-                                (
-                                    meshEdgesOnThisSegment,
-                                    faceEdge
-                                )
-                             ==
-                                -1
-                            )
-                            {
-                                meshEdgesOnThisSegment.append(faceEdge);
-                            }
-                        }
-
-                        const face& facePoints(mesh.faces()[segFace]);
-
-                        forAll(facePoints, fP)
-                        {
-                            const label facePoint(facePoints[fP]);
-
-                            if
-                            (
-                                findIndex
-                                (
-                                    meshPointsOnThisSegment,
-                                    facePoint
-                                )
-                             ==
-                                -1
-                            )
-                            {
-                                meshPointsOnThisSegment.append(facePoint);
-                            }
-                        }
-                    }
-
-                    meshEdgesOnThisSegment.shrink();
-
-                    meshPointsOnThisSegment.shrink();
-
-                    if (meshFacesOnThisSegment.size())
-                    {
-                        if (faceT == -1)
-                        {
-                            FatalErrorIn
-                            (
-                                "referredCellList::buildReferredCellList(bool)"
-                            )   << "faceT == -1 encountered but "
-                                << meshFacesOnThisSegment.size()
-                                << " faces found on patch segment."
-                                << abort(FatalError);
-                        }
-
-                        if (iterationNo == 0)
-                        {
-                            // Assessing real cells in range is only required on
-                            // the 1st iteration because they do not change from
-                            // iteration to iteration.
-
-                            labelList realCellsFoundInRange
-                            (
-                                il_.realCellsInRangeOfSegment
-                                (
-                                    meshFacesOnThisSegment,
-                                    meshEdgesOnThisSegment,
-                                    meshPointsOnThisSegment
-                                )
-                            );
-
-                            forAll(realCellsFoundInRange,cFIR)
-                            {
-                                const label realCell =
-                                    realCellsFoundInRange[cFIR];
-
-                                referredCell cellToRefer
-                                (
-                                    mesh,
-                                    Pstream::myProcNo(),
-                                    realCell,
-                                    patch.faceCentres()[faceT],
-                                    neighbFaceCentres[faceT],
-                                    patch.faceNormals()[faceT],
-                                    neighbFaceAreas[faceT]
-                                    /(mag(neighbFaceAreas[faceT]) + VSMALL)
-                                );
-
-                                referredCellsToTransfer.append(cellToRefer);
-
-                                // add real cells found in range of processor
-                                // patch to whole mesh list
-
-                                if (findIndex (rCellsWRRP, realCell) == -1)
-                                {
-                                    rCellsWRRP.append(realCell);
-                                }
-                            }
-                        }
-
-                        referredInteractionList.shrink();
-
-                        labelList referredCellsFoundInRange
-                        (
-                            il_.referredCellsInRangeOfSegment
-                            (
-                                referredInteractionList,
-                                meshFacesOnThisSegment,
-                                meshEdgesOnThisSegment,
-                                meshPointsOnThisSegment
-                            )
-                        );
-
-                        forAll(referredCellsFoundInRange,cFIR)
-                        {
-                            referredCell& existingRefCell =
-                                referredInteractionList
-                                [
-                                    referredCellsFoundInRange[cFIR]
-                                ];
-
-                            referredCell cellToReRefer =
-                                existingRefCell.reRefer
-                                (
-                                    patch.faceCentres()[faceT],
-                                    neighbFaceCentres[faceT],
-                                    patch.faceNormals()[faceT],
-                                    neighbFaceAreas[faceT]
-                                    /(mag(neighbFaceAreas[faceT]) + VSMALL)
-                                );
-
-                            referredCellsToTransfer.append(cellToReRefer);
-                        }
-                    }
-                }
-
-                referredCellsToTransfer.shrink();
-
-                // Send these cells to the neighbouring processor.
-
-                {
-                    OPstream toNeighbProc
-                    (
-                        Pstream::blocking,
-                        patch.neighbProcNo()
-                    );
-
-                    toNeighbProc << referredCellsToTransfer;
-                }
-            }
-
-            forAll(procPatches,pP)
-            {
-                const processorPolyPatch& patch =
-                refCast<const processorPolyPatch>
-                (
-                    mesh.boundaryMesh()[procPatches[pP]]
-                );
-
-                // Receive the cells from neighbour
-
-                List<referredCell> referredCellsFromNeighbour(patch.size());
-
-                {
-                    IPstream fromNeighbProc
-                    (
-                        Pstream::blocking,
-                        patch.neighbProcNo()
-                    );
-
-                    fromNeighbProc >> referredCellsFromNeighbour;
-                }
-
-                // Check to see if they are duplicates, if not append
-                // them to the referredInteractionList
-
-                forAll(referredCellsFromNeighbour,rCFN)
-                {
-                    referredCell& cellToRefer =
-                    referredCellsFromNeighbour[rCFN];
-
-                    // Test all existing referred and real cells to check
-                    // duplicates are not being made or cells aren't being
-                    // referred back onto themselves
-
-                    bool addCellToRefer = true;
-
-                    // Check if cellToRefer is an existing referred cell
-
-                    forAll(referredInteractionList, rIL)
-                    {
-                        if (cellToRefer.duplicate(referredInteractionList[rIL]))
-                        {
-                            addCellToRefer = false;
-
-                            break;
-                        }
-                    }
-
-                    // Check for cellToRefer being referred back ontop of a real
-                    // cell
-
-                    if
-                    (
-                        cellToRefer.duplicate
-                        (
-                            Pstream::myProcNo(),
-                            mesh.nCells()
-                        )
-                    )
-                    {
-                        addCellToRefer = false;
-                    }
-
-                    if (addCellToRefer)
-                    {
-                        referredInteractionList.append(cellToRefer);
-                    }
-                }
-            }
-        }
-
-        if (iterationNo == 0)
-        {
-            // record all real cells in range of any referring patch (cyclic or
-            // processor) on the first iteration when the real cells are
-            // evaluated.
-
-            rCellsWRRP.shrink();
-
-            // construct {faces, edges, points}WithinRCutMaxOfAnyReferringPatch
-
-            forAll(rCellsWRRP, rCWR)
-            {
-                const label realCell(rCellsWRRP[rCWR]);
-
-                const labelList& rCFaces
-                (
-                    mesh.cells()[realCell]
-                );
-
-                forAll(rCFaces, rCF)
-                {
-                    const label f(rCFaces[rCF]);
-
-                    if (findIndex(rFacesWRRP,f) == -1)
-                    {
-                        rFacesWRRP.append(f);
-                    }
-                }
-
-                const labelList& rCEdges
-                (
-                    mesh.cellEdges()[realCell]
-                );
-
-                forAll(rCEdges, rCE)
-                {
-                    const label e(rCEdges[rCE]);
-
-                    if (findIndex(rEdgesWRRP,e) == -1)
-                    {
-                        rEdgesWRRP.append(e);
-                    }
-                }
-
-                const labelList& rCPoints
-                (
-                    mesh.cellPoints()[realCell]
-                );
-
-                forAll(rCPoints, rCP)
-                {
-                    const label p(rCPoints[rCP]);
-
-                    if (findIndex(rPointsWRRP,p) == -1)
-                    {
-                        rPointsWRRP.append(p);
-                    }
-                }
-            }
-
-            rFacesWRRP.shrink();
-
-            rEdgesWRRP.shrink();
-
-            rPointsWRRP.shrink();
-        }
-
-        iterationNo++;
-
-        cellsReferredThisIteration =
-            referredInteractionList.size() - refIntListStartSize;
-
-        reduce(cellsReferredThisIteration, sumOp<label>());
-
-        Info<< tab << "Cells added this iteration: "
-            << cellsReferredThisIteration << endl;
-    }
-
-    referredInteractionList.shrink();
-
-    //     Info<< "referredInteractionList.size() = "
-    //         << referredInteractionList.size() << endl;
-
-    //     forAll(referredInteractionList,rIL)
-    //     {
-    //         Info<< referredInteractionList[rIL];
-    //     }
-
-    (*this).setSize
-    (
-        referredInteractionList.size()
-    );
-
-    forAll(referredInteractionList, rIL)
-    {
-        (*this)[rIL] = referredInteractionList[rIL];
-    }
-
-    Info<< nl << "Finding real cells in range of referred cells" << endl;
-
-    forAll(*this, rC)
-    {
-        const polyMesh& mesh(il_.mesh());
-
-        referredCell& refCell = (*this)[rC];
-
-        DynamicList<label> realCellsFoundInRange;
-
-        const vectorList& refCellPoints = refCell.vertexPositions();
-
-        forAll(rFacesWRRP, rCF)
-        {
-            const label f(rFacesWRRP[rCF]);
-
-            if (il_.testPointFaceDistance(refCellPoints,f))
-            {
-                const label cellO(mesh.faceOwner()[f]);
-
-                if (findIndex(realCellsFoundInRange, cellO) == -1)
-                {
-                    realCellsFoundInRange.append(cellO);
-                }
-
-                if (mesh.isInternalFace(f))
-                {
-                    // boundary faces will not have neighbour information
-
-                    const label cellN(mesh.faceNeighbour()[f]);
-
-                    if (findIndex(realCellsFoundInRange, cellN) == -1)
-                    {
-                        realCellsFoundInRange.append(cellN);
-                    }
-                }
-            }
-        }
-
-        forAll(rPointsWRRP, rCP)
-        {
-            const label p(rPointsWRRP[rCP]);
-
-            if (il_.testPointFaceDistance(p,refCell))
-            {
-                const labelList& pCells(mesh.pointCells()[p]);
-
-                forAll(pCells, pC)
-                {
-                    const label cellI(pCells[pC]);
-
-                    if (findIndex(realCellsFoundInRange, cellI) == -1)
-                    {
-                        realCellsFoundInRange.append(cellI);
-                    }
-                }
-            }
-        }
-
-
-        const edgeList& refCellEdges = refCell.edges();
-
-        forAll(rEdgesWRRP, rCE)
-        {
-            const label edgeIIndex(rEdgesWRRP[rCE]);
-
-            const edge& eI(mesh.edges()[edgeIIndex]);
-
-            forAll(refCellEdges, rCE)
-            {
-                const edge& eJ(refCellEdges[rCE]);
-
-                if
-                (
-                    il_.testEdgeEdgeDistance
-                    (
-                        eI,
-                        refCellPoints[eJ.start()],
-                        refCellPoints[eJ.end()]
-                    )
-                )
-                {
-                    const labelList& eICells(mesh.edgeCells()[edgeIIndex]);
-
-                    forAll(eICells, eIC)
-                    {
-                        const label cellI(eICells[eIC]);
-
-                        if (findIndex(realCellsFoundInRange, cellI) == -1)
-                        {
-                            realCellsFoundInRange.append(cellI);
-                        }
-                    }
-                }
-            }
-        }
-
-//         scalar rCutMaxSqr = molCloud_.rCutMax()*molCloud_.rCutMax();
-//
-//         forAll(molCloud_.mesh().points(), pointIIndex)
-//         {
-//             const point& ptI
-//             (
-//                 molCloud_.mesh().points()[pointIIndex]
-//             );
-//
-//             forAll(refCellPoints, rCP)
-//             {
-//                 if (magSqr(ptI - refCellPoints[rCP]) <= rCutMaxSqr)
-//                 {
-//                     const labelList& ptICells
-//                     (
-//                         molCloud_.mesh().pointCells()[pointIIndex]
-//                     );
-//
-//                     forAll(ptICells, pIC)
-//                     {
-//                         const label cellI(ptICells[pIC]);
-//
-//                         if (findIndex(realCellsFoundInRange, cellI) == -1)
-//                         {
-//                             realCellsFoundInRange.append(cellI);
-//                         }
-//                     }
-//                 }
-//             }
-//         }
-
-        refCell.realCells() = realCellsFoundInRange.shrink();
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::referredCellList::referredCellList
-(
-    interactionLists& il,
-    bool pointPointListBuild
-)
-:
-    List<referredCell>(),
-    il_(il)
-{
-    buildReferredCellList(pointPointListBuild);
-}
-
-
-Foam::referredCellList::referredCellList(interactionLists& il)
-:
-    List<referredCell>(),
-    il_(il)
-{
-    Info<< "Read referredCellList from disk not implemented" << endl;
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::referredCellList::~referredCellList()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void Foam::referredCellList::referMolecules
-(
-    const List<DynamicList<molecule*> >& cellOccupancy
-)
-{
-    // Create referred molecules for sending using cell occupancy and
-    // cellSendingReferralLists
-
-    forAll(il_.cellSendingReferralLists(), cSRL)
-    {
-        const sendingReferralList& sRL
-        (
-            il_.cellSendingReferralLists()[cSRL]
-        );
-
-        List<DynamicList<referredMolecule> > molsToReferOut(sRL.size());
-
-        forAll(sRL, sRLI)
-        {
-            List<molecule*> realMols = cellOccupancy[sRL[sRLI]];
-
-            forAll(realMols, rM)
-            {
-                molecule* mol = realMols[rM];
-
-                molsToReferOut[sRLI].append
-                (
-                    referredMolecule
-                    (
-                        mol->id(),
-                        mol->position(),
-                        mol->sitePositions()
-                    )
-                );
-            }
-
-            molsToReferOut[sRLI].shrink();
-        }
-
-        // Send lists of referred molecules to other processors
-
-        if (sRL.destinationProc() != Pstream::myProcNo())
-        {
-            if (Pstream::parRun())
-            {
-                OPstream toInteractingProc
-                (
-                    Pstream::blocking,
-                    sRL.destinationProc()
-                );
-
-                toInteractingProc << molsToReferOut;
-            }
-        }
-        else
-        {
-            // Refer molecules directly for referred cells on the same
-            // processor.
-
-            const receivingReferralList& rRL
-            (
-                il_.cellReceivingReferralLists()[cSRL]
-            );
-
-            forAll(rRL, rRLI)
-            {
-                forAll(rRL[rRLI], rC)
-                {
-                    referredCell& refCellToRefMolsTo = (*this)[rRL[rRLI][rC]];
-
-                    refCellToRefMolsTo.referInMols(molsToReferOut[rRLI]);
-                }
-            }
-        }
-    }
-
-    // Receive referred molecule lists to and distribute to referredCells
-    // according tocellReceivingReferralLists, referredCells deal with the
-    // transformations themselves
-
-    forAll(il_.cellReceivingReferralLists(), cRRL)
-    {
-        const receivingReferralList& rRL
-        (
-            il_.cellReceivingReferralLists()[cRRL]
-        );
-
-        List<List<referredMolecule> > molsToReferIn(rRL.size());
-
-        if (rRL.sourceProc() != Pstream::myProcNo())
-        {
-            if (Pstream::parRun())
-            {
-                IPstream fromInteractingProc
-                (
-                    Pstream::blocking,
-                    rRL.sourceProc()
-                );
-
-                fromInteractingProc >> molsToReferIn;
-            }
-
-            forAll(rRL, rRLI)
-            {
-                forAll(rRL[rRLI], rC)
-                {
-                    referredCell& refCellToRefMolsTo = (*this)[rRL[rRLI][rC]];
-
-                    refCellToRefMolsTo.referInMols(molsToReferIn[rRLI]);
-                }
-            }
-        }
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellListI.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellListI.H
deleted file mode 100644
index cd8c8abc29..0000000000
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellListI.H
+++ /dev/null
@@ -1,34 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-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 3 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, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-inline const Foam::interactionLists& Foam::referredCellList::il() const
-{
-    return il_;
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H b/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H
index 9a7be0be73..eda25d00f7 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/calculateTransportProperties.H b/src/lagrangian/molecularDynamics/molecule/mdTools/calculateTransportProperties.H
index dd3ef6ec19..0311e077dd 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/calculateTransportProperties.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/calculateTransportProperties.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/createAutoCorrelationFunctions.H b/src/lagrangian/molecularDynamics/molecule/mdTools/createAutoCorrelationFunctions.H
index 98252978c2..ebe1781e6f 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/createAutoCorrelationFunctions.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/createAutoCorrelationFunctions.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H b/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
index 05569f0448..77ecb7a657 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H
index e069713b9a..247402bb9f 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressureVariables.H b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressureVariables.H
index f616907b6f..3c671ef11c 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressureVariables.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressureVariables.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureEquilibration.H b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureEquilibration.H
index 481a2979e6..a4a9133749 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureEquilibration.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureEquilibration.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C
index ecff600026..2af297c6ac 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -209,8 +209,20 @@ bool Foam::molecule::move(molecule::trackData& td)
 
 void Foam::molecule::transformProperties(const tensor& T)
 {
+    Particle<molecule>::transformProperties(T);
+
     Q_ = T & Q_;
 
+    v_ = transform(T, v_);
+
+    a_ = transform(T, a_);
+
+    pi_ = Q_.T() & transform(T, Q_ & pi_);
+
+    tau_ = Q_.T() & transform(T, Q_ & tau_);
+
+    rf_ = transform(T, rf_);
+
     sitePositions_ = position_ + (T & (sitePositions_ - position_));
 
     siteForces_ = T & siteForces_;
@@ -219,10 +231,14 @@ void Foam::molecule::transformProperties(const tensor& T)
 
 void Foam::molecule::transformProperties(const vector& separation)
 {
+    Particle<molecule>::transformProperties(separation);
+
     if (special_ == SPECIAL_TETHERED)
     {
         specialPosition_ += separation;
     }
+
+    sitePositions_ = sitePositions_ + separation;
 }
 
 
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H
index b33b7f785d..448cb0955b 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -182,13 +182,6 @@ private:
 
     // Private data
 
-        //- Be careful with the ordering of data.
-        //  It has an impact on binary transfer:
-        //    -# Put the largest data members 1st
-        //    -# Pair up labels,
-        //    -# Don't go scalar-label, scalar-label, because in 64bit mode,
-        //       the labels will be padded by 4bytes.
-
         tensor Q_;
 
         vector v_;
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H
index f1bd505acb..b759d4731b 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C
index 89a8d0d5cc..e7ac44a972 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,12 +60,12 @@ Foam::molecule::molecule
             is  >> pi_;
             is  >> tau_;
             is  >> siteForces_;
-            is  >> sitePositions_;
-            is  >> specialPosition_;
             potentialEnergy_ = readScalar(is);
             is  >> rf_;
             special_ = readLabel(is);
             id_ = readLabel(is);
+            is  >> sitePositions_;
+            is  >> specialPosition_;
         }
         else
         {
@@ -242,11 +242,17 @@ void Foam::molecule::writeFields(const Cloud<molecule>& mC)
     orientation2.write();
     orientation3.write();
 
-    const moleculeCloud& m = dynamic_cast<const moleculeCloud&>(mC);
-    m.writeXYZ
-    (
-        m.mesh().time().timePath() + "/lagrangian" + "/moleculeCloud.xmol"
-    );
+    Info<< "writeFields " << mC.name() << endl;
+
+    if (isA<moleculeCloud>(mC))
+    {
+        const moleculeCloud& m = dynamic_cast<const moleculeCloud&>(mC);
+
+        m.writeXYZ
+        (
+            m.mesh().time().timePath()/cloud::prefix/"moleculeCloud.xmol"
+        );
+    }
 }
 
 
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
index b329a9a45a..55f24f100f 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -123,23 +123,23 @@ void Foam::moleculeCloud::buildCellOccupancy()
     {
         cellOccupancy_[cO].shrink();
     }
-
-    il_.ril().referMolecules(cellOccupancy());
 }
 
 
 void Foam::moleculeCloud::calculatePairForce()
 {
-    iterator mol(this->begin());
+    PstreamBuffers pBufs(Pstream::nonBlocking);
+
+    // Start sending referred data
+    il_.sendReferredData(cellOccupancy(), pBufs);
+
+    molecule* molI = NULL;
+    molecule* molJ = NULL;
 
     {
         // Real-Real interactions
 
-        molecule* molI = &mol();
-
-        molecule* molJ = &mol();
-
-        const directInteractionList& dil(il_.dil());
+        const labelListList& dil = il_.dil();
 
         forAll(dil, d)
         {
@@ -149,54 +149,62 @@ void Foam::moleculeCloud::calculatePairForce()
 
                 forAll(dil[d], interactingCells)
                 {
-                    List< molecule* > cellJ =
-                    cellOccupancy_[dil[d][interactingCells]];
+                    List<molecule*> cellJ =
+                        cellOccupancy_[dil[d][interactingCells]];
 
                     forAll(cellJ, cellJMols)
                     {
                         molJ = cellJ[cellJMols];
 
-                        evaluatePair(molI, molJ);
+                        evaluatePair(*molI, *molJ);
                     }
                 }
 
-                forAll(cellOccupancy_[d],cellIOtherMols)
+                forAll(cellOccupancy_[d], cellIOtherMols)
                 {
                     molJ = cellOccupancy_[d][cellIOtherMols];
 
                     if (molJ > molI)
                     {
-                        evaluatePair(molI, molJ);
+                        evaluatePair(*molI, *molJ);
                     }
                 }
             }
         }
     }
 
+    // Receive referred data
+    il_.receiveReferredData(pBufs);
+
     {
         // Real-Referred interactions
 
-        molecule* molK = &mol();
+        const labelListList& ril = il_.ril();
 
-        referredCellList& ril(il_.ril());
+        List<IDLList<molecule> >& referredMols = il_.referredParticles();
 
         forAll(ril, r)
         {
-            const List<label>& realCells = ril[r].realCellsForInteraction();
+            const List<label>& realCells = ril[r];
 
-            forAll(ril[r], refMols)
+            IDLList<molecule>& refMols = referredMols[r];
+
+            forAllIter
+            (
+                IDLList<molecule>,
+                refMols,
+                refMol
+            )
             {
-                referredMolecule* molL(&(ril[r][refMols]));
-
                 forAll(realCells, rC)
                 {
-                    List<molecule*> cellK = cellOccupancy_[realCells[rC]];
+                    List<molecule*> cellI = cellOccupancy_[realCells[rC]];
 
-                    forAll(cellK, cellKMols)
+                    forAll(cellI, cellIMols)
                     {
-                        molK = cellK[cellKMols];
+                        molI = cellI[cellIMols];
 
-                        evaluatePair(molK, molL);
+                        evaluatePair(*molI, refMol());
                     }
                 }
             }
@@ -259,18 +267,14 @@ void Foam::moleculeCloud::removeHighEnergyOverlaps()
     buildCellOccupancy();
 
     // Real-Real interaction
-    iterator mol(this->begin());
+
+    molecule* molI = NULL;
+    molecule* molJ = NULL;
 
     {
-        mol = this->begin();
-
-        molecule* molI = &mol();
-
-        molecule* molJ = &mol();
-
         DynamicList<molecule*> molsToDelete;
 
-        const directInteractionList& dil(il_.dil());
+        const labelListList& dil(il_.dil());
 
         forAll(dil, d)
         {
@@ -280,14 +284,14 @@ void Foam::moleculeCloud::removeHighEnergyOverlaps()
 
                 forAll(dil[d], interactingCells)
                 {
-                    List< molecule* > cellJ =
-                    cellOccupancy_[dil[d][interactingCells]];
+                    List<molecule*> cellJ =
+                        cellOccupancy_[dil[d][interactingCells]];
 
                     forAll(cellJ, cellJMols)
                     {
                         molJ = cellJ[cellJMols];
 
-                        if (evaluatePotentialLimit(molI, molJ))
+                        if (evaluatePotentialLimit(*molI, *molJ))
                         {
                             label idI = molI->id();
 
@@ -297,7 +301,7 @@ void Foam::moleculeCloud::removeHighEnergyOverlaps()
                             (
                                 idI == idJ
                              || findIndex(pot_.removalOrder(), idJ)
-                                < findIndex(pot_.removalOrder(), idI)
+                              < findIndex(pot_.removalOrder(), idI)
                             )
                             {
                                 if (findIndex(molsToDelete, molJ) == -1)
@@ -314,13 +318,13 @@ void Foam::moleculeCloud::removeHighEnergyOverlaps()
                 }
             }
 
-            forAll(cellOccupancy_[d],cellIOtherMols)
+            forAll(cellOccupancy_[d], cellIOtherMols)
             {
                 molJ = cellOccupancy_[d][cellIOtherMols];
 
                 if (molJ > molI)
                 {
-                    if (evaluatePotentialLimit(molI, molJ))
+                    if (evaluatePotentialLimit(*molI, *molJ))
                     {
                         label idI = molI->id();
 
@@ -330,7 +334,7 @@ void Foam::moleculeCloud::removeHighEnergyOverlaps()
                         (
                             idI == idJ
                          || findIndex(pot_.removalOrder(), idJ)
-                            < findIndex(pot_.removalOrder(), idI)
+                          < findIndex(pot_.removalOrder(), idI)
                         )
                         {
                             if (findIndex(molsToDelete, molJ) == -1)
@@ -355,79 +359,81 @@ void Foam::moleculeCloud::removeHighEnergyOverlaps()
 
     buildCellOccupancy();
 
+    PstreamBuffers pBufs(Pstream::nonBlocking);
+
+    // Start sending referred data
+    il_.sendReferredData(cellOccupancy(), pBufs);
+
+        // Receive referred data
+    il_.receiveReferredData(pBufs);
+
     // Real-Referred interaction
 
     {
-        molecule* molK = &mol();
-
         DynamicList<molecule*> molsToDelete;
 
-        referredCellList& ril(il_.ril());
+        const labelListList& ril(il_.ril());
+
+        List<IDLList<molecule> >& referredMols = il_.referredParticles();
 
         forAll(ril, r)
         {
-            referredCell& refCell = ril[r];
+            IDLList<molecule>& refMols = referredMols[r];
 
-            forAll(refCell, refMols)
+            forAllIter
+            (
+                IDLList<molecule>,
+                refMols,
+                refMol
+            )
             {
-                referredMolecule* molL = &(refCell[refMols]);
+                molJ = &refMol();
 
-                List <label> realCells = refCell.realCellsForInteraction();
+                const List<label>& realCells = ril[r];
 
                 forAll(realCells, rC)
                 {
-                    label cellK = realCells[rC];
+                    label cellI = realCells[rC];
 
-                    List<molecule*> cellKMols = cellOccupancy_[cellK];
+                    List<molecule*> cellIMols = cellOccupancy_[cellI];
 
-                    forAll(cellKMols, cKM)
+                    forAll(cellIMols, cIM)
                     {
-                        molK = cellKMols[cKM];
+                        molI = cellIMols[cIM];
 
-                        if (evaluatePotentialLimit(molK, molL))
+                        if (evaluatePotentialLimit(*molI, *molJ))
                         {
-                            label idK = molK->id();
+                            label idI = molI->id();
 
-                            label idL = molL->id();
+                            label idJ = molJ->id();
 
                             if
                             (
-                                findIndex(pot_.removalOrder(), idK)
-                                    < findIndex(pot_.removalOrder(), idL)
+                                findIndex(pot_.removalOrder(), idI)
+                              < findIndex(pot_.removalOrder(), idJ)
                             )
                             {
-                                if (findIndex(molsToDelete, molK) == -1)
+                                if (findIndex(molsToDelete, molI) == -1)
                                 {
-                                    molsToDelete.append(molK);
+                                    molsToDelete.append(molI);
                                 }
                             }
-
                             else if
                             (
-                                findIndex(pot_.removalOrder(), idK)
-                                    == findIndex(pot_.removalOrder(), idL)
+                                findIndex(pot_.removalOrder(), idI)
+                             == findIndex(pot_.removalOrder(), idJ)
                             )
                             {
-                                if
-                                (
-                                    Pstream::myProcNo() == refCell.sourceProc()
-                                 && cellK <= refCell.sourceCell()
-                                )
-                                {
-                                    if (findIndex(molsToDelete, molK) == -1)
-                                    {
-                                        molsToDelete.append(molK);
-                                    }
-                                }
+                                // Remove one of the molecules
+                                // arbitrarily, assuring that a
+                                // consistent decision is made for
+                                // both real-referred pairs.
 
-                                else if
-                                (
-                                    Pstream::myProcNo() < refCell.sourceProc()
-                                )
+                                if (molI->origId() > molJ->origId())
                                 {
-                                    if (findIndex(molsToDelete, molK) == -1)
+                                    if (findIndex(molsToDelete, molI) == -1)
                                     {
-                                        molsToDelete.append(molK);
+                                        molsToDelete.append(molI);
                                     }
                                 }
                             }
@@ -445,6 +451,12 @@ void Foam::moleculeCloud::removeHighEnergyOverlaps()
 
     buildCellOccupancy();
 
+    // Start sending referred data
+    il_.sendReferredData(cellOccupancy(), pBufs);
+
+    // Receive referred data
+    il_.receiveReferredData(pBufs);
+
     label molsRemoved = initialSize - this->size();
 
     if (Pstream::parRun())
@@ -713,19 +725,22 @@ void Foam::moleculeCloud::initialiseMolecules
                             label id = findIndex(pot_.idList(), latticeIds[p]);
 
                             const vector& latticePosition =
-                            vector
-                            (
-                                unitCellLatticePosition.x(),
-                                unitCellLatticePosition.y(),
-                                unitCellLatticePosition.z()
-                            )
-                            + latticePositions[p];
+                                vector
+                                (
+                                    unitCellLatticePosition.x(),
+                                    unitCellLatticePosition.y(),
+                                    unitCellLatticePosition.z()
+                                )
+                              + latticePositions[p];
 
                             point globalPosition =
-                            anchor + (R & (latticeCellShape & latticePosition));
+                                anchor
+                              + (R & (latticeCellShape & latticePosition));
 
-                            partOfLayerInBounds =
-                            mesh_.bounds().contains(globalPosition);
+                            partOfLayerInBounds = mesh_.bounds().contains
+                            (
+                                globalPosition
+                            );
 
                             label cell = mesh_.findCell(globalPosition);
 
@@ -779,20 +794,29 @@ void Foam::moleculeCloud::initialiseMolecules
                                         );
 
                                         const vector& latticePosition =
-                                        vector
-                                        (
-                                            unitCellLatticePosition.x(),
-                                            unitCellLatticePosition.y(),
-                                            unitCellLatticePosition.z()
-                                        )
-                                        + latticePositions[p];
+                                            vector
+                                            (
+                                                unitCellLatticePosition.x(),
+                                                unitCellLatticePosition.y(),
+                                                unitCellLatticePosition.z()
+                                            )
+                                          + latticePositions[p];
 
-                                        point globalPosition = anchor
-                                        + (R
-                                        &(latticeCellShape & latticePosition));
+                                        point globalPosition =
+                                            anchor
+                                          + (
+                                                R
+                                              & (
+                                                    latticeCellShape
+                                                  & latticePosition
+                                                )
+                                            );
 
                                         partOfLayerInBounds =
-                                        mesh_.bounds().contains(globalPosition);
+                                            mesh_.bounds().contains
+                                            (
+                                                globalPosition
+                                            );
 
                                         label cell = mesh_.findCell
                                         (
@@ -840,20 +864,29 @@ void Foam::moleculeCloud::initialiseMolecules
                                         );
 
                                         const vector& latticePosition =
-                                        vector
-                                        (
-                                            unitCellLatticePosition.x(),
-                                            unitCellLatticePosition.y(),
-                                            unitCellLatticePosition.z()
-                                        )
-                                        + latticePositions[p];
+                                            vector
+                                            (
+                                                unitCellLatticePosition.x(),
+                                                unitCellLatticePosition.y(),
+                                                unitCellLatticePosition.z()
+                                            )
+                                          + latticePositions[p];
 
-                                        point globalPosition = anchor
-                                        + (R
-                                        &(latticeCellShape & latticePosition));
+                                        point globalPosition =
+                                            anchor
+                                          + (
+                                                R
+                                              & (
+                                                   latticeCellShape
+                                                 & latticePosition
+                                                )
+                                            );
 
                                         partOfLayerInBounds =
-                                        mesh_.bounds().contains(globalPosition);
+                                            mesh_.bounds().contains
+                                            (
+                                                globalPosition
+                                            );
 
                                         label cell = mesh_.findCell
                                         (
@@ -875,12 +908,12 @@ void Foam::moleculeCloud::initialiseMolecules
                                     }
 
                                     unitCellLatticePosition =
-                                    labelVector
-                                    (
-                                        - unitCellLatticePosition.y(),
-                                        unitCellLatticePosition.x(),
-                                        unitCellLatticePosition.z()
-                                    );
+                                        labelVector
+                                        (
+                                          - unitCellLatticePosition.y(),
+                                            unitCellLatticePosition.x(),
+                                            unitCellLatticePosition.z()
+                                        );
                                 }
                             }
                         }
@@ -913,7 +946,7 @@ void Foam::moleculeCloud::initialiseMolecules
                     }
 
                     molsPlacedThisIteration =
-                    this->size() - sizeBeforeIteration;
+                        this->size() - sizeBeforeIteration;
 
                     totalZoneMols += molsPlacedThisIteration;
 
@@ -1041,7 +1074,7 @@ Foam::moleculeCloud::moleculeCloud
     mesh_(mesh),
     pot_(pot),
     cellOccupancy_(mesh_.nCells()),
-    il_(mesh_, pot_.pairPotentials().rCutMaxSqr(), false),
+    il_(mesh_, pot_.pairPotentials().rCutMax(), true),
     constPropList_(),
     rndGen_(clock::getTime())
 {
@@ -1071,7 +1104,7 @@ Foam::moleculeCloud::moleculeCloud
     Cloud<molecule>(mesh, "moleculeCloud", false),
     mesh_(mesh),
     pot_(pot),
-    il_(mesh_),
+    il_(mesh_, 0.0, false),
     constPropList_(),
     rndGen_(clock::getTime())
 {
@@ -1137,7 +1170,7 @@ void Foam::moleculeCloud::applyConstraintsAndThermostats
 )
 {
     scalar temperatureCorrectionFactor =
-        sqrt(targetTemperature/measuredTemperature);
+        sqrt(targetTemperature/max(VSMALL, measuredTemperature));
 
     Info<< "----------------------------------------" << nl
         << "Temperature equilibration" << nl
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.H b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.H
index b3c7afd5e0..b92f4e5e7b 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.H
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ SourceFiles
 #include "molecule.H"
 #include "IOdictionary.H"
 #include "potential.H"
-#include "interactionLists.H"
+#include "InteractionLists.H"
 #include "labelVector.H"
 #include "Random.H"
 #include "fileName.H"
@@ -69,7 +69,7 @@ private:
 
         List<DynamicList<molecule*> > cellOccupancy_;
 
-        interactionLists il_;
+        InteractionLists<molecule> il_;
 
         List<molecule::constantProperties> constPropList_;
 
@@ -89,26 +89,14 @@ private:
 
         inline void evaluatePair
         (
-            molecule* molI,
-            molecule* molJ
-        );
-
-        inline void evaluatePair
-        (
-            molecule* molReal,
-            referredMolecule* molRef
+            molecule& molI,
+            molecule& molJ
         );
 
         inline bool evaluatePotentialLimit
         (
-            molecule* molI,
-            molecule* molJ
-        ) const;
-
-        inline bool evaluatePotentialLimit
-        (
-            molecule* molReal,
-            referredMolecule* molRef
+            molecule& molI,
+            molecule& molJ
         ) const;
 
         void calculateTetherForce();
@@ -197,7 +185,7 @@ public:
 
             inline const List<DynamicList<molecule*> >& cellOccupancy() const;
 
-            inline const interactionLists& il() const;
+            inline const InteractionLists<molecule>& il() const;
 
             inline const List<molecule::constantProperties> constProps() const;
 
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H
index 33627b0348..dbeee755a5 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,17 +31,17 @@ using namespace Foam::constant;
 
 inline void Foam::moleculeCloud::evaluatePair
 (
-    molecule* molI,
-    molecule* molJ
+    molecule& molI,
+    molecule& molJ
 )
 {
     const pairPotentialList& pairPot = pot_.pairPotentials();
 
     const pairPotential& electrostatic = pairPot.electrostatic();
 
-    label idI = molI->id();
+    label idI = molI.id();
 
-    label idJ = molJ->id();
+    label idJ = molJ.id();
 
     const molecule::constantProperties& constPropI(constProps(idI));
 
@@ -70,7 +70,7 @@ inline void Foam::moleculeCloud::evaluatePair
             if (pairPotentialSitesI[sI] && pairPotentialSitesJ[sJ])
             {
                 vector rsIsJ =
-                    molI->sitePositions()[sI] - molJ->sitePositions()[sJ];
+                    molI.sitePositions()[sI] - molJ.sitePositions()[sJ];
 
                 scalar rsIsJMagSq = magSqr(rsIsJ);
 
@@ -82,38 +82,34 @@ inline void Foam::moleculeCloud::evaluatePair
                         (rsIsJ/rsIsJMag)
                        *pairPot.force(idsI, idsJ, rsIsJMag);
 
-                    molI->siteForces()[sI] += fsIsJ;
+                    molI.siteForces()[sI] += fsIsJ;
 
-                    molJ->siteForces()[sJ] += -fsIsJ;
+                    molJ.siteForces()[sJ] += -fsIsJ;
 
                     scalar potentialEnergy
                     (
                         pairPot.energy(idsI, idsJ, rsIsJMag)
                     );
 
-                    molI->potentialEnergy() += 0.5*potentialEnergy;
+                    molI.potentialEnergy() += 0.5*potentialEnergy;
 
-                    molJ->potentialEnergy() += 0.5*potentialEnergy;
+                    molJ.potentialEnergy() += 0.5*potentialEnergy;
 
-                    vector rIJ = molI->position() - molJ->position();
+                    vector rIJ = molI.position() - molJ.position();
 
                     tensor virialContribution =
                         (rsIsJ*fsIsJ)*(rsIsJ & rIJ)/rsIsJMagSq;
 
-                    molI->rf() += virialContribution;
+                    molI.rf() += virialContribution;
 
-                    molJ->rf() += virialContribution;
-
-                    // molI->rf() += rsIsJ * fsIsJ;
-
-                    // molJ->rf() += rsIsJ * fsIsJ;
+                    molJ.rf() += virialContribution;
                 }
             }
 
             if (electrostaticSitesI[sI] && electrostaticSitesJ[sJ])
             {
                 vector rsIsJ =
-                molI->sitePositions()[sI] - molJ->sitePositions()[sJ];
+                molI.sitePositions()[sI] - molJ.sitePositions()[sJ];
 
                 scalar rsIsJMagSq = magSqr(rsIsJ);
 
@@ -129,149 +125,26 @@ inline void Foam::moleculeCloud::evaluatePair
                         (rsIsJ/rsIsJMag)
                        *chargeI*chargeJ*electrostatic.force(rsIsJMag);
 
-                    molI->siteForces()[sI] += fsIsJ;
+                    molI.siteForces()[sI] += fsIsJ;
 
-                    molJ->siteForces()[sJ] += -fsIsJ;
+                    molJ.siteForces()[sJ] += -fsIsJ;
 
                     scalar potentialEnergy =
                         chargeI*chargeJ
                        *electrostatic.energy(rsIsJMag);
 
-                    molI->potentialEnergy() += 0.5*potentialEnergy;
+                    molI.potentialEnergy() += 0.5*potentialEnergy;
 
-                    molJ->potentialEnergy() += 0.5*potentialEnergy;
+                    molJ.potentialEnergy() += 0.5*potentialEnergy;
 
-                    vector rIJ = molI->position() - molJ->position();
+                    vector rIJ = molI.position() - molJ.position();
 
                     tensor virialContribution =
                         (rsIsJ*fsIsJ)*(rsIsJ & rIJ)/rsIsJMagSq;
 
-                    molI->rf() += virialContribution;
+                    molI.rf() += virialContribution;
 
-                    molJ->rf() += virialContribution;
-
-                    // molI->rf() += rsIsJ * fsIsJ;
-
-                    // molJ->rf() += rsIsJ * fsIsJ;
-                }
-            }
-        }
-    }
-}
-
-
-inline void Foam::moleculeCloud::evaluatePair
-(
-    molecule* molReal,
-    referredMolecule* molRef
-)
-{
-    const pairPotentialList& pairPot = pot_.pairPotentials();
-
-    const pairPotential& electrostatic = pairPot.electrostatic();
-
-    label idReal = molReal->id();
-
-    label idRef = molRef->id();
-
-    const molecule::constantProperties& constPropReal(constProps(idReal));
-
-    const molecule::constantProperties& constPropRef(constProps(idRef));
-
-    List<label> siteIdsReal = constPropReal.siteIds();
-
-    List<label> siteIdsRef = constPropRef.siteIds();
-
-    List<bool> pairPotentialSitesReal = constPropReal.pairPotentialSites();
-
-    List<bool> electrostaticSitesReal = constPropReal.electrostaticSites();
-
-    List<bool> pairPotentialSitesRef = constPropRef.pairPotentialSites();
-
-    List<bool> electrostaticSitesRef = constPropRef.electrostaticSites();
-
-    forAll(siteIdsReal, sReal)
-    {
-        label idsReal(siteIdsReal[sReal]);
-
-        forAll(siteIdsRef, sRef)
-        {
-            label idsRef(siteIdsRef[sRef]);
-
-            if (pairPotentialSitesReal[sReal] && pairPotentialSitesRef[sRef])
-            {
-                vector rsRealsRef =
-                    molReal->sitePositions()[sReal]
-                  - molRef->sitePositions()[sRef];
-
-                scalar rsRealsRefMagSq = magSqr(rsRealsRef);
-
-                if (pairPot.rCutSqr(idsReal, idsRef, rsRealsRefMagSq))
-                {
-                    scalar rsRealsRefMag = mag(rsRealsRef);
-
-                    vector fsRealsRef =
-                        (rsRealsRef/rsRealsRefMag)
-                       *pairPot.force(idsReal, idsRef, rsRealsRefMag);
-
-                    molReal->siteForces()[sReal] += fsRealsRef;
-
-                    scalar potentialEnergy
-                    (
-                        pairPot.energy(idsReal, idsRef, rsRealsRefMag)
-                    );
-
-                    molReal->potentialEnergy() += 0.5*potentialEnergy;
-
-                    vector rRealRef = molReal->position() - molRef->position();
-
-                    molReal->rf() +=
-                        (rsRealsRef*fsRealsRef)
-                       *(rsRealsRef & rRealRef)
-                       /rsRealsRefMagSq;
-
-                    // molReal->rf() += rsRealsRef * fsRealsRef;
-
-                }
-            }
-
-            if (electrostaticSitesReal[sReal] && electrostaticSitesRef[sRef])
-            {
-                vector rsRealsRef =
-                    molReal->sitePositions()[sReal]
-                  - molRef->sitePositions()[sRef];
-
-                scalar rsRealsRefMagSq = magSqr(rsRealsRef);
-
-                if (rsRealsRefMagSq <= electrostatic.rCutSqr())
-                {
-                    scalar rsRealsRefMag = mag(rsRealsRef);
-
-                    scalar chargeReal = constPropReal.siteCharges()[sReal];
-
-                    scalar chargeRef = constPropRef.siteCharges()[sRef];
-
-                    vector fsRealsRef =
-                        (rsRealsRef/rsRealsRefMag)
-                       *chargeReal*chargeRef
-                       *electrostatic.force(rsRealsRefMag);
-
-                    molReal->siteForces()[sReal] += fsRealsRef;
-
-                    scalar potentialEnergy =
-                        chargeReal*chargeRef
-                       *electrostatic.energy(rsRealsRefMag);
-
-                    molReal->potentialEnergy() += 0.5*potentialEnergy;
-
-                    vector rRealRef = molReal->position() - molRef->position();
-
-                    molReal->rf() +=
-                        (rsRealsRef*fsRealsRef)
-                       *(rsRealsRef & rRealRef)
-                       /rsRealsRefMagSq;
-
-                    // molReal->rf() += rsRealsRef * fsRealsRef;
+                    molJ.rf() += virialContribution;
                 }
             }
         }
@@ -281,17 +154,17 @@ inline void Foam::moleculeCloud::evaluatePair
 
 inline bool Foam::moleculeCloud::evaluatePotentialLimit
 (
-    molecule* molI,
-    molecule* molJ
+    molecule& molI,
+    molecule& molJ
 ) const
 {
     const pairPotentialList& pairPot = pot_.pairPotentials();
 
     const pairPotential& electrostatic = pairPot.electrostatic();
 
-    label idI = molI->id();
+    label idI = molI.id();
 
-    label idJ = molJ->id();
+    label idJ = molJ.id();
 
     const molecule::constantProperties& constPropI(constProps(idI));
 
@@ -320,7 +193,7 @@ inline bool Foam::moleculeCloud::evaluatePotentialLimit
             if (pairPotentialSitesI[sI] && pairPotentialSitesJ[sJ])
             {
                 vector rsIsJ =
-                    molI->sitePositions()[sI] - molJ->sitePositions()[sJ];
+                    molI.sitePositions()[sI] - molJ.sitePositions()[sJ];
 
                 scalar rsIsJMagSq = magSqr(rsIsJ);
 
@@ -369,7 +242,7 @@ inline bool Foam::moleculeCloud::evaluatePotentialLimit
             if (electrostaticSitesI[sI] && electrostaticSitesJ[sJ])
             {
                 vector rsIsJ =
-                    molI->sitePositions()[sI] - molJ->sitePositions()[sJ];
+                    molI.sitePositions()[sI] - molJ.sitePositions()[sJ];
 
                 scalar rsIsJMagSq = magSqr(rsIsJ);
 
@@ -422,157 +295,6 @@ inline bool Foam::moleculeCloud::evaluatePotentialLimit
 }
 
 
-inline bool Foam::moleculeCloud::evaluatePotentialLimit
-(
-    molecule* molReal,
-    referredMolecule* molRef
-) const
-{
-    const pairPotentialList& pairPot = pot_.pairPotentials();
-
-    const pairPotential& electrostatic = pairPot.electrostatic();
-
-    label idReal = molReal->id();
-
-    label idRef = molRef->id();
-
-    const molecule::constantProperties& constPropReal(constProps(idReal));
-
-    const molecule::constantProperties& constPropRef(constProps(idRef));
-
-    List<label> siteIdsReal = constPropReal.siteIds();
-
-    List<label> siteIdsRef = constPropRef.siteIds();
-
-    List<bool> pairPotentialSitesReal = constPropReal.pairPotentialSites();
-
-    List<bool> electrostaticSitesReal = constPropReal.electrostaticSites();
-
-    List<bool> pairPotentialSitesRef = constPropRef.pairPotentialSites();
-
-    List<bool> electrostaticSitesRef = constPropRef.electrostaticSites();
-
-    forAll(siteIdsReal, sReal)
-    {
-        label idsReal(siteIdsReal[sReal]);
-
-        forAll(siteIdsRef, sRef)
-        {
-            label idsRef(siteIdsRef[sRef]);
-
-            if (pairPotentialSitesReal[sReal] && pairPotentialSitesRef[sRef])
-            {
-                vector rsRealsRef =
-                    molReal->sitePositions()[sReal]
-                  - molRef->sitePositions()[sRef];
-
-                scalar rsRealsRefMagSq = magSqr(rsRealsRef);
-
-                if (pairPot.rCutSqr(idsReal, idsRef, rsRealsRefMagSq))
-                {
-                    scalar rsRealsRefMag = mag(rsRealsRef);
-
-                    // Guard against pairPot.energy being evaluated
-                    // if rRealRefMag < SMALL. A floating point exception will
-                    // happen otherwise.
-
-                    if (rsRealsRefMag < SMALL)
-                    {
-                        WarningIn("moleculeCloud::removeHighEnergyOverlaps()")
-                            << "Molecule site pair closer than "
-                            << SMALL
-                            << ": mag separation = " << rsRealsRefMag
-                            << ". These may have been placed on top of each"
-                            << " other by a rounding error in mdInitialise in"
-                            << " parallel or a block filled with molecules"
-                            << " twice. Removing one of the molecules."
-                            << endl;
-
-                        return true;
-                    }
-
-                    // Guard against pairPot.energy being evaluated if
-                    // rRealRefMag < rMin.  A tabulation lookup error will occur
-                    // otherwise.
-
-                    if (rsRealsRefMag < pairPot.rMin(idsReal, idsRef))
-                    {
-                        return true;
-                    }
-
-                    if
-                    (
-                        mag(pairPot.energy(idsReal, idsRef, rsRealsRefMag))
-                      > pot_.potentialEnergyLimit()
-                    )
-                    {
-                        return true;
-                    };
-                }
-            }
-
-            if (electrostaticSitesReal[sReal] && electrostaticSitesRef[sRef])
-            {
-                vector rsRealsRef =
-                    molReal->sitePositions()[sReal]
-                  - molRef->sitePositions()[sRef];
-
-                scalar rsRealsRefMagSq = magSqr(rsRealsRef);
-
-                if (pairPot.rCutMaxSqr(rsRealsRefMagSq))
-                {
-                    scalar rsRealsRefMag = mag(rsRealsRef);
-
-                    // Guard against pairPot.energy being evaluated
-                    // if rRealRefMag < SMALL. A floating point exception will
-                    // happen otherwise.
-
-                    if (rsRealsRefMag < SMALL)
-                    {
-                        WarningIn("moleculeCloud::removeHighEnergyOverlaps()")
-                            << "Molecule site pair closer than "
-                            << SMALL
-                            << ": mag separation = " << rsRealsRefMag
-                            << ". These may have been placed on top of each"
-                            << " other by a rounding error in mdInitialise in"
-                            << " parallel or a block filled with molecules"
-                            << " twice. Removing one of the molecules."
-                            << endl;
-
-                        return true;
-                    }
-
-                    if (rsRealsRefMag < electrostatic.rMin())
-                    {
-                        return true;
-                    }
-
-                    scalar chargeReal = constPropReal.siteCharges()[sReal];
-
-                    scalar chargeRef = constPropRef.siteCharges()[sRef];
-
-                    if
-                    (
-                        mag
-                        (
-                            chargeReal
-                           *chargeRef
-                           *electrostatic.energy(rsRealsRefMag)
-                        )
-                      > pot_.potentialEnergyLimit()
-                    )
-                    {
-                        return true;
-                    };
-                }
-            }
-        }
-    }
-
-    return false;
-}
-
-
 inline Foam::vector Foam::moleculeCloud::equipartitionLinearVelocity
 (
     scalar temperature,
@@ -638,7 +360,7 @@ inline const Foam::List<Foam::DynamicList<Foam::molecule*> >&
 }
 
 
-inline const Foam::interactionLists&
+inline const Foam::InteractionLists<Foam::molecule>&
     Foam::moleculeCloud::il() const
 {
     return il_;
diff --git a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.C b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.C
index 9239ce4123..cdcb1d4a65 100644
--- a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.C
+++ b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H
index 698ef30701..9445ff64da 100644
--- a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H
+++ b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnitsI.H b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnitsI.H
index 9504b9cab3..ec5fa23329 100644
--- a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnitsI.H
+++ b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnitsI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnitsIO.C b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnitsIO.C
index 56b3cdc1e5..6c7bd8f6f5 100644
--- a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnitsIO.C
+++ b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnitsIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/electrostaticPotential/electrostaticPotential.C b/src/lagrangian/molecularDynamics/potential/electrostaticPotential/electrostaticPotential.C
index 8fdcbd7753..bbf72146e1 100644
--- a/src/lagrangian/molecularDynamics/potential/electrostaticPotential/electrostaticPotential.C
+++ b/src/lagrangian/molecularDynamics/potential/electrostaticPotential/electrostaticPotential.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/electrostaticPotential/electrostaticPotential.H b/src/lagrangian/molecularDynamics/potential/electrostaticPotential/electrostaticPotential.H
index 653d229b9b..126a42d350 100644
--- a/src/lagrangian/molecularDynamics/potential/electrostaticPotential/electrostaticPotential.H
+++ b/src/lagrangian/molecularDynamics/potential/electrostaticPotential/electrostaticPotential.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.C b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.C
index ffbc850066..92e9723bcd 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.C
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H
index 11f211b664..42ef62022d 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunctionNew.C b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunctionNew.C
index 825f5985c1..9c9b669ef5 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunctionNew.C
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunctionNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.C b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.C
index 625b4c9010..3fb9f9226b 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.C
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.H b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.H
index 11ccd2884d..c77c07a793 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.H
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/noScaling/noScaling.C b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/noScaling/noScaling.C
index 6ba7b9d5a0..057f32f686 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/noScaling/noScaling.C
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/noScaling/noScaling.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/noScaling/noScaling.H b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/noScaling/noScaling.H
index 67f8131957..c266084c97 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/noScaling/noScaling.H
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/noScaling/noScaling.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.C b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.C
index 3f22c286e0..319d18392b 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.C
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H
index 14ed2f8d74..e49b0fce3f 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shiftedForce/shiftedForce.C b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shiftedForce/shiftedForce.C
index b7461b9d40..a4bd4a5291 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shiftedForce/shiftedForce.C
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shiftedForce/shiftedForce.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shiftedForce/shiftedForce.H b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shiftedForce/shiftedForce.H
index 0fa720703b..8fcc2be772 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shiftedForce/shiftedForce.H
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shiftedForce/shiftedForce.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.C b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.C
index 811576960e..c0f006e46c 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.C
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.H b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.H
index ee2e9059c0..83868e491e 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.H
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C
index 1e714d6cb1..2a8bf6bdbe 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H
index f7d62c755f..e89736e035 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialI.H b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialI.H
index 321924410a..1b1db7c8ca 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialI.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialIO.C b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialIO.C
index 33ac13e4fe..3d74e6c310 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialIO.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialNew.C b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialNew.C
index ab3069341c..981eb655ff 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialNew.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.C b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.C
index 02131174b0..c5b40128ce 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.H
index 29dce7f4c4..c52fdd36a8 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/coulomb/coulomb.C b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/coulomb/coulomb.C
index 82ad0ce2ec..c3effe0639 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/coulomb/coulomb.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/coulomb/coulomb.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/coulomb/coulomb.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/coulomb/coulomb.H
index 2db8d3bde3..08eb5c5596 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/coulomb/coulomb.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/coulomb/coulomb.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/dampedCoulomb/dampedCoulomb.C b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/dampedCoulomb/dampedCoulomb.C
index 23b66e36b6..82d073fc2e 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/dampedCoulomb/dampedCoulomb.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/dampedCoulomb/dampedCoulomb.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/dampedCoulomb/dampedCoulomb.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/dampedCoulomb/dampedCoulomb.H
index 7a0497a69e..a6e66c1aa2 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/dampedCoulomb/dampedCoulomb.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/dampedCoulomb/dampedCoulomb.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/exponentialRepulsion/exponentialRepulsion.C b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/exponentialRepulsion/exponentialRepulsion.C
index 14f279f2da..5342b0cfad 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/exponentialRepulsion/exponentialRepulsion.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/exponentialRepulsion/exponentialRepulsion.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/exponentialRepulsion/exponentialRepulsion.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/exponentialRepulsion/exponentialRepulsion.H
index 170d671221..fc0c9b0d5c 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/exponentialRepulsion/exponentialRepulsion.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/exponentialRepulsion/exponentialRepulsion.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.C b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.C
index bbd58e2c65..866b8e5bf1 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.H
index 2b5a16c49b..03c85d2184 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.C b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.C
index 9232f1d9c1..51cc941b77 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.H
index bd76b8259b..0d33cb2c1f 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/noInteraction/noInteraction.C b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/noInteraction/noInteraction.C
index 09aacd9f97..1994393d23 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/noInteraction/noInteraction.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/noInteraction/noInteraction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/noInteraction/noInteraction.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/noInteraction/noInteraction.H
index 44a5ab87cc..162a08c2db 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/noInteraction/noInteraction.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/noInteraction/noInteraction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.C b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.C
index 227bd1fa5d..4b4a0ad57c 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H
index 8aed64aa5c..db2f6e965c 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialListI.H b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialListI.H
index 5a3a5407ca..8657e9cfc8 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialListI.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialListI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/potential/potential.C b/src/lagrangian/molecularDynamics/potential/potential/potential.C
index 4b3475f66c..a54ef7f153 100644
--- a/src/lagrangian/molecularDynamics/potential/potential/potential.C
+++ b/src/lagrangian/molecularDynamics/potential/potential/potential.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/potential/potential.H b/src/lagrangian/molecularDynamics/potential/potential/potential.H
index 1ebf03a428..2aaebf25a5 100644
--- a/src/lagrangian/molecularDynamics/potential/potential/potential.H
+++ b/src/lagrangian/molecularDynamics/potential/potential/potential.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/potential/potentialI.H b/src/lagrangian/molecularDynamics/potential/potential/potentialI.H
index 16b9f74b0d..6f2a0f2d06 100644
--- a/src/lagrangian/molecularDynamics/potential/potential/potentialI.H
+++ b/src/lagrangian/molecularDynamics/potential/potential/potentialI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.C
index dd86b24d3a..8222274f20 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.C
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H
index b34beb19d6..78ab0aa927 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotentialNew.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotentialNew.C
index c206949dde..35cdef11d7 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotentialNew.C
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotentialNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.C
index 64721ab43d..bad1af9a9b 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.C
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.H
index c6f5eabca0..4e5b78de09 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.H
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.C
index 3fc50ecfbc..66a2e7feef 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.C
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.H
index 297516301b..52bb066758 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.H
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.C
index d22fc00548..ece3aff2aa 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.C
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.H
index 258e04a6be..ec4a8c8c12 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.H
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.C
index 1b8c39fcca..87fb5a205d 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.C
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H
index 1787092bf1..d862824f77 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialListI.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialListI.H
index f68b4499cb..e80c1a1dc4 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialListI.H
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialListI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/solidParticle/solidParticle.C b/src/lagrangian/solidParticle/solidParticle.C
index c5d356ea1b..37c8b4478c 100644
--- a/src/lagrangian/solidParticle/solidParticle.C
+++ b/src/lagrangian/solidParticle/solidParticle.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/solidParticle/solidParticle.H b/src/lagrangian/solidParticle/solidParticle.H
index ca05967b45..842b004532 100644
--- a/src/lagrangian/solidParticle/solidParticle.H
+++ b/src/lagrangian/solidParticle/solidParticle.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/solidParticle/solidParticleCloud.C b/src/lagrangian/solidParticle/solidParticleCloud.C
index 44c0c326d8..753b760b14 100644
--- a/src/lagrangian/solidParticle/solidParticleCloud.C
+++ b/src/lagrangian/solidParticle/solidParticleCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/solidParticle/solidParticleCloud.H b/src/lagrangian/solidParticle/solidParticleCloud.H
index 49c5771224..b4e87423b3 100644
--- a/src/lagrangian/solidParticle/solidParticleCloud.H
+++ b/src/lagrangian/solidParticle/solidParticleCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/solidParticle/solidParticleCloudI.H b/src/lagrangian/solidParticle/solidParticleCloudI.H
index 897c0fd883..db8b817901 100644
--- a/src/lagrangian/solidParticle/solidParticleCloudI.H
+++ b/src/lagrangian/solidParticle/solidParticleCloudI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/solidParticle/solidParticleI.H b/src/lagrangian/solidParticle/solidParticleI.H
index 99ca209bb0..a0af6bfad5 100644
--- a/src/lagrangian/solidParticle/solidParticleI.H
+++ b/src/lagrangian/solidParticle/solidParticleI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/solidParticle/solidParticleIO.C b/src/lagrangian/solidParticle/solidParticleIO.C
index 201a7020ea..564c2fa15d 100644
--- a/src/lagrangian/solidParticle/solidParticleIO.C
+++ b/src/lagrangian/solidParticle/solidParticleIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/parallel/decompose/decompositionMethods/Make/options b/src/parallel/decompose/decompositionMethods/Make/options
index 79be6f3a7d..30ba3a8df3 100644
--- a/src/parallel/decompose/decompositionMethods/Make/options
+++ b/src/parallel/decompose/decompositionMethods/Make/options
@@ -1,3 +1,4 @@
 EXE_INC =
 
 LIB_LIBS =
+
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C
index 704d48fe3e..7116fbf7c8 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C
@@ -101,10 +101,10 @@ Foam::sixDoFRigidBodyMotionRestraints::linearAxialAngularSpring::restrain
 
     // Removing any axis component from oldDir and newDir and normalising
     oldDir -= (axis_ & oldDir)*axis_;
-    oldDir /= mag(oldDir);
+    oldDir /= (mag(oldDir) + VSMALL);
 
     newDir -= (axis_ & newDir)*axis_;
-    newDir /= mag(newDir);
+    newDir /= (mag(newDir) + VSMALL);
 
     scalar theta = mag(acos(min(oldDir & newDir, 1.0)));
 
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.C
index 2a1edc1c55..2983a4d862 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.C
@@ -86,7 +86,7 @@ void Foam::sixDoFRigidBodyMotionRestraints::linearSpring::restrain
     scalar magR = mag(r);
 
     // r is now the r unit vector
-    r /= magR;
+    r /= (magR + VSMALL);
 
     vector v = motion.currentVelocity(restraintPosition);
 
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
index d24ac8d366..7151a8671b 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
@@ -103,10 +103,10 @@ Foam::sixDoFRigidBodyMotionRestraints::tabulatedAxialAngularSpring::restrain
 
     // Removing any axis component from oldDir and newDir and normalising
     oldDir -= (axis_ & oldDir)*axis_;
-    oldDir /= mag(oldDir);
+    oldDir /= (mag(oldDir) + VSMALL);
 
     newDir -= (axis_ & newDir)*axis_;
-    newDir /= mag(newDir);
+    newDir /= (mag(newDir) + VSMALL);
 
     scalar theta = mag(acos(min(oldDir & newDir, 1.0)));
 
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0/U b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0/U
new file mode 100644
index 0000000000..5e3b0435c4
--- /dev/null
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0/U
@@ -0,0 +1,37 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    periodicX
+    {
+        type            cyclic;
+    }
+    periodicY
+    {
+        type            cyclic;
+    }
+    periodicZ
+    {
+        type            cyclic;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0/U b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0/U
new file mode 100644
index 0000000000..5e3b0435c4
--- /dev/null
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0/U
@@ -0,0 +1,37 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    periodicX
+    {
+        type            cyclic;
+    }
+    periodicY
+    {
+        type            cyclic;
+    }
+    periodicZ
+    {
+        type            cyclic;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/0/U b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/0/U
new file mode 100644
index 0000000000..b9dc8a00f4
--- /dev/null
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/0/U
@@ -0,0 +1,55 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.6                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    sectionAEnd
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    sectionCEnd
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    front
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    back
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    top
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    bottom
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/README.txt b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/README.txt
deleted file mode 100644
index 647f11981d..0000000000
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/README.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-The 0/ field files contain nonsense patchFields. All interesting
-work is done using the changeDictionaryDicts.
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary
index 73459cea07..0ffd003789 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  1.6.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/controlDict
index ab5ba12ec3..9c7f38afcf 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/controlDict
@@ -15,8 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-libs            ("libOpenFOAM.so" "libcompressibleTurbulenceModel.so" "libcompressibleRASModels.so");
-
 application     chtMultiRegionSimpleFoam;
 
 startFrom       startTime;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/fvSolution
index fd0e7cced2..ddc551d45e 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/fvSolution
@@ -14,9 +14,4 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-PIMPLE
-{
-    nOuterCorrectors 1;
-}
-
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSchemes
index 74053b0ab3..aadaf61f87 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSchemes
@@ -16,7 +16,7 @@ FoamFile
 
 ddtSchemes
 {
-    default Euler;
+    default steadyState;
 }
 
 gradSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSolution
index 761c1632b1..5cf50f1f1e 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSolution
@@ -20,25 +20,14 @@ solvers
     {
         solver           PCG;
         preconditioner   DIC;
-        tolerance        1E-06;
-        relTol           0;
+        tolerance        1e-06;
+        relTol           0.1;
     }
 }
 
-PISO
-{
-    nNonOrthogonalCorrectors 1;
-}
-
-PIMPLE
-{
-    nNonOrthogonalCorrectors 1;
-}
-
 SIMPLE
 {
     nNonOrthogonalCorrectors 0;
-    //convergence             0.001;
 }
 
 relaxationFactors
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict
index 6e9192301d..5c811e6783 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/changeDictionaryDict
@@ -140,10 +140,7 @@ dictionaryReplacement
 
             maxX
             {
-                type            waveTransmissive;
-                gamma           1.4;
-                fieldInf        100000;
-                lInf            0.4;
+                type            fixedValue;
                 value           uniform 100000;
             }
         }
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes
index cedcc3c611..fde7982319 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSchemes
@@ -16,14 +16,12 @@ FoamFile
 
 ddtSchemes
 {
-    default Euler;
-    //default CoEuler phi rho 0.1;
+    default steadyState;
 }
 
 gradSchemes
 {
     default         Gauss linear;
-//    grad(U)         cellLimited Gauss linear 1;
 }
 
 divSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSolution
index 7638601aec..e620dcb652 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSolution
@@ -38,50 +38,13 @@ solvers
         mergeLevels      1;
     }
 
-    pFinal
-    {
-        $p;
-        tolerance        1e-8;
-        relTol           0;
-    }
-
-    U
+    "(U|h|k|epsilon)"
     {
         solver           PBiCG;
         preconditioner   DILU;
         tolerance        1e-08;
-        relTol           0;
-    }
-
-    h
-    {
-        $U;
-        tolerance        1e-08;
         relTol           0.1;
     }
-
-    "(hFinal|k|epsilon|R)"
-    {
-        $U;
-    }
-}
-
-PISO
-{
-    momentumPredictor   off;
-    nOuterCorrectors     1;
-    nCorrectors     2;
-    nNonOrthogonalCorrectors 1;
-    pRefPoint       (-0.081 -0.0257 8.01);
-    pRefValue       1e5;
-}
-
-
-PIMPLE
-{
-    momentumPredictor   on;
-    nCorrectors         2;
-    nNonOrthogonalCorrectors 0;
 }
 
 SIMPLE
@@ -89,8 +52,6 @@ SIMPLE
     nNonOrthogonalCorrectors 0;
     pRefCell                0;
     pRefValue               100000;
-
-    //convergence             0.001;
 }
 
 relaxationFactors
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
index a7c44e8f56..b7ba09e635 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
@@ -37,6 +37,8 @@ SurfaceReactionModel COxidationDiffusionLimitedRate;
 
 PostProcessingModel none;
 
+CollisionModel  none;
+
 SurfaceFilmModel none;
 
 radiation       on;
@@ -54,6 +56,8 @@ constantProperties
     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;
+    youngsModulus   youngsModulus [1 -1 -2 0 0] 2e9;
+    poissonsRatio   poissonsRatio [ 0 0 0 0 0 ] 0.35;
     T0              T0 [ 0 0 0 1 0 ] 300;
     cp0             cp0 [ 0 2 -2 -1 0 ] 4187;
     epsilon0        epsilon0 [ 0 0 0 0 0 ] 1;
@@ -84,9 +88,10 @@ integrationSchemes
 
 particleForces
 {
-    gravity         on;
-    virtualMass     off;
-    pressureGradient off;
+    gravity             on;
+    virtualMass         off;
+    pressureGradient    off;
+    paramagnetic        off;
 }
 
 ManualInjectionCoeffs
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
index c6c9779b01..03b1d5271d 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
@@ -29,6 +29,8 @@ HeatTransferModel RanzMarshall;
 
 PostProcessingModel none;
 
+CollisionModel  none;
+
 SurfaceFilmModel none;
 
 radiation       on;
@@ -45,6 +47,8 @@ constantProperties
     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;
+    youngsModulus   youngsModulus [1 -1 -2 0 0] 40e9;
+    poissonsRatio   poissonsRatio [ 0 0 0 0 0 ] 0.25;
     T0              T0 [ 0 0 0 1 0 ] 300;
     cp0             cp0 [ 0 2 -2 -1 0 ] 900;
     epsilon0        epsilon0 [ 0 0 0 0 0 ] 1;
@@ -69,9 +73,10 @@ integrationSchemes
 
 particleForces
 {
-    gravity         on;
-    virtualMass     off;
-    pressureGradient off;
+    gravity             on;
+    virtualMass         off;
+    pressureGradient    off;
+    paramagnetic        off;
 }
 
 ManualInjectionCoeffs
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
index 20dc89be48..70086f0b26 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
@@ -40,6 +40,8 @@ SurfaceReactionModel none;
 
 SurfaceFilmModel none;
 
+CollisionModel none;
+
 radiation       off;
 
 coupled         true;
@@ -54,6 +56,8 @@ constantProperties
     TMin            TMin [ 0 0 0 1 0 ] 200;
     pMin            pMin [ 1 -1 2 0 0 ] 1000;
     rho0            rho0 [ 1 -3 0 0 0 ] 1000;
+    youngsModulus   youngsModulus [1 -1 -2 0 0] 1e9;
+    poissonsRatio   poissonsRatio [ 0 0 0 0 0 ] 0.35;
     minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15;
     T0              T0 [ 0 0 0 1 0 ] 300;
     cp0             cp0 [ 0 2 -2 -1 0 ] 4100;
@@ -85,9 +89,10 @@ integrationSchemes
 
 particleForces
 {
-    gravity         on;
-    virtualMass     off;
-    pressureGradient off;
+    gravity             on;
+    virtualMass         off;
+    pressureGradient    off;
+    paramagnetic        off;
 }
 
 ManualInjectionCoeffs
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties
index 12b091f63c..67f7de5371 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties
@@ -39,6 +39,8 @@ PostProcessingModel none;
 
 SurfaceFilmModel none;
 
+CollisionModel none;
+
 radiation       off;
 
 coupled         false;
@@ -53,6 +55,8 @@ constantProperties
     TMin            TMin [ 0 0 0 1 0 ] 200;
     pMin            pMin [ 1 -1 2 0 0 ] 1000;
     rho0            rho0 [ 1 -3 0 0 0 ] 1000;
+    youngsModulus   youngsModulus [1 -1 -2 0 0] 1e9;
+    poissonsRatio   poissonsRatio [ 0 0 0 0 0 ] 0.35;
     minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15;
     T0              T0 [ 0 0 0 1 0 ] 350;
     cp0             cp0 [ 0 2 -2 -1 0 ] 4100;
@@ -89,6 +93,7 @@ particleForces
     Cvm             0.5;
     pressureGradient off;
     gradU           gradU;
+    paramagnetic    off;
 }
 
 ManualInjectionCoeffs
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index 55a8b87166..e02dcc7c24 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -39,6 +39,8 @@ PostProcessingModel PatchPostProcessing;
 
 SurfaceFilmModel none;
 
+CollisionModel none;
+
 radiation       off;
 
 coupled         true;
@@ -53,6 +55,8 @@ constantProperties
     TMin            TMin [ 0 0 0 1 0 ] 200;
     pMin            pMin [ 1 -1 2 0 0 ] 1000;
     rho0            rho0 [ 1 -3 0 0 0 ] 1000;
+    youngsModulus   youngsModulus [1 -1 -2 0 0] 1e9;
+    poissonsRatio   poissonsRatio [ 0 0 0 0 0 ] 0.35;
     minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15;
     T0              T0 [ 0 0 0 1 0 ] 350;
     cp0             cp0 [ 0 2 -2 -1 0 ] 4100;
@@ -89,6 +93,7 @@ particleForces
     Cvm             0.5;
     pressureGradient off;
     gradU           gradU;
+    paramagnetic    off;
 }
 
 PatchInjectionCoeffs
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties
index b5d97d02fe..a33c532939 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties
@@ -33,6 +33,8 @@ PhaseChangeModel none; // LiquidEvaporation;
 
 PostProcessingModel none;
 
+CollisionModel none;
+
 SurfaceFilmModel ThermoSurfaceFilm; // none;
 
 radiation       off;
@@ -49,6 +51,8 @@ constantProperties
     TMin            TMin [ 0 0 0 1 0 ] 200;
     pMin            pMin [ 1 -1 2 0 0 ] 1000;
     rho0            rho0 [ 1 -3 0 0 0 ] 1000;
+    youngsModulus   youngsModulus [1 -1 -2 0 0] 1e9;
+    poissonsRatio   poissonsRatio [ 0 0 0 0 0 ] 0.35;
     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;
@@ -78,9 +82,10 @@ integrationSchemes
 
 particleForces
 {
-    gravity         on;
-    virtualMass     off;
-    pressureGradient off;
+    gravity             on;
+    virtualMass         off;
+    pressureGradient    off;
+    paramagnetic        off;
 }
 
 ConeInjectionCoeffs
@@ -111,31 +116,31 @@ ConeInjectionCoeffs
 }
 
 ConeInjectionMPCoeffs
-{                    
+{
     SOI             0.000;
     duration        20.000;
     positionsFile   "reactingCloud1Positions";
-    axesFile        "reactingCloud1Axes";     
+    axesFile        "reactingCloud1Axes";
     massTotal       massTotal [ 1 0 0 0 0 ] 10;
-    parcelsPerInjector 20000;                                            
-    parcelsPerSecond 500;                                                
-    parcelBasisType mass;                                                
-    flowRateProfile constant 0.1;                                        
-    Umag            constant 3.0;                                        
-    thetaInner      constant 0;                                          
-    thetaOuter      constant 45;                                         
+    parcelsPerInjector 20000;
+    parcelsPerSecond 500;
+    parcelBasisType mass;
+    flowRateProfile constant 0.1;
+    Umag            constant 3.0;
+    thetaInner      constant 0;
+    thetaOuter      constant 45;
 
-    parcelPDF                           
-    {                                   
-        pdfType         RosinRammler;   
-        RosinRammlerPDF                 
-        {                               
-            minValue        5e-04;      
-            maxValue        0.0012;     
+    parcelPDF
+    {
+        pdfType         RosinRammler;
+        RosinRammlerPDF
+        {
+            minValue        5e-04;
+            maxValue        0.0012;
             d               7.5e-05;
-            n               0.5;    
-        }                               
-    }                                   
+            n               0.5;
+        }
+    }
 
 }
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/reactingCloud1Properties
index 2e26271ee0..45a08ccaf5 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/reactingCloud1Properties
@@ -33,6 +33,8 @@ PhaseChangeModel none;
 
 PostProcessingModel none;
 
+CollisionModel none;
+
 SurfaceFilmModel ThermoSurfaceFilm;
 
 radiation       off;
@@ -49,6 +51,8 @@ constantProperties
     TMin            TMin [ 0 0 0 1 0 ] 200;
     pMin            pMin [ 1 -1 2 0 0 ] 1000;
     rho0            rho0 [ 1 -3 0 0 0 ] 1000;
+    youngsModulus   youngsModulus [1 -1 -2 0 0] 1e9;
+    poissonsRatio   poissonsRatio [ 0 0 0 0 0 ] 0.35;
     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;
@@ -78,9 +82,10 @@ integrationSchemes
 
 particleForces
 {
-    gravity         on;
-    virtualMass     off;
-    pressureGradient off;
+    gravity             on;
+    virtualMass         off;
+    pressureGradient    off;
+    paramagnetic        off;
 }
 
 StandardWallInteractionCoeffs
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
index 73c151e4ae..bc9bfbdf0d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
@@ -33,6 +33,8 @@ PhaseChangeModel LiquidEvaporation;
 
 PostProcessingModel none;
 
+CollisionModel none;
+
 SurfaceFilmModel none;
 
 radiation       off;
@@ -49,6 +51,8 @@ constantProperties
     TMin            TMin [ 0 0 0 1 0 ] 200;
     pMin            pMin [ 1 -1 2 0 0 ] 1000;
     rho0            rho0 [ 1 -3 0 0 0 ] 1000;
+    youngsModulus   youngsModulus [1 -1 -2 0 0] 1e9;
+    poissonsRatio   poissonsRatio [ 0 0 0 0 0 ] 0.35;
     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;
@@ -78,9 +82,10 @@ integrationSchemes
 
 particleForces
 {
-    gravity         off;
-    virtualMass     off;
-    pressureGradient off;
+    gravity             off;
+    virtualMass         off;
+    pressureGradient    off;
+    paramagnetic        off;
 }
 
 ManualInjectionCoeffs
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties
index 50a06bdc51..68acab9a84 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties
@@ -29,6 +29,8 @@ PostProcessingModel none;
 
 SurfaceFilmModel none;
 
+CollisionModel none;
+
 coupled         true;
 
 cellValueSourceCorrection on;
@@ -40,6 +42,8 @@ constantProperties
     rhoMin          rhoMin [ 1 -3 0 0 0 ] 1e-15;
     minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15;
     rho0            rho0 [ 1 -3 0 0 0 ] 5000;
+    youngsModulus   youngsModulus [1 -1 -2 0 0] 1e9;
+    poissonsRatio   poissonsRatio [ 0 0 0 0 0 ] 0.35;
 }
 
 interpolationSchemes
@@ -56,9 +60,10 @@ integrationSchemes
 
 particleForces
 {
-    gravity         on;
-    virtualMass     off;
-    pressureGradient off;
+    gravity             on;
+    virtualMass         off;
+    pressureGradient    off;
+    paramagnetic        off;
 }
 
 ManualInjectionCoeffs
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties
index ff44ccbd8e..70568e78eb 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties
@@ -29,6 +29,8 @@ HeatTransferModel RanzMarshall;
 
 PostProcessingModel none;
 
+CollisionModel none;
+
 SurfaceFilmModel none;
 
 radiation       off;
@@ -45,6 +47,8 @@ constantProperties
     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;
+    youngsModulus   youngsModulus [1 -1 -2 0 0] 1e9;
+    poissonsRatio   poissonsRatio [ 0 0 0 0 0 ] 0.35;
     T0              T0 [ 0 0 0 1 0 ] 300;
     cp0             cp0 [ 0 2 -2 -1 0 ] 900;
     epsilon0        epsilon0 [ 0 0 0 0 0 ] 1;
@@ -69,9 +73,10 @@ integrationSchemes
 
 particleForces
 {
-    gravity         on;
-    virtualMass     off;
-    pressureGradient off;
+    gravity             on;
+    virtualMass         off;
+    pressureGradient    off;
+    paramagnetic        off;
 }
 
 ManualInjectionCoeffs