From 1845e2014d13cc2da6c68d7e1a725d1ebd90335e Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 20 Feb 2015 17:24:14 +0000
Subject: [PATCH] DSMC: Rationalization and addition of mapping support

---
 .../dsmc/dsmcFoam/Make/options                |   4 +-
 .../foamDebugSwitches/Make/options            |   2 +-
 .../miscellaneous/dsmcFieldsCalc/Make/options |   5 +-
 .../preProcessing/dsmcInitialise/Make/options |   4 +-
 src/lagrangian/Allwmake                       |   2 +-
 src/lagrangian/DSMC/Make/files                |  13 ++
 src/lagrangian/{dsmc => DSMC}/Make/options    |   0
 .../clouds/Templates/DSMCCloud/DSMCCloud.C}   | 103 ++++++++++-----
 .../clouds/Templates/DSMCCloud/DSMCCloud.H}   |  58 +++++----
 .../clouds/Templates/DSMCCloud/DSMCCloudI.H}  | 118 +++++++++---------
 .../DSMCBaseCloud/DSMCBaseCloud.C}            |  10 +-
 .../DSMCBaseCloud/DSMCBaseCloud.H}            |  26 ++--
 .../clouds/derived/dsmcCloud/dsmcCloud.H      |   6 +-
 .../Templates/DSMCParcel/DSMCParcel.C}        |  22 ++--
 .../Templates/DSMCParcel/DSMCParcel.H}        |  54 ++++----
 .../Templates/DSMCParcel/DSMCParcelI.H}       |  30 ++---
 .../Templates/DSMCParcel/DSMCParcelIO.C}      |  26 ++--
 .../derived/dsmcParcel/defineDSMCParcel.C}    |   8 +-
 .../parcels/derived/dsmcParcel/dsmcParcel.C   |   6 +-
 .../parcels/derived/dsmcParcel/dsmcParcel.H   |  52 ++++++++
 .../makeDSMCParcelBinaryCollisionModels.C}    |   8 +-
 .../makeDSMCParcelInflowBoundaryModels.C}     |   6 +-
 .../makeDSMCParcelWallInteractionModels.C}    |   6 +-
 .../BinaryCollisionModel.C                    |   2 +-
 .../BinaryCollisionModel.H                    |   2 +-
 .../BinaryCollisionModelNew.C                 |   2 +-
 .../LarsenBorgnakkeVariableHardSphere.C       |   2 +-
 .../LarsenBorgnakkeVariableHardSphere.H       |   2 +-
 .../NoBinaryCollision/NoBinaryCollision.C     |   2 +-
 .../NoBinaryCollision/NoBinaryCollision.H     |   2 +-
 .../VariableHardSphere/VariableHardSphere.C   |   2 +-
 .../VariableHardSphere/VariableHardSphere.H   |   2 +-
 .../FreeStream/FreeStream.C                   |  38 ++++--
 .../FreeStream/FreeStream.H                   |   7 +-
 .../InflowBoundaryModel/InflowBoundaryModel.C |   3 +-
 .../InflowBoundaryModel/InflowBoundaryModel.H |   8 +-
 .../InflowBoundaryModelNew.C                  |   2 +-
 .../InflowBoundaryModel/NoInflow/NoInflow.C   |   2 +-
 .../InflowBoundaryModel/NoInflow/NoInflow.H   |   2 +-
 .../MaxwellianThermal/MaxwellianThermal.C     |   2 +-
 .../MaxwellianThermal/MaxwellianThermal.H     |   2 +-
 .../MixedDiffuseSpecular.C                    |   2 +-
 .../MixedDiffuseSpecular.H                    |   2 +-
 .../SpecularReflection/SpecularReflection.C   |   2 +-
 .../SpecularReflection/SpecularReflection.H   |   2 +-
 .../WallInteractionModel.C                    |   3 +-
 .../WallInteractionModel.H                    |   2 +-
 .../WallInteractionModelNew.C                 |   2 +-
 src/lagrangian/dsmc/Make/files                |  13 --
 .../parcels/derived/dsmcParcel/dsmcParcel.H   | 112 -----------------
 .../functionObjects/utilities/Make/options    |   4 +-
 51 files changed, 404 insertions(+), 393 deletions(-)
 create mode 100644 src/lagrangian/DSMC/Make/files
 rename src/lagrangian/{dsmc => DSMC}/Make/options (100%)
 rename src/lagrangian/{dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C => DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C} (91%)
 rename src/lagrangian/{dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H => DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H} (92%)
 rename src/lagrangian/{dsmc/clouds/Templates/DsmcCloud/DsmcCloudI.H => DSMC/clouds/Templates/DSMCCloud/DSMCCloudI.H} (69%)
 rename src/lagrangian/{dsmc/clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.C => DSMC/clouds/baseClasses/DSMCBaseCloud/DSMCBaseCloud.C} (86%)
 rename src/lagrangian/{dsmc/clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.H => DSMC/clouds/baseClasses/DSMCBaseCloud/DSMCBaseCloud.H} (80%)
 rename src/lagrangian/{dsmc => DSMC}/clouds/derived/dsmcCloud/dsmcCloud.H (91%)
 rename src/lagrangian/{dsmc/parcels/Templates/DsmcParcel/DsmcParcel.C => DSMC/parcels/Templates/DSMCParcel/DSMCParcel.C} (91%)
 rename src/lagrangian/{dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H => DSMC/parcels/Templates/DSMCParcel/DSMCParcel.H} (87%)
 rename src/lagrangian/{dsmc/parcels/Templates/DsmcParcel/DsmcParcelI.H => DSMC/parcels/Templates/DSMCParcel/DSMCParcelI.H} (74%)
 rename src/lagrangian/{dsmc/parcels/Templates/DsmcParcel/DsmcParcelIO.C => DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C} (85%)
 rename src/lagrangian/{dsmc/parcels/derived/dsmcParcel/defineDsmcParcel.C => DSMC/parcels/derived/dsmcParcel/defineDSMCParcel.C} (87%)
 rename src/lagrangian/{dsmc => DSMC}/parcels/derived/dsmcParcel/dsmcParcel.C (93%)
 create mode 100644 src/lagrangian/DSMC/parcels/derived/dsmcParcel/dsmcParcel.H
 rename src/lagrangian/{dsmc/parcels/derived/dsmcParcel/makeDsmcParcelBinaryCollisionModels.C => DSMC/parcels/derived/dsmcParcel/makeDSMCParcelBinaryCollisionModels.C} (89%)
 rename src/lagrangian/{dsmc/parcels/derived/dsmcParcel/makeDsmcParcelInflowBoundaryModels.C => DSMC/parcels/derived/dsmcParcel/makeDSMCParcelInflowBoundaryModels.C} (91%)
 rename src/lagrangian/{dsmc/parcels/derived/dsmcParcel/makeDsmcParcelWallInteractionModels.C => DSMC/parcels/derived/dsmcParcel/makeDSMCParcelWallInteractionModels.C} (92%)
 rename src/lagrangian/{dsmc => DSMC}/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.C (97%)
 rename src/lagrangian/{dsmc => DSMC}/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H (98%)
 rename src/lagrangian/{dsmc => DSMC}/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C (96%)
 rename src/lagrangian/{dsmc => DSMC}/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C (99%)
 rename src/lagrangian/{dsmc => DSMC}/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H (98%)
 rename src/lagrangian/{dsmc => DSMC}/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.C (97%)
 rename src/lagrangian/{dsmc => DSMC}/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.H (97%)
 rename src/lagrangian/{dsmc => DSMC}/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C (98%)
 rename src/lagrangian/{dsmc => DSMC}/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H (97%)
 rename src/lagrangian/{dsmc => DSMC}/submodels/InflowBoundaryModel/FreeStream/FreeStream.C (92%)
 rename src/lagrangian/{dsmc => DSMC}/submodels/InflowBoundaryModel/FreeStream/FreeStream.H (93%)
 rename src/lagrangian/{dsmc => DSMC}/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.C (97%)
 rename src/lagrangian/{dsmc => DSMC}/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H (95%)
 rename src/lagrangian/{dsmc => DSMC}/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C (96%)
 rename src/lagrangian/{dsmc => DSMC}/submodels/InflowBoundaryModel/NoInflow/NoInflow.C (96%)
 rename src/lagrangian/{dsmc => DSMC}/submodels/InflowBoundaryModel/NoInflow/NoInflow.H (97%)
 rename src/lagrangian/{dsmc => DSMC}/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C (98%)
 rename src/lagrangian/{dsmc => DSMC}/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H (97%)
 rename src/lagrangian/{dsmc => DSMC}/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C (98%)
 rename src/lagrangian/{dsmc => DSMC}/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.H (97%)
 rename src/lagrangian/{dsmc => DSMC}/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.C (96%)
 rename src/lagrangian/{dsmc => DSMC}/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H (97%)
 rename src/lagrangian/{dsmc => DSMC}/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.C (97%)
 rename src/lagrangian/{dsmc => DSMC}/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H (98%)
 rename src/lagrangian/{dsmc => DSMC}/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C (96%)
 delete mode 100644 src/lagrangian/dsmc/Make/files
 delete mode 100644 src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.H

diff --git a/applications/solvers/discreteMethods/dsmc/dsmcFoam/Make/options b/applications/solvers/discreteMethods/dsmc/dsmcFoam/Make/options
index 62520c19b0..fa35b0bbd0 100644
--- a/applications/solvers/discreteMethods/dsmc/dsmcFoam/Make/options
+++ b/applications/solvers/discreteMethods/dsmc/dsmcFoam/Make/options
@@ -1,11 +1,11 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
-    -I$(LIB_SRC)/lagrangian/dsmc/lnInclude \
+    -I$(LIB_SRC)/lagrangian/DSMC/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
     -lmeshTools \
     -lfiniteVolume \
     -llagrangian \
-    -ldsmc
+    -lDSMC
diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
index 386b6826d3..2324ff61d0 100644
--- a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
+++ b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
@@ -12,7 +12,7 @@ EXE_LIBS = \
     -ldecompositionMethods \
     -ldistributed \
     -ldistributionModels \
-    -ldsmc \
+    -lDSMC \
     -ldynamicFvMesh \
     -ldynamicMesh \
     -ledgeMesh \
diff --git a/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/Make/options b/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/Make/options
index 4e81bb55de..8411a01ed2 100644
--- a/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/Make/options
+++ b/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/Make/options
@@ -3,7 +3,7 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/postProcessing/functionObjects/utilities/lnInclude \
-    -I$(LIB_SRC)/lagrangian/dsmc/lnInclude \
+    -I$(LIB_SRC)/lagrangian/DSMC/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
@@ -12,5 +12,4 @@ EXE_LIBS = \
     -lfiniteVolume \
     -lutilityFunctionObjects \
     -llagrangian \
-    -ldsmc
-
+    -lDSMC
diff --git a/applications/utilities/preProcessing/dsmcInitialise/Make/options b/applications/utilities/preProcessing/dsmcInitialise/Make/options
index 62520c19b0..fa35b0bbd0 100644
--- a/applications/utilities/preProcessing/dsmcInitialise/Make/options
+++ b/applications/utilities/preProcessing/dsmcInitialise/Make/options
@@ -1,11 +1,11 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
-    -I$(LIB_SRC)/lagrangian/dsmc/lnInclude \
+    -I$(LIB_SRC)/lagrangian/DSMC/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
     -lmeshTools \
     -lfiniteVolume \
     -llagrangian \
-    -ldsmc
+    -lDSMC
diff --git a/src/lagrangian/Allwmake b/src/lagrangian/Allwmake
index 66d1baabaf..909ec9f4ed 100755
--- a/src/lagrangian/Allwmake
+++ b/src/lagrangian/Allwmake
@@ -12,7 +12,7 @@ wmake $targetType solidParticle
 wmake $targetType intermediate
 wmake $targetType turbulence
 wmake $targetType spray
-wmake $targetType dsmc
+wmake $targetType DSMC
 wmake $targetType coalCombustion
 
 molecularDynamics/Allwmake $targetType $*
diff --git a/src/lagrangian/DSMC/Make/files b/src/lagrangian/DSMC/Make/files
new file mode 100644
index 0000000000..799db937b3
--- /dev/null
+++ b/src/lagrangian/DSMC/Make/files
@@ -0,0 +1,13 @@
+/* Parcels */
+parcels/derived/dsmcParcel/dsmcParcel.C
+
+/* Cloud base classes */
+clouds/baseClasses/DSMCBaseCloud/DSMCBaseCloud.C
+
+/* Sub-models */
+parcels/derived/dsmcParcel/defineDSMCParcel.C
+parcels/derived/dsmcParcel/makeDSMCParcelBinaryCollisionModels.C
+parcels/derived/dsmcParcel/makeDSMCParcelWallInteractionModels.C
+parcels/derived/dsmcParcel/makeDSMCParcelInflowBoundaryModels.C
+
+LIB = $(FOAM_LIBBIN)/libDSMC
diff --git a/src/lagrangian/dsmc/Make/options b/src/lagrangian/DSMC/Make/options
similarity index 100%
rename from src/lagrangian/dsmc/Make/options
rename to src/lagrangian/DSMC/Make/options
diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
similarity index 91%
rename from src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
rename to src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
index 3c70abb5ab..ff6166ffd0 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "DsmcCloud.H"
+#include "DSMCCloud.H"
 #include "BinaryCollisionModel.H"
 #include "WallInteractionModel.H"
 #include "InflowBoundaryModel.H"
@@ -33,11 +33,10 @@ License
 
 using namespace Foam::constant;
 
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class ParcelType>
-void Foam::DsmcCloud<ParcelType>::buildConstProps()
+void Foam::DSMCCloud<ParcelType>::buildConstProps()
 {
     Info<< nl << "Constructing constant properties for" << endl;
     constProps_.setSize(typeIdList_.size());
@@ -62,14 +61,14 @@ void Foam::DsmcCloud<ParcelType>::buildConstProps()
 
 
 template<class ParcelType>
-void Foam::DsmcCloud<ParcelType>::buildCellOccupancy()
+void Foam::DSMCCloud<ParcelType>::buildCellOccupancy()
 {
     forAll(cellOccupancy_, cO)
     {
         cellOccupancy_[cO].clear();
     }
 
-    forAllIter(typename DsmcCloud<ParcelType>, *this, iter)
+    forAllIter(typename DSMCCloud<ParcelType>, *this, iter)
     {
         cellOccupancy_[iter().cell()].append(&iter());
     }
@@ -77,7 +76,7 @@ void Foam::DsmcCloud<ParcelType>::buildCellOccupancy()
 
 
 template<class ParcelType>
-void Foam::DsmcCloud<ParcelType>::initialise
+void Foam::DSMCCloud<ParcelType>::initialise
 (
     const IOdictionary& dsmcInitialiseDict
 )
@@ -134,7 +133,7 @@ void Foam::DsmcCloud<ParcelType>::initialise
 
                 if (typeId == -1)
                 {
-                    FatalErrorIn("Foam::DsmcCloud<ParcelType>::initialise")
+                    FatalErrorIn("Foam::DSMCCloud<ParcelType>::initialise")
                         << "typeId " << moleculeName << "not defined." << nl
                         << abort(FatalError);
                 }
@@ -216,7 +215,7 @@ void Foam::DsmcCloud<ParcelType>::initialise
 
 
 template<class ParcelType>
-void Foam::DsmcCloud<ParcelType>::collisions()
+void Foam::DSMCCloud<ParcelType>::collisions()
 {
     if (!binaryCollision().active())
     {
@@ -395,7 +394,7 @@ void Foam::DsmcCloud<ParcelType>::collisions()
 
 
 template<class ParcelType>
-void Foam::DsmcCloud<ParcelType>::resetFields()
+void Foam::DSMCCloud<ParcelType>::resetFields()
 {
     q_ = dimensionedScalar("zero",  dimensionSet(1, 0, -3, 0, 0), 0.0);
 
@@ -428,7 +427,7 @@ void Foam::DsmcCloud<ParcelType>::resetFields()
 
 
 template<class ParcelType>
-void Foam::DsmcCloud<ParcelType>::calculateFields()
+void Foam::DSMCCloud<ParcelType>::calculateFields()
 {
     scalarField& rhoN = rhoN_.internalField();
 
@@ -444,7 +443,7 @@ void Foam::DsmcCloud<ParcelType>::calculateFields()
 
     vectorField& momentum = momentum_.internalField();
 
-    forAllConstIter(typename DsmcCloud<ParcelType>, *this, iter)
+    forAllConstIter(typename DSMCCloud<ParcelType>, *this, iter)
     {
         const ParcelType& p = iter();
         const label cellI = p.cell();
@@ -489,7 +488,7 @@ void Foam::DsmcCloud<ParcelType>::calculateFields()
 // * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * * //
 
 template<class ParcelType>
-void Foam::DsmcCloud<ParcelType>::addNewParcel
+void Foam::DSMCCloud<ParcelType>::addNewParcel
 (
     const vector& position,
     const vector& U,
@@ -519,7 +518,7 @@ void Foam::DsmcCloud<ParcelType>::addNewParcel
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class ParcelType>
-Foam::DsmcCloud<ParcelType>::DsmcCloud
+Foam::DSMCCloud<ParcelType>::DSMCCloud
 (
     const word& cloudName,
     const fvMesh& mesh,
@@ -527,7 +526,7 @@ Foam::DsmcCloud<ParcelType>::DsmcCloud
 )
 :
     Cloud<ParcelType>(mesh, cloudName, false),
-    DsmcBaseCloud(),
+    DSMCBaseCloud(),
     cloudName_(cloudName),
     mesh_(mesh),
     particleProperties_
@@ -556,7 +555,17 @@ Foam::DsmcCloud<ParcelType>::DsmcCloud
         ),
         mesh_
     ),
-    collisionSelectionRemainder_(mesh_.nCells(), 0),
+    collisionSelectionRemainder_
+    (
+        IOobject
+        (
+            this->name() + ":collisionSelectionRemainder",
+            mesh_.time().timeName(),
+            mesh_
+        ),
+        mesh_,
+        dimensionedScalar("collisionSelectionRemainder", dimless, 0)
+    ),
     q_
     (
         IOobject
@@ -699,7 +708,7 @@ Foam::DsmcCloud<ParcelType>::DsmcCloud
     ),
     binaryCollisionModel_
     (
-        BinaryCollisionModel<DsmcCloud<ParcelType> >::New
+        BinaryCollisionModel<DSMCCloud<ParcelType> >::New
         (
             particleProperties_,
             *this
@@ -707,7 +716,7 @@ Foam::DsmcCloud<ParcelType>::DsmcCloud
     ),
     wallInteractionModel_
     (
-        WallInteractionModel<DsmcCloud<ParcelType> >::New
+        WallInteractionModel<DSMCCloud<ParcelType> >::New
         (
             particleProperties_,
             *this
@@ -715,7 +724,7 @@ Foam::DsmcCloud<ParcelType>::DsmcCloud
     ),
     inflowBoundaryModel_
     (
-        InflowBoundaryModel<DsmcCloud<ParcelType> >::New
+        InflowBoundaryModel<DSMCCloud<ParcelType> >::New
         (
             particleProperties_,
             *this
@@ -741,7 +750,7 @@ Foam::DsmcCloud<ParcelType>::DsmcCloud
 
 
 template<class ParcelType>
-Foam::DsmcCloud<ParcelType>::DsmcCloud
+Foam::DSMCCloud<ParcelType>::DSMCCloud
 (
     const word& cloudName,
     const fvMesh& mesh,
@@ -749,7 +758,7 @@ Foam::DsmcCloud<ParcelType>::DsmcCloud
 )
     :
     Cloud<ParcelType>(mesh, cloudName, false),
-    DsmcBaseCloud(),
+    DSMCBaseCloud(),
     cloudName_(cloudName),
     mesh_(mesh),
     particleProperties_
@@ -780,7 +789,17 @@ Foam::DsmcCloud<ParcelType>::DsmcCloud
         dimensionedScalar("zero",  dimensionSet(0, 3, -1, 0, 0), 0.0),
         zeroGradientFvPatchScalarField::typeName
     ),
-    collisionSelectionRemainder_(),
+    collisionSelectionRemainder_
+    (
+        IOobject
+        (
+            this->name() + ":collisionSelectionRemainder",
+            mesh_.time().timeName(),
+            mesh_
+        ),
+        mesh_,
+        dimensionedScalar("collisionSelectionRemainder", dimless, 0)
+    ),
     q_
     (
         IOobject
@@ -962,14 +981,14 @@ Foam::DsmcCloud<ParcelType>::DsmcCloud
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class ParcelType>
-Foam::DsmcCloud<ParcelType>::~DsmcCloud()
+Foam::DSMCCloud<ParcelType>::~DSMCCloud()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class ParcelType>
-void Foam::DsmcCloud<ParcelType>::evolve()
+void Foam::DSMCCloud<ParcelType>::evolve()
 {
     typename ParcelType::trackingData td(*this);
 
@@ -999,12 +1018,12 @@ void Foam::DsmcCloud<ParcelType>::evolve()
 
 
 template<class ParcelType>
-void Foam::DsmcCloud<ParcelType>::info() const
+void Foam::DSMCCloud<ParcelType>::info() const
 {
-    label nDsmcParticles = this->size();
-    reduce(nDsmcParticles, sumOp<label>());
+    label nDSMCParticles = this->size();
+    reduce(nDSMCParticles, sumOp<label>());
 
-    scalar nMol = nDsmcParticles*nParticle_;
+    scalar nMol = nDSMCParticles*nParticle_;
 
     vector linearMomentum = linearMomentumOfSystem();
     reduce(linearMomentum, sumOp<vector>());
@@ -1017,10 +1036,10 @@ void Foam::DsmcCloud<ParcelType>::info() const
 
     Info<< "Cloud name: " << this->name() << nl
         << "    Number of dsmc particles        = "
-        << nDsmcParticles
+        << nDSMCParticles
         << endl;
 
-    if (nDsmcParticles)
+    if (nDSMCParticles)
     {
         Info<< "    Number of molecules             = "
             << nMol << nl
@@ -1042,7 +1061,7 @@ void Foam::DsmcCloud<ParcelType>::info() const
 
 
 template<class ParcelType>
-Foam::vector Foam::DsmcCloud<ParcelType>::equipartitionLinearVelocity
+Foam::vector Foam::DSMCCloud<ParcelType>::equipartitionLinearVelocity
 (
     scalar temperature,
     scalar mass
@@ -1060,7 +1079,7 @@ Foam::vector Foam::DsmcCloud<ParcelType>::equipartitionLinearVelocity
 
 
 template<class ParcelType>
-Foam::scalar Foam::DsmcCloud<ParcelType>::equipartitionInternalEnergy
+Foam::scalar Foam::DSMCCloud<ParcelType>::equipartitionInternalEnergy
 (
     scalar temperature,
     scalar iDof
@@ -1101,7 +1120,7 @@ Foam::scalar Foam::DsmcCloud<ParcelType>::equipartitionInternalEnergy
 
 
 template<class ParcelType>
-void Foam::DsmcCloud<ParcelType>::dumpParticlePositions() const
+void Foam::DSMCCloud<ParcelType>::dumpParticlePositions() const
 {
     OFstream pObj
     (
@@ -1110,7 +1129,7 @@ void Foam::DsmcCloud<ParcelType>::dumpParticlePositions() const
       + this->db().time().timeName() + ".obj"
     );
 
-    forAllConstIter(typename DsmcCloud<ParcelType>, *this, iter)
+    forAllConstIter(typename DSMCCloud<ParcelType>, *this, iter)
     {
         const ParcelType& p = iter();
 
@@ -1124,4 +1143,20 @@ void Foam::DsmcCloud<ParcelType>::dumpParticlePositions() const
 }
 
 
+template<class ParcelType>
+void Foam::DSMCCloud<ParcelType>::autoMap(const mapPolyMesh& mapper)
+{
+    typedef typename  ParcelType::trackingData tdType;
+    tdType td(*this);
+    Cloud<ParcelType>::template autoMap<tdType>(td, mapper);
+
+    // Update the cell occupancy field
+    cellOccupancy_.setSize(mesh_.nCells());
+    buildCellOccupancy();
+
+    // Update the inflow BCs
+    this->inflowBoundary().autoMap(mapper);
+}
+
+
 // ************************************************************************* //
diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H
similarity index 92%
rename from src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H
rename to src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H
index fbc5b7081f..eadbbd85ef 100644
--- a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H
+++ b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H
@@ -22,22 +22,22 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::DsmcCloud
+    Foam::DSMCCloud
 
 Description
     Templated base class for dsmc cloud
 
 SourceFiles
-    DsmcCloudI.H
-    DsmcCloud.C
+    DSMCCloudI.H
+    DSMCCloud.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef DsmcCloud_H
-#define DsmcCloud_H
+#ifndef DSMCCloud_H
+#define DSMCCloud_H
 
 #include "Cloud.H"
-#include "DsmcBaseCloud.H"
+#include "DSMCBaseCloud.H"
 #include "IOdictionary.H"
 #include "autoPtr.H"
 #include "Random.H"
@@ -62,14 +62,14 @@ template<class CloudType>
 class InflowBoundaryModel;
 
 /*---------------------------------------------------------------------------*\
-                         Class DsmcCloud Declaration
+                         Class DSMCCloud Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class ParcelType>
-class DsmcCloud
+class DSMCCloud
 :
     public Cloud<ParcelType>,
-    public DsmcBaseCloud
+    public DSMCBaseCloud
 {
     // Private data
 
@@ -101,7 +101,7 @@ class DsmcCloud
         volScalarField sigmaTcRMax_;
 
         //- A field holding the remainder from the previous collision selections
-        scalarField collisionSelectionRemainder_;
+        DimensionedField<scalar, volMesh> collisionSelectionRemainder_;
 
         //- Heat flux at surface field
         volScalarField q_;
@@ -149,15 +149,15 @@ class DsmcCloud
         // References to the cloud sub-models
 
             //- Binary collision model
-            autoPtr<BinaryCollisionModel<DsmcCloud<ParcelType> > >
+            autoPtr<BinaryCollisionModel<DSMCCloud<ParcelType> > >
                 binaryCollisionModel_;
 
             //- Wall interaction model
-            autoPtr<WallInteractionModel<DsmcCloud<ParcelType> > >
+            autoPtr<WallInteractionModel<DSMCCloud<ParcelType> > >
                 wallInteractionModel_;
 
             //- Inflow boundary model
-            autoPtr<InflowBoundaryModel<DsmcCloud<ParcelType> > >
+            autoPtr<InflowBoundaryModel<DSMCCloud<ParcelType> > >
                 inflowBoundaryModel_;
 
 
@@ -182,10 +182,10 @@ class DsmcCloud
         void calculateFields();
 
         //- Disallow default bitwise copy construct
-        DsmcCloud(const DsmcCloud&);
+        DSMCCloud(const DSMCCloud&);
 
         //- Disallow default bitwise assignment
-        void operator=(const DsmcCloud&);
+        void operator=(const DSMCCloud&);
 
 
 public:
@@ -194,7 +194,7 @@ public:
 
         //- Construct given name and mesh, will read Parcels and fields from
         //  file
-        DsmcCloud
+        DSMCCloud
         (
             const word& cloudName,
             const fvMesh& mesh,
@@ -202,7 +202,7 @@ public:
         );
 
         //- Construct given name, mesh and initialisation dictionary.
-        DsmcCloud
+        DSMCCloud
         (
             const word& cloudName,
             const fvMesh& mesh,
@@ -211,7 +211,7 @@ public:
 
 
     //- Destructor
-    virtual ~DsmcCloud();
+    virtual ~DSMCCloud();
 
 
     //- Type of parcel the cloud was instantiated for
@@ -398,27 +398,27 @@ public:
             // Sub-models
 
                 //- Return reference to binary elastic collision model
-                inline const BinaryCollisionModel<DsmcCloud<ParcelType> >&
+                inline const BinaryCollisionModel<DSMCCloud<ParcelType> >&
                     binaryCollision() const;
 
                 //- Return non-const reference to binary elastic collision model
-                inline BinaryCollisionModel<DsmcCloud<ParcelType> >&
+                inline BinaryCollisionModel<DSMCCloud<ParcelType> >&
                     binaryCollision();
 
                 //- Return reference to wall interaction model
-                inline const WallInteractionModel<DsmcCloud<ParcelType> >&
+                inline const WallInteractionModel<DSMCCloud<ParcelType> >&
                     wallInteraction() const;
 
                 //- Return non-const reference to wall interaction model
-                inline WallInteractionModel<DsmcCloud<ParcelType> >&
+                inline WallInteractionModel<DSMCCloud<ParcelType> >&
                     wallInteraction();
 
                 //- Return reference to wall interaction model
-                inline const InflowBoundaryModel<DsmcCloud<ParcelType> >&
+                inline const InflowBoundaryModel<DSMCCloud<ParcelType> >&
                     inflowBoundary() const;
 
                 //- Return non-const reference to wall interaction model
-                inline InflowBoundaryModel<DsmcCloud<ParcelType> >&
+                inline InflowBoundaryModel<DSMCCloud<ParcelType> >&
                     inflowBoundary();
 
 
@@ -464,6 +464,12 @@ public:
 
             //- Clear the Cloud
             inline void clear();
+
+
+        // Mapping
+
+            //- Remap the particles to the correct cells following mesh change
+            virtual void autoMap(const mapPolyMesh&);
 };
 
 
@@ -473,12 +479,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "DsmcCloudI.H"
+#include "DSMCCloudI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "DsmcCloud.C"
+#   include "DSMCCloud.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudI.H b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloudI.H
similarity index 69%
rename from src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudI.H
rename to src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloudI.H
index 0dad870e95..4d0ee08b6c 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,14 +31,14 @@ using namespace Foam::constant::mathematical;
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class ParcelType>
-inline const Foam::word& Foam::DsmcCloud<ParcelType>::cloudName() const
+inline const Foam::word& Foam::DSMCCloud<ParcelType>::cloudName() const
 {
     return cloudName_;
 }
 
 
 template<class ParcelType>
-inline const Foam::fvMesh& Foam::DsmcCloud<ParcelType>::mesh() const
+inline const Foam::fvMesh& Foam::DSMCCloud<ParcelType>::mesh() const
 {
     return mesh_;
 }
@@ -46,7 +46,7 @@ inline const Foam::fvMesh& Foam::DsmcCloud<ParcelType>::mesh() const
 
 template<class ParcelType>
 inline const Foam::IOdictionary&
-Foam::DsmcCloud<ParcelType>::particleProperties() const
+Foam::DSMCCloud<ParcelType>::particleProperties() const
 {
     return particleProperties_;
 }
@@ -54,14 +54,14 @@ Foam::DsmcCloud<ParcelType>::particleProperties() const
 
 template<class ParcelType>
 inline const Foam::List<Foam::word>&
-Foam::DsmcCloud<ParcelType>::typeIdList() const
+Foam::DSMCCloud<ParcelType>::typeIdList() const
 {
     return typeIdList_;
 }
 
 
 template<class ParcelType>
-inline Foam::scalar Foam::DsmcCloud<ParcelType>::nParticle() const
+inline Foam::scalar Foam::DSMCCloud<ParcelType>::nParticle() const
 {
     return nParticle_;
 }
@@ -69,14 +69,14 @@ inline Foam::scalar Foam::DsmcCloud<ParcelType>::nParticle() const
 
 template<class ParcelType>
 inline const Foam::List<Foam::DynamicList<ParcelType*> >&
-Foam::DsmcCloud<ParcelType>::cellOccupancy() const
+Foam::DSMCCloud<ParcelType>::cellOccupancy() const
 {
     return cellOccupancy_;
 }
 
 
 template<class ParcelType>
-inline Foam::volScalarField& Foam::DsmcCloud<ParcelType>::sigmaTcRMax()
+inline Foam::volScalarField& Foam::DSMCCloud<ParcelType>::sigmaTcRMax()
 {
     return sigmaTcRMax_;
 }
@@ -84,7 +84,7 @@ inline Foam::volScalarField& Foam::DsmcCloud<ParcelType>::sigmaTcRMax()
 
 template<class ParcelType>
 inline Foam::scalarField&
-Foam::DsmcCloud<ParcelType>::collisionSelectionRemainder()
+Foam::DSMCCloud<ParcelType>::collisionSelectionRemainder()
 {
     return collisionSelectionRemainder_;
 }
@@ -92,7 +92,7 @@ Foam::DsmcCloud<ParcelType>::collisionSelectionRemainder()
 
 template<class ParcelType>
 inline const Foam::List<typename ParcelType::constantProperties>&
-Foam::DsmcCloud<ParcelType>::constProps() const
+Foam::DSMCCloud<ParcelType>::constProps() const
 {
     return constProps_;
 }
@@ -100,14 +100,14 @@ Foam::DsmcCloud<ParcelType>::constProps() const
 
 template<class ParcelType>
 inline const typename ParcelType::constantProperties&
-Foam::DsmcCloud<ParcelType>::constProps
+Foam::DSMCCloud<ParcelType>::constProps
 (
     label typeId
 ) const
 {
     if (typeId < 0 || typeId >= constProps_.size())
     {
-        FatalErrorIn("Foam::DsmcCloud<ParcelType>::constProps(label typeId)")
+        FatalErrorIn("Foam::DSMCCloud<ParcelType>::constProps(label typeId)")
             << "constantProperties for requested typeId index "
             << typeId << " do not exist" << nl
             << abort(FatalError);
@@ -118,7 +118,7 @@ Foam::DsmcCloud<ParcelType>::constProps
 
 
 template<class ParcelType>
-inline Foam::Random& Foam::DsmcCloud<ParcelType>::rndGen()
+inline Foam::Random& Foam::DSMCCloud<ParcelType>::rndGen()
 {
     return rndGen_;
 }
@@ -126,7 +126,7 @@ inline Foam::Random& Foam::DsmcCloud<ParcelType>::rndGen()
 
 template<class ParcelType>
 inline Foam::volScalarField::GeometricBoundaryField&
-Foam::DsmcCloud<ParcelType>::qBF()
+Foam::DSMCCloud<ParcelType>::qBF()
 {
     return q_.boundaryField();
 }
@@ -134,7 +134,7 @@ Foam::DsmcCloud<ParcelType>::qBF()
 
 template<class ParcelType>
 inline Foam::volVectorField::GeometricBoundaryField&
-Foam::DsmcCloud<ParcelType>::fDBF()
+Foam::DSMCCloud<ParcelType>::fDBF()
 {
     return fD_.boundaryField();
 }
@@ -142,7 +142,7 @@ Foam::DsmcCloud<ParcelType>::fDBF()
 
 template<class ParcelType>
 inline Foam::volScalarField::GeometricBoundaryField&
-Foam::DsmcCloud<ParcelType>::rhoNBF()
+Foam::DSMCCloud<ParcelType>::rhoNBF()
 {
     return rhoN_.boundaryField();
 }
@@ -150,7 +150,7 @@ Foam::DsmcCloud<ParcelType>::rhoNBF()
 
 template<class ParcelType>
 inline Foam::volScalarField::GeometricBoundaryField&
-Foam::DsmcCloud<ParcelType>::rhoMBF()
+Foam::DSMCCloud<ParcelType>::rhoMBF()
 {
     return rhoM_.boundaryField();
 }
@@ -158,7 +158,7 @@ Foam::DsmcCloud<ParcelType>::rhoMBF()
 
 template<class ParcelType>
 inline Foam::volScalarField::GeometricBoundaryField&
-Foam::DsmcCloud<ParcelType>::linearKEBF()
+Foam::DSMCCloud<ParcelType>::linearKEBF()
 {
     return linearKE_.boundaryField();
 }
@@ -166,7 +166,7 @@ Foam::DsmcCloud<ParcelType>::linearKEBF()
 
 template<class ParcelType>
 inline Foam::volScalarField::GeometricBoundaryField&
-Foam::DsmcCloud<ParcelType>::internalEBF()
+Foam::DSMCCloud<ParcelType>::internalEBF()
 {
     return internalE_.boundaryField();
 }
@@ -174,7 +174,7 @@ Foam::DsmcCloud<ParcelType>::internalEBF()
 
 template<class ParcelType>
 inline Foam::volScalarField::GeometricBoundaryField&
-Foam::DsmcCloud<ParcelType>::iDofBF()
+Foam::DSMCCloud<ParcelType>::iDofBF()
 {
     return iDof_.boundaryField();
 }
@@ -182,7 +182,7 @@ Foam::DsmcCloud<ParcelType>::iDofBF()
 
 template<class ParcelType>
 inline Foam::volVectorField::GeometricBoundaryField&
-Foam::DsmcCloud<ParcelType>::momentumBF()
+Foam::DSMCCloud<ParcelType>::momentumBF()
 {
     return momentum_.boundaryField();
 }
@@ -190,7 +190,7 @@ Foam::DsmcCloud<ParcelType>::momentumBF()
 
 template<class ParcelType>
 inline const Foam::volScalarField&
-Foam::DsmcCloud<ParcelType>::boundaryT() const
+Foam::DSMCCloud<ParcelType>::boundaryT() const
 {
     return boundaryT_;
 }
@@ -198,66 +198,66 @@ Foam::DsmcCloud<ParcelType>::boundaryT() const
 
 template<class ParcelType>
 inline const Foam::volVectorField&
-Foam::DsmcCloud<ParcelType>::boundaryU() const
+Foam::DSMCCloud<ParcelType>::boundaryU() const
 {
     return boundaryU_;
 }
 
 
 template<class ParcelType>
-inline const Foam::BinaryCollisionModel<Foam::DsmcCloud<ParcelType> >&
-Foam::DsmcCloud<ParcelType>::binaryCollision() const
+inline const Foam::BinaryCollisionModel<Foam::DSMCCloud<ParcelType> >&
+Foam::DSMCCloud<ParcelType>::binaryCollision() const
 {
     return binaryCollisionModel_;
 }
 
 
 template<class ParcelType>
-inline Foam::BinaryCollisionModel<Foam::DsmcCloud<ParcelType> >&
-Foam::DsmcCloud<ParcelType>::binaryCollision()
+inline Foam::BinaryCollisionModel<Foam::DSMCCloud<ParcelType> >&
+Foam::DSMCCloud<ParcelType>::binaryCollision()
 {
     return binaryCollisionModel_();
 }
 
 
 template<class ParcelType>
-inline const Foam::WallInteractionModel<Foam::DsmcCloud<ParcelType> >&
-Foam::DsmcCloud<ParcelType>::wallInteraction() const
+inline const Foam::WallInteractionModel<Foam::DSMCCloud<ParcelType> >&
+Foam::DSMCCloud<ParcelType>::wallInteraction() const
 {
     return wallInteractionModel_;
 }
 
 
 template<class ParcelType>
-inline Foam::WallInteractionModel<Foam::DsmcCloud<ParcelType> >&
-Foam::DsmcCloud<ParcelType>::wallInteraction()
+inline Foam::WallInteractionModel<Foam::DSMCCloud<ParcelType> >&
+Foam::DSMCCloud<ParcelType>::wallInteraction()
 {
     return wallInteractionModel_();
 }
 
 
 template<class ParcelType>
-inline const Foam::InflowBoundaryModel<Foam::DsmcCloud<ParcelType> >&
-Foam::DsmcCloud<ParcelType>::inflowBoundary() const
+inline const Foam::InflowBoundaryModel<Foam::DSMCCloud<ParcelType> >&
+Foam::DSMCCloud<ParcelType>::inflowBoundary() const
 {
     return inflowBoundaryModel_;
 }
 
 
 template<class ParcelType>
-inline Foam::InflowBoundaryModel<Foam::DsmcCloud<ParcelType> >&
-Foam::DsmcCloud<ParcelType>::inflowBoundary()
+inline Foam::InflowBoundaryModel<Foam::DSMCCloud<ParcelType> >&
+Foam::DSMCCloud<ParcelType>::inflowBoundary()
 {
     return inflowBoundaryModel_();
 }
 
 
 template<class ParcelType>
-inline Foam::scalar Foam::DsmcCloud<ParcelType>::massInSystem() const
+inline Foam::scalar Foam::DSMCCloud<ParcelType>::massInSystem() const
 {
     scalar sysMass = 0.0;
 
-    forAllConstIter(typename DsmcCloud<ParcelType>, *this, iter)
+    forAllConstIter(typename DSMCCloud<ParcelType>, *this, iter)
     {
         const ParcelType& p = iter();
 
@@ -274,11 +274,11 @@ inline Foam::scalar Foam::DsmcCloud<ParcelType>::massInSystem() const
 
 
 template<class ParcelType>
-inline Foam::vector Foam::DsmcCloud<ParcelType>::linearMomentumOfSystem() const
+inline Foam::vector Foam::DSMCCloud<ParcelType>::linearMomentumOfSystem() const
 {
     vector linearMomentum(vector::zero);
 
-    forAllConstIter(typename DsmcCloud<ParcelType>, *this, iter)
+    forAllConstIter(typename DSMCCloud<ParcelType>, *this, iter)
     {
         const ParcelType& p = iter();
 
@@ -296,11 +296,11 @@ inline Foam::vector Foam::DsmcCloud<ParcelType>::linearMomentumOfSystem() const
 
 template<class ParcelType>
 inline Foam::scalar
-Foam::DsmcCloud<ParcelType>::linearKineticEnergyOfSystem() const
+Foam::DSMCCloud<ParcelType>::linearKineticEnergyOfSystem() const
 {
     scalar linearKineticEnergy = 0.0;
 
-    forAllConstIter(typename DsmcCloud<ParcelType>, *this, iter)
+    forAllConstIter(typename DSMCCloud<ParcelType>, *this, iter)
     {
         const ParcelType& p = iter();
 
@@ -318,11 +318,11 @@ Foam::DsmcCloud<ParcelType>::linearKineticEnergyOfSystem() const
 
 template<class ParcelType>
 inline Foam::scalar
-Foam::DsmcCloud<ParcelType>::internalEnergyOfSystem() const
+Foam::DSMCCloud<ParcelType>::internalEnergyOfSystem() const
 {
     scalar internalEnergy = 0.0;
 
-    forAllConstIter(typename DsmcCloud<ParcelType>, *this, iter)
+    forAllConstIter(typename DSMCCloud<ParcelType>, *this, iter)
     {
         const ParcelType& p = iter();
 
@@ -334,7 +334,7 @@ Foam::DsmcCloud<ParcelType>::internalEnergyOfSystem() const
 
 
 template<class ParcelType>
-inline Foam::scalar Foam::DsmcCloud<ParcelType>::maxwellianAverageSpeed
+inline Foam::scalar Foam::DSMCCloud<ParcelType>::maxwellianAverageSpeed
 (
     scalar temperature,
     scalar mass
@@ -346,7 +346,7 @@ inline Foam::scalar Foam::DsmcCloud<ParcelType>::maxwellianAverageSpeed
 
 
 template<class ParcelType>
-inline Foam::scalarField Foam::DsmcCloud<ParcelType>::maxwellianAverageSpeed
+inline Foam::scalarField Foam::DSMCCloud<ParcelType>::maxwellianAverageSpeed
 (
     scalarField temperature,
     scalar mass
@@ -359,7 +359,7 @@ inline Foam::scalarField Foam::DsmcCloud<ParcelType>::maxwellianAverageSpeed
 
 
 template<class ParcelType>
-inline Foam::scalar Foam::DsmcCloud<ParcelType>::maxwellianRMSSpeed
+inline Foam::scalar Foam::DSMCCloud<ParcelType>::maxwellianRMSSpeed
 (
     scalar temperature,
     scalar mass
@@ -370,7 +370,7 @@ inline Foam::scalar Foam::DsmcCloud<ParcelType>::maxwellianRMSSpeed
 
 
 template<class ParcelType>
-inline Foam::scalarField Foam::DsmcCloud<ParcelType>::maxwellianRMSSpeed
+inline Foam::scalarField Foam::DSMCCloud<ParcelType>::maxwellianRMSSpeed
 (
     scalarField temperature,
     scalar mass
@@ -384,7 +384,7 @@ inline Foam::scalarField Foam::DsmcCloud<ParcelType>::maxwellianRMSSpeed
 
 template<class ParcelType>
 inline Foam::scalar
-Foam::DsmcCloud<ParcelType>::maxwellianMostProbableSpeed
+Foam::DSMCCloud<ParcelType>::maxwellianMostProbableSpeed
 (
     scalar temperature,
     scalar mass
@@ -396,7 +396,7 @@ Foam::DsmcCloud<ParcelType>::maxwellianMostProbableSpeed
 
 template<class ParcelType>
 inline Foam::scalarField
-Foam::DsmcCloud<ParcelType>::maxwellianMostProbableSpeed
+Foam::DSMCCloud<ParcelType>::maxwellianMostProbableSpeed
 (
     scalarField temperature,
     scalar mass
@@ -409,14 +409,14 @@ Foam::DsmcCloud<ParcelType>::maxwellianMostProbableSpeed
 
 
 template<class ParcelType>
-inline const Foam::volScalarField& Foam::DsmcCloud<ParcelType>::q() const
+inline const Foam::volScalarField& Foam::DSMCCloud<ParcelType>::q() const
 {
     return q_;
 }
 
 
 template<class ParcelType>
-inline const Foam::volVectorField& Foam::DsmcCloud<ParcelType>::fD() const
+inline const Foam::volVectorField& Foam::DSMCCloud<ParcelType>::fD() const
 {
     return fD_;
 }
@@ -424,14 +424,14 @@ inline const Foam::volVectorField& Foam::DsmcCloud<ParcelType>::fD() const
 
 template<class ParcelType>
 inline const Foam::volScalarField&
-Foam::DsmcCloud<ParcelType>::rhoN() const
+Foam::DSMCCloud<ParcelType>::rhoN() const
 {
     return rhoN_;
 }
 
 
 template<class ParcelType>
-inline const Foam::volScalarField& Foam::DsmcCloud<ParcelType>::rhoM() const
+inline const Foam::volScalarField& Foam::DSMCCloud<ParcelType>::rhoM() const
 {
     return rhoM_;
 }
@@ -439,7 +439,7 @@ inline const Foam::volScalarField& Foam::DsmcCloud<ParcelType>::rhoM() const
 
 template<class ParcelType>
 inline const Foam::volScalarField&
-Foam::DsmcCloud<ParcelType>::dsmcRhoN() const
+Foam::DSMCCloud<ParcelType>::dsmcRhoN() const
 {
     return dsmcRhoN_;
 }
@@ -447,7 +447,7 @@ Foam::DsmcCloud<ParcelType>::dsmcRhoN() const
 
 template<class ParcelType>
 inline const Foam::volScalarField&
-Foam::DsmcCloud<ParcelType>::linearKE() const
+Foam::DSMCCloud<ParcelType>::linearKE() const
 {
     return linearKE_;
 }
@@ -455,7 +455,7 @@ Foam::DsmcCloud<ParcelType>::linearKE() const
 
 template<class ParcelType>
 inline const Foam::volScalarField&
-Foam::DsmcCloud<ParcelType>::internalE() const
+Foam::DSMCCloud<ParcelType>::internalE() const
 {
     return internalE_;
 }
@@ -463,21 +463,21 @@ Foam::DsmcCloud<ParcelType>::internalE() const
 
 template<class ParcelType>
 inline const Foam::volScalarField&
-Foam::DsmcCloud<ParcelType>::iDof() const
+Foam::DSMCCloud<ParcelType>::iDof() const
 {
     return iDof_;
 }
 
 
 template<class ParcelType>
-inline const Foam::volVectorField& Foam::DsmcCloud<ParcelType>::momentum() const
+inline const Foam::volVectorField& Foam::DSMCCloud<ParcelType>::momentum() const
 {
     return momentum_;
 }
 
 
 template<class ParcelType>
-inline void Foam::DsmcCloud<ParcelType>::clear()
+inline void Foam::DSMCCloud<ParcelType>::clear()
 {
     return IDLList<ParcelType>::clear();
 }
diff --git a/src/lagrangian/dsmc/clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.C b/src/lagrangian/DSMC/clouds/baseClasses/DSMCBaseCloud/DSMCBaseCloud.C
similarity index 86%
rename from src/lagrangian/dsmc/clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.C
rename to src/lagrangian/DSMC/clouds/baseClasses/DSMCBaseCloud/DSMCBaseCloud.C
index eaf30cf5e2..0d41528fc8 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,25 +23,25 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "DsmcBaseCloud.H"
+#include "DSMCBaseCloud.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    defineTypeNameAndDebug(DsmcBaseCloud, 0);
+    defineTypeNameAndDebug(DSMCBaseCloud, 0);
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::DsmcBaseCloud::DsmcBaseCloud()
+Foam::DSMCBaseCloud::DSMCBaseCloud()
 {}
 
 
 // * * * * * * * * * * * * * * * *  Destructors  * * * * * * * * * * * * * * //
 
-Foam::DsmcBaseCloud::~DsmcBaseCloud()
+Foam::DSMCBaseCloud::~DSMCBaseCloud()
 {}
 
 
diff --git a/src/lagrangian/dsmc/clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.H b/src/lagrangian/DSMC/clouds/baseClasses/DSMCBaseCloud/DSMCBaseCloud.H
similarity index 80%
rename from src/lagrangian/dsmc/clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.H
rename to src/lagrangian/DSMC/clouds/baseClasses/DSMCBaseCloud/DSMCBaseCloud.H
index 637616d8cc..674774af37 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,18 +22,18 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::DsmcBaseCloud
+    Foam::DSMCBaseCloud
 
 Description
-    Virtual abstract base class for templated DsmcCloud
+    Virtual abstract base class for templated DSMCCloud
 
 SourceFiles
-    DsmcBaseCloud.C
+    DSMCBaseCloud.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef DsmcBaseCloud_H
-#define DsmcBaseCloud_H
+#ifndef DSMCBaseCloud_H
+#define DSMCBaseCloud_H
 
 #include "volFields.H"
 
@@ -43,32 +43,32 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                       Class DsmcBaseCloud Declaration
+                       Class DSMCBaseCloud Declaration
 \*---------------------------------------------------------------------------*/
 
-class DsmcBaseCloud
+class DSMCBaseCloud
 {
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
-        DsmcBaseCloud(const DsmcBaseCloud&);
+        DSMCBaseCloud(const DSMCBaseCloud&);
 
         //- Disallow default bitwise assignment
-        void operator=(const DsmcBaseCloud&);
+        void operator=(const DSMCBaseCloud&);
 
 
 public:
 
     //- Runtime type information
-    TypeName("DsmcBaseCloud");
+    TypeName("DSMCBaseCloud");
 
     // Constructors
 
         //- Null constructor
-        DsmcBaseCloud();
+        DSMCBaseCloud();
 
     //- Destructor
-    virtual ~DsmcBaseCloud();
+    virtual ~DSMCBaseCloud();
 };
 
 
diff --git a/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.H b/src/lagrangian/DSMC/clouds/derived/dsmcCloud/dsmcCloud.H
similarity index 91%
rename from src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.H
rename to src/lagrangian/DSMC/clouds/derived/dsmcCloud/dsmcCloud.H
index 5545e430a9..ca590346b3 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,14 +35,14 @@ SourceFiles
 #ifndef dsmcCloud_H
 #define dsmcCloud_H
 
-#include "DsmcCloud.H"
+#include "DSMCCloud.H"
 #include "dsmcParcel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    typedef DsmcCloud<dsmcParcel> dsmcCloud;
+    typedef DSMCCloud<dsmcParcel> dsmcCloud;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.C b/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcel.C
similarity index 91%
rename from src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.C
rename to src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcel.C
index 2902a2219f..554f3b52ba 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,14 +23,14 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "DsmcParcel.H"
+#include "DSMCParcel.H"
 #include "meshTools.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class ParcelType>
 template<class TrackData>
-bool Foam::DsmcParcel<ParcelType>::move(TrackData& td, const scalar trackTime)
+bool Foam::DSMCParcel<ParcelType>::move(TrackData& td, const scalar trackTime)
 {
     typename TrackData::cloudType::parcelType& p =
         static_cast<typename TrackData::cloudType::parcelType&>(*this);
@@ -85,7 +85,7 @@ bool Foam::DsmcParcel<ParcelType>::move(TrackData& td, const scalar trackTime)
 
 template<class ParcelType>
 template<class TrackData>
-bool Foam::DsmcParcel<ParcelType>::hitPatch
+bool Foam::DSMCParcel<ParcelType>::hitPatch
 (
     const polyPatch&,
     TrackData& td,
@@ -100,7 +100,7 @@ bool Foam::DsmcParcel<ParcelType>::hitPatch
 
 template<class ParcelType>
 template<class TrackData>
-void Foam::DsmcParcel<ParcelType>::hitProcessorPatch
+void Foam::DSMCParcel<ParcelType>::hitProcessorPatch
 (
     const processorPolyPatch&,
     TrackData& td
@@ -112,7 +112,7 @@ void Foam::DsmcParcel<ParcelType>::hitProcessorPatch
 
 template<class ParcelType>
 template<class TrackData>
-void Foam::DsmcParcel<ParcelType>::hitWallPatch
+void Foam::DSMCParcel<ParcelType>::hitWallPatch
 (
     const wallPolyPatch& wpp,
     TrackData& td,
@@ -162,7 +162,7 @@ void Foam::DsmcParcel<ParcelType>::hitWallPatch
 
     td.cloud().wallInteraction().correct
     (
-        static_cast<DsmcParcel<ParcelType> &>(*this),
+        static_cast<DSMCParcel<ParcelType> &>(*this),
         wpp
     );
 
@@ -205,14 +205,14 @@ void Foam::DsmcParcel<ParcelType>::hitWallPatch
 
 template<class ParcelType>
 template<class TrackData>
-void Foam::DsmcParcel<ParcelType>::hitPatch(const polyPatch&, TrackData& td)
+void Foam::DSMCParcel<ParcelType>::hitPatch(const polyPatch&, TrackData& td)
 {
     td.keepParticle = false;
 }
 
 
 template<class ParcelType>
-void Foam::DsmcParcel<ParcelType>::transformProperties(const tensor& T)
+void Foam::DSMCParcel<ParcelType>::transformProperties(const tensor& T)
 {
     ParcelType::transformProperties(T);
     U_ = transform(T, U_);
@@ -220,7 +220,7 @@ void Foam::DsmcParcel<ParcelType>::transformProperties(const tensor& T)
 
 
 template<class ParcelType>
-void Foam::DsmcParcel<ParcelType>::transformProperties
+void Foam::DSMCParcel<ParcelType>::transformProperties
 (
     const vector& separation
 )
@@ -231,6 +231,6 @@ void Foam::DsmcParcel<ParcelType>::transformProperties
 
 // * * * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * //
 
-#include "DsmcParcelIO.C"
+#include "DSMCParcelIO.C"
 
 // ************************************************************************* //
diff --git a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H b/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcel.H
similarity index 87%
rename from src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H
rename to src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcel.H
index 1f4acc6454..c55e16dfb3 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,27 +22,27 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::DsmcParcel
+    Foam::DSMCParcel
 
 Description
     DSMC parcel class
 
 SourceFiles
-    DsmcParcelI.H
-    DsmcParcel.C
-    DsmcParcelIO.C
+    DSMCParcelI.H
+    DSMCParcel.C
+    DSMCParcelIO.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef DsmcParcel_H
-#define DsmcParcel_H
+#ifndef DSMCParcel_H
+#define DSMCParcel_H
 
 #include "particle.H"
 #include "IOstream.H"
 #include "autoPtr.H"
 #include "contiguous.H"
 
-#include "DsmcCloud.H"
+#include "DSMCCloud.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -50,7 +50,7 @@ namespace Foam
 {
 
 template<class ParcelType>
-class DsmcParcel;
+class DSMCParcel;
 
 // Forward declaration of friend functions
 
@@ -58,15 +58,15 @@ template<class ParcelType>
 Ostream& operator<<
 (
     Ostream&,
-    const DsmcParcel<ParcelType>&
+    const DSMCParcel<ParcelType>&
 );
 
 /*---------------------------------------------------------------------------*\
-                         Class DsmcParcel Declaration
+                         Class DSMCParcel Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class ParcelType>
-class DsmcParcel
+class DSMCParcel
 :
     public ParcelType
 {
@@ -125,16 +125,16 @@ public:
     //- Class used to pass kinematic tracking data to the trackToFace function
     class trackingData
     :
-        public particle::TrackingData<DsmcCloud<DsmcParcel<ParcelType> > >
+        public particle::TrackingData<DSMCCloud<DSMCParcel<ParcelType> > >
     {
     public:
 
         // Constructors
 
             //- Construct from components
-            trackingData(DsmcCloud<DsmcParcel<ParcelType> >& cloud)
+            trackingData(DSMCCloud<DSMCParcel<ParcelType> >& cloud)
             :
-                particle::TrackingData<DsmcCloud<DsmcParcel<ParcelType> > >
+                particle::TrackingData<DSMCCloud<DSMCParcel<ParcelType> > >
                 (
                     cloud
                 )
@@ -162,7 +162,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("DsmcParcel");
+    TypeName("DSMCParcel");
 
     friend class Cloud<ParcelType>;
 
@@ -170,7 +170,7 @@ public:
     // Constructors
 
         //- Construct from components
-        inline DsmcParcel
+        inline DSMCParcel
         (
             const polyMesh& mesh,
             const vector& position,
@@ -183,7 +183,7 @@ public:
         );
 
         //- Construct from Istream
-        DsmcParcel
+        DSMCParcel
         (
             const polyMesh& mesh,
             Istream& is,
@@ -193,7 +193,7 @@ public:
         //- Construct and return a clone
         virtual autoPtr<particle> clone() const
         {
-            return autoPtr<particle>(new DsmcParcel<ParcelType>(*this));
+            return autoPtr<particle>(new DSMCParcel<ParcelType>(*this));
         }
 
 
@@ -210,11 +210,11 @@ public:
                 mesh_(mesh)
             {}
 
-            autoPtr<DsmcParcel<ParcelType> > operator()(Istream& is) const
+            autoPtr<DSMCParcel<ParcelType> > operator()(Istream& is) const
             {
-                return autoPtr<DsmcParcel<ParcelType> >
+                return autoPtr<DSMCParcel<ParcelType> >
                 (
-                    new DsmcParcel<ParcelType>(mesh_, is, true)
+                    new DSMCParcel<ParcelType>(mesh_, is, true)
                 );
             }
         };
@@ -302,9 +302,9 @@ public:
 
         // I-O
 
-            static void readFields(Cloud<DsmcParcel<ParcelType> >& c);
+            static void readFields(Cloud<DSMCParcel<ParcelType> >& c);
 
-            static void writeFields(const Cloud<DsmcParcel<ParcelType> >& c);
+            static void writeFields(const Cloud<DSMCParcel<ParcelType> >& c);
 
 
     // Ostream Operator
@@ -312,7 +312,7 @@ public:
         friend Ostream& operator<< <ParcelType>
         (
             Ostream&,
-            const DsmcParcel<ParcelType>&
+            const DSMCParcel<ParcelType>&
         );
 };
 
@@ -323,12 +323,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "DsmcParcelI.H"
+#include "DSMCParcelI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "DsmcParcel.C"
+    #include "DSMCParcel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelI.H b/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelI.H
similarity index 74%
rename from src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelI.H
rename to src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelI.H
index f137525f69..50a23c9089 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class ParcelType>
-inline Foam::DsmcParcel<ParcelType>::constantProperties::constantProperties()
+inline Foam::DSMCParcel<ParcelType>::constantProperties::constantProperties()
 :
     mass_(0),
     d_(0)
@@ -36,7 +36,7 @@ inline Foam::DsmcParcel<ParcelType>::constantProperties::constantProperties()
 
 
 template<class ParcelType>
-inline Foam::DsmcParcel<ParcelType>::constantProperties::constantProperties
+inline Foam::DSMCParcel<ParcelType>::constantProperties::constantProperties
 (
     const dictionary& dict
 )
@@ -52,7 +52,7 @@ inline Foam::DsmcParcel<ParcelType>::constantProperties::constantProperties
 
 
 template<class ParcelType>
-inline Foam::DsmcParcel<ParcelType>::DsmcParcel
+inline Foam::DSMCParcel<ParcelType>::DSMCParcel
 (
     const polyMesh& mesh,
     const vector& position,
@@ -75,14 +75,14 @@ inline Foam::DsmcParcel<ParcelType>::DsmcParcel
 
 template<class ParcelType>
 inline Foam::scalar
-Foam::DsmcParcel<ParcelType>::constantProperties::mass() const
+Foam::DSMCParcel<ParcelType>::constantProperties::mass() const
 {
     return mass_;
 }
 
 
 template<class ParcelType>
-inline Foam::scalar Foam::DsmcParcel<ParcelType>::constantProperties::d() const
+inline Foam::scalar Foam::DSMCParcel<ParcelType>::constantProperties::d() const
 {
     return d_;
 }
@@ -90,7 +90,7 @@ inline Foam::scalar Foam::DsmcParcel<ParcelType>::constantProperties::d() const
 
 template<class ParcelType>
 inline Foam::scalar
-Foam::DsmcParcel<ParcelType>::constantProperties::sigmaT() const
+Foam::DSMCParcel<ParcelType>::constantProperties::sigmaT() const
 {
     return constant::mathematical::pi*d_*d_;
 }
@@ -98,7 +98,7 @@ Foam::DsmcParcel<ParcelType>::constantProperties::sigmaT() const
 
 template<class ParcelType>
 inline Foam::scalar
-Foam::DsmcParcel<ParcelType>::constantProperties::internalDegreesOfFreedom()
+Foam::DSMCParcel<ParcelType>::constantProperties::internalDegreesOfFreedom()
 const
 {
     return internalDegreesOfFreedom_;
@@ -107,44 +107,44 @@ const
 
 template<class ParcelType>
 inline Foam::scalar
-Foam::DsmcParcel<ParcelType>::constantProperties::omega() const
+Foam::DSMCParcel<ParcelType>::constantProperties::omega() const
 {
     return omega_;
 }
 
 
-// * * * * * * * * * * DsmcParcel Member Functions  * * * * * * * * * * //
+// * * * * * * * * * * DSMCParcel Member Functions  * * * * * * * * * * //
 
 template<class ParcelType>
-inline Foam::label Foam::DsmcParcel<ParcelType>::typeId() const
+inline Foam::label Foam::DSMCParcel<ParcelType>::typeId() const
 {
     return typeId_;
 }
 
 
 template<class ParcelType>
-inline const Foam::vector& Foam::DsmcParcel<ParcelType>::U() const
+inline const Foam::vector& Foam::DSMCParcel<ParcelType>::U() const
 {
     return U_;
 }
 
 
 template<class ParcelType>
-inline Foam::scalar Foam::DsmcParcel<ParcelType>::Ei() const
+inline Foam::scalar Foam::DSMCParcel<ParcelType>::Ei() const
 {
     return Ei_;
 }
 
 
 template<class ParcelType>
-inline Foam::vector& Foam::DsmcParcel<ParcelType>::U()
+inline Foam::vector& Foam::DSMCParcel<ParcelType>::U()
 {
     return U_;
 }
 
 
 template<class ParcelType>
-inline Foam::scalar& Foam::DsmcParcel<ParcelType>::Ei()
+inline Foam::scalar& Foam::DSMCParcel<ParcelType>::Ei()
 {
     return Ei_;
 }
diff --git a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelIO.C b/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C
similarity index 85%
rename from src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelIO.C
rename to src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C
index 378e58621f..f0b7d62770 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) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "DsmcParcel.H"
+#include "DSMCParcel.H"
 #include "IOstreams.H"
 #include "IOField.H"
 #include "Cloud.H"
@@ -31,7 +31,7 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class ParcelType>
-Foam::DsmcParcel<ParcelType>::DsmcParcel
+Foam::DSMCParcel<ParcelType>::DSMCParcel
 (
     const polyMesh& mesh,
     Istream& is,
@@ -66,14 +66,14 @@ Foam::DsmcParcel<ParcelType>::DsmcParcel
     // Check state of Istream
     is.check
     (
-        "DsmcParcel<ParcelType>::DsmcParcel"
+        "DSMCParcel<ParcelType>::DSMCParcel"
         "(const Cloud<ParcelType>&, Istream&, bool)"
     );
 }
 
 
 template<class ParcelType>
-void Foam::DsmcParcel<ParcelType>::readFields(Cloud<DsmcParcel<ParcelType> >& c)
+void Foam::DSMCParcel<ParcelType>::readFields(Cloud<DSMCParcel<ParcelType> >& c)
 {
     if (!c.size())
     {
@@ -92,9 +92,9 @@ void Foam::DsmcParcel<ParcelType>::readFields(Cloud<DsmcParcel<ParcelType> >& c)
     c.checkFieldIOobject(c, typeId);
 
     label i = 0;
-    forAllIter(typename Cloud<DsmcParcel<ParcelType> >, c, iter)
+    forAllIter(typename Cloud<DSMCParcel<ParcelType> >, c, iter)
     {
-        DsmcParcel<ParcelType>& p = iter();
+        DSMCParcel<ParcelType>& p = iter();
 
         p.U_ = U[i];
         p.Ei_ = Ei[i];
@@ -105,9 +105,9 @@ void Foam::DsmcParcel<ParcelType>::readFields(Cloud<DsmcParcel<ParcelType> >& c)
 
 
 template<class ParcelType>
-void Foam::DsmcParcel<ParcelType>::writeFields
+void Foam::DSMCParcel<ParcelType>::writeFields
 (
-    const Cloud<DsmcParcel<ParcelType> >& c
+    const Cloud<DSMCParcel<ParcelType> >& c
 )
 {
     ParcelType::writeFields(c);
@@ -119,9 +119,9 @@ void Foam::DsmcParcel<ParcelType>::writeFields
     IOField<label> typeId(c.fieldIOobject("typeId", IOobject::NO_READ), np);
 
     label i = 0;
-    forAllConstIter(typename Cloud<DsmcParcel<ParcelType> >, c, iter)
+    forAllConstIter(typename Cloud<DSMCParcel<ParcelType> >, c, iter)
     {
-        const DsmcParcel<ParcelType>& p = iter();
+        const DSMCParcel<ParcelType>& p = iter();
 
         U[i] = p.U();
         Ei[i] = p.Ei();
@@ -141,7 +141,7 @@ template<class ParcelType>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const DsmcParcel<ParcelType>& p
+    const DSMCParcel<ParcelType>& p
 )
 {
     if (os.format() == IOstream::ASCII)
@@ -166,7 +166,7 @@ Foam::Ostream& Foam::operator<<
     // Check state of Ostream
     os.check
     (
-        "Ostream& operator<<(Ostream&, const DsmcParcel<ParcelType>&)"
+        "Ostream& operator<<(Ostream&, const DSMCParcel<ParcelType>&)"
     );
 
     return os;
diff --git a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/defineDsmcParcel.C b/src/lagrangian/DSMC/parcels/derived/dsmcParcel/defineDSMCParcel.C
similarity index 87%
rename from src/lagrangian/dsmc/parcels/derived/dsmcParcel/defineDsmcParcel.C
rename to src/lagrangian/DSMC/parcels/derived/dsmcParcel/defineDSMCParcel.C
index a6863672c1..33a9dbc1f5 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,12 +24,12 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "dsmcParcel.H"
-#include "DsmcParcel.H"
-#include "DsmcCloud.H"
+#include "DSMCParcel.H"
+#include "DSMCCloud.H"
 
 namespace Foam
 {
-    defineTemplateTypeNameAndDebug(DsmcParcel<particle>, 0);
+    defineTemplateTypeNameAndDebug(DSMCParcel<particle>, 0);
     defineTemplateTypeNameAndDebug(Cloud<dsmcParcel>, 0);
 }
 
diff --git a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.C b/src/lagrangian/DSMC/parcels/derived/dsmcParcel/dsmcParcel.C
similarity index 93%
rename from src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.C
rename to src/lagrangian/DSMC/parcels/derived/dsmcParcel/dsmcParcel.C
index 14caa71897..a2df8051d8 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,7 @@ Foam::dsmcParcel::dsmcParcel
     const label typeId
 )
 :
-    DsmcParcel<dsmcParcel>
+    DSMCParcel<dsmcParcel>
     (
         owner,
         position,
@@ -69,7 +69,7 @@ Foam::dsmcParcel::dsmcParcel
     bool readFields
 )
 :
-    DsmcParcel<dsmcParcel>(cloud, is, readFields)
+    DSMCParcel<dsmcParcel>(cloud, is, readFields)
 {}
 
 
diff --git a/src/lagrangian/DSMC/parcels/derived/dsmcParcel/dsmcParcel.H b/src/lagrangian/DSMC/parcels/derived/dsmcParcel/dsmcParcel.H
new file mode 100644
index 0000000000..a0177e53d0
--- /dev/null
+++ b/src/lagrangian/DSMC/parcels/derived/dsmcParcel/dsmcParcel.H
@@ -0,0 +1,52 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+     \\/     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/>.
+
+Typedef
+    Foam::dsmcParcel
+
+Description
+    Declaration of dsmc parcel type
+
+SourceFiles
+    dsmcParcel.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef dsmcParcel_H
+#define dsmcParcel_H
+
+#include "particle.H"
+#include "DSMCParcel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef DSMCParcel<particle> dsmcParcel;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelBinaryCollisionModels.C b/src/lagrangian/DSMC/parcels/derived/dsmcParcel/makeDSMCParcelBinaryCollisionModels.C
similarity index 89%
rename from src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelBinaryCollisionModels.C
rename to src/lagrangian/DSMC/parcels/derived/dsmcParcel/makeDSMCParcelBinaryCollisionModels.C
index b4036550d2..e409158adc 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "dsmcParcel.H"
-#include "DsmcCloud.H"
+#include "DSMCCloud.H"
 #include "NoBinaryCollision.H"
 #include "VariableHardSphere.H"
 #include "LarsenBorgnakkeVariableHardSphere.H"
@@ -33,9 +33,9 @@ License
 
 namespace Foam
 {
-    typedef DsmcCloud<dsmcParcel> CloudType;
+    typedef DSMCCloud<dsmcParcel> CloudType;
 
-    makeBinaryCollisionModel(DsmcCloud<dsmcParcel>);
+    makeBinaryCollisionModel(DSMCCloud<dsmcParcel>);
 
     // Add instances of collision model to the table
     makeBinaryCollisionModelType(NoBinaryCollision, CloudType);
diff --git a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelInflowBoundaryModels.C b/src/lagrangian/DSMC/parcels/derived/dsmcParcel/makeDSMCParcelInflowBoundaryModels.C
similarity index 91%
rename from src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelInflowBoundaryModels.C
rename to src/lagrangian/DSMC/parcels/derived/dsmcParcel/makeDSMCParcelInflowBoundaryModels.C
index d26b2b5cb3..84d2207f70 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "dsmcParcel.H"
-#include "DsmcCloud.H"
+#include "DSMCCloud.H"
 #include "FreeStream.H"
 #include "NoInflow.H"
 
@@ -32,7 +32,7 @@ License
 
 namespace Foam
 {
-    typedef DsmcCloud<dsmcParcel> CloudType;
+    typedef DSMCCloud<dsmcParcel> CloudType;
 
     makeInflowBoundaryModel(CloudType);
 
diff --git a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelWallInteractionModels.C b/src/lagrangian/DSMC/parcels/derived/dsmcParcel/makeDSMCParcelWallInteractionModels.C
similarity index 92%
rename from src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelWallInteractionModels.C
rename to src/lagrangian/DSMC/parcels/derived/dsmcParcel/makeDSMCParcelWallInteractionModels.C
index 0a352e8c78..9762d7e89a 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "dsmcParcel.H"
-#include "DsmcCloud.H"
+#include "DSMCCloud.H"
 #include "MaxwellianThermal.H"
 #include "SpecularReflection.H"
 #include "MixedDiffuseSpecular.H"
@@ -33,7 +33,7 @@ License
 
 namespace Foam
 {
-    typedef DsmcCloud<dsmcParcel> CloudType;
+    typedef DSMCCloud<dsmcParcel> CloudType;
 
     makeWallInteractionModel(CloudType);
 
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.C b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.C
similarity index 97%
rename from src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.C
rename to src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.C
index 3244981f6f..b111b9562d 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
similarity index 98%
rename from src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
rename to src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
index bdf7599d3f..cc90269276 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C
similarity index 96%
rename from src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C
rename to src/lagrangian/DSMC/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModelNew.C
index b6ea985807..f01e28c916 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
similarity index 99%
rename from src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
rename to src/lagrangian/DSMC/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
index 9c0540bd0b..70979c901a 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) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H
similarity index 98%
rename from src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H
rename to src/lagrangian/DSMC/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H
index 1f65db3877..d802e3976a 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) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.C b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.C
similarity index 97%
rename from src/lagrangian/dsmc/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.C
rename to src/lagrangian/DSMC/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.C
index 2f2de55319..587d10a3bb 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.C
+++ b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.H b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.H
similarity index 97%
rename from src/lagrangian/dsmc/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.H
rename to src/lagrangian/DSMC/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.H
index 54e325ba6f..ec5364921a 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.H
+++ b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C
similarity index 98%
rename from src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C
rename to src/lagrangian/DSMC/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C
index 53bd85065a..19d1ed61d8 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) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H
similarity index 97%
rename from src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H
rename to src/lagrangian/DSMC/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H
index 53c5cbf440..9edca634bb 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) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
similarity index 92%
rename from src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
rename to src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
index 725c97f382..c497b21d0f 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) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -123,6 +123,27 @@ Foam::FreeStream<CloudType>::~FreeStream()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class CloudType>
+void Foam::FreeStream<CloudType>::autoMap(const mapPolyMesh& mapper)
+{
+    CloudType& cloud(this->owner());
+    const polyMesh& mesh(cloud.mesh());
+
+    forAll(patches_, p)
+    {
+        label patchi = patches_[p];
+
+        const polyPatch& patch = mesh.boundaryMesh()[patchi];
+        List<Field<scalar> >& pFA = particleFluxAccumulators_[p];
+
+        forAll(pFA, facei)
+        {
+            pFA[facei].setSize(patch.size(), 0);
+        }
+    }
+}
+
+
 template<class CloudType>
 void Foam::FreeStream<CloudType>::inflow()
 {
@@ -148,11 +169,12 @@ void Foam::FreeStream<CloudType>::inflow()
         cloud.boundaryU().boundaryField()
     );
 
+
     forAll(patches_, p)
     {
-        label patchI = patches_[p];
+        label patchi = patches_[p];
 
-        const polyPatch& patch = mesh.boundaryMesh()[patchI];
+        const polyPatch& patch = mesh.boundaryMesh()[patchi];
 
         // Add mass to the accumulators.  negative face area dotted with the
         // velocity to point flux into the domain.
@@ -166,7 +188,7 @@ void Foam::FreeStream<CloudType>::inflow()
 
             scalar mass = cloud.constProps(typeId).mass();
 
-            if (min(boundaryT[patchI]) < SMALL)
+            if (min(boundaryT[patchi]) < SMALL)
             {
                 FatalErrorIn ("Foam::FreeStream<CloudType>::inflow()")
                     << "Zero boundary temperature detected, check boundaryT "
@@ -178,7 +200,7 @@ void Foam::FreeStream<CloudType>::inflow()
             (
                 cloud.maxwellianMostProbableSpeed
                 (
-                    boundaryT[patchI],
+                    boundaryT[patchi],
                     mass
                 )
             );
@@ -190,7 +212,7 @@ void Foam::FreeStream<CloudType>::inflow()
 
             scalarField sCosTheta
             (
-                (boundaryU[patchI] & -patch.faceAreas()/mag(patch.faceAreas()))
+                (boundaryU[patchi] & -patch.faceAreas()/mag(patch.faceAreas()))
               / mostProbableSpeed
             );
 
@@ -262,9 +284,9 @@ void Foam::FreeStream<CloudType>::inflow()
             vector t2 = n^t1;
             t2 /= mag(t2);
 
-            scalar faceTemperature = boundaryT[patchI][pFI];
+            scalar faceTemperature = boundaryT[patchi][pFI];
 
-            const vector& faceVelocity = boundaryU[patchI][pFI];
+            const vector& faceVelocity = boundaryU[patchi][pFI];
 
             forAll(pFA, i)
             {
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.H b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.H
similarity index 93%
rename from src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.H
rename to src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.H
index cc2732d76d..eb0ff4ab40 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,6 +93,11 @@ public:
 
     // Member Functions
 
+        // Mapping
+
+            //- Remap the particles to the correct cells following mesh change
+            virtual void autoMap(const mapPolyMesh&);
+
         //- Introduce particles
         virtual void inflow();
 };
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.C b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.C
similarity index 97%
rename from src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.C
rename to src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.C
index a63f9ab261..428c26c1bf 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,4 +92,3 @@ const Foam::dictionary& Foam::InflowBoundaryModel<CloudType>::coeffDict() const
 #include "InflowBoundaryModelNew.C"
 
 // ************************************************************************* //
-
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H
similarity index 95%
rename from src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H
rename to src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H
index 802702767f..3f600f6a6d 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -124,6 +124,12 @@ public:
         //- Return the coefficients dictionary
         inline const dictionary& coeffDict() const;
 
+    // Mapping
+
+        //- Remap the particles to the correct cells following mesh change
+        virtual void autoMap(const mapPolyMesh&)
+        {}
+
     //- Introduce particles
     virtual void inflow() = 0;
 };
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C
similarity index 96%
rename from src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C
rename to src/lagrangian/DSMC/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModelNew.C
index 85e67ad7a0..c80e58159d 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.C b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/NoInflow/NoInflow.C
similarity index 96%
rename from src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.C
rename to src/lagrangian/DSMC/submodels/InflowBoundaryModel/NoInflow/NoInflow.C
index 2e66fbbb88..4cf9991778 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) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.H b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/NoInflow/NoInflow.H
similarity index 97%
rename from src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.H
rename to src/lagrangian/DSMC/submodels/InflowBoundaryModel/NoInflow/NoInflow.H
index 439598e41c..914ea8ca42 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C b/src/lagrangian/DSMC/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C
similarity index 98%
rename from src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C
rename to src/lagrangian/DSMC/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C
index bad0545f1a..9c976fc50b 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) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H b/src/lagrangian/DSMC/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H
similarity index 97%
rename from src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H
rename to src/lagrangian/DSMC/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H
index 561db54d10..e9d3d9f532 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C b/src/lagrangian/DSMC/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C
similarity index 98%
rename from src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C
rename to src/lagrangian/DSMC/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C
index 19273a756e..c4ef48c0c9 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) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.H b/src/lagrangian/DSMC/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.H
similarity index 97%
rename from src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.H
rename to src/lagrangian/DSMC/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.H
index 3ba406d938..66698f2a8b 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.C b/src/lagrangian/DSMC/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.C
similarity index 96%
rename from src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.C
rename to src/lagrangian/DSMC/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.C
index 1161600af5..6a7e7fa610 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) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H b/src/lagrangian/DSMC/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H
similarity index 97%
rename from src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H
rename to src/lagrangian/DSMC/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H
index cfaa6893fc..861ff44e1e 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.C b/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.C
similarity index 97%
rename from src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.C
rename to src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.C
index 6f0ecf3e3b..d53ab067fc 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,4 +93,3 @@ Foam::WallInteractionModel<CloudType>::coeffDict() const
 #include "WallInteractionModelNew.C"
 
 // ************************************************************************* //
-
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H b/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
similarity index 98%
rename from src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
rename to src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
index bd9adea780..e37f16902f 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C b/src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C
similarity index 96%
rename from src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C
rename to src/lagrangian/DSMC/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModelNew.C
index 798f28dde4..1100028c86 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) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/dsmc/Make/files b/src/lagrangian/dsmc/Make/files
deleted file mode 100644
index 983de123ab..0000000000
--- a/src/lagrangian/dsmc/Make/files
+++ /dev/null
@@ -1,13 +0,0 @@
-/* Parcels */
-parcels/derived/dsmcParcel/dsmcParcel.C
-
-/* Cloud base classes */
-clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.C
-
-/* submodels */
-parcels/derived/dsmcParcel/defineDsmcParcel.C
-parcels/derived/dsmcParcel/makeDsmcParcelBinaryCollisionModels.C
-parcels/derived/dsmcParcel/makeDsmcParcelWallInteractionModels.C
-parcels/derived/dsmcParcel/makeDsmcParcelInflowBoundaryModels.C
-
-LIB = $(FOAM_LIBBIN)/libdsmc
diff --git a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.H b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.H
deleted file mode 100644
index 90c3040f75..0000000000
--- a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.H
+++ /dev/null
@@ -1,112 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     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::dsmcParcel
-
-Description
-    Declaration of dsmc parcel type
-
-SourceFiles
-    dsmcParcel.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef dsmcParcel_H
-#define dsmcParcel_H
-
-#include "particle.H"
-#include "DsmcParcel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-    typedef DsmcParcel<particle> dsmcParcel;
-/*---------------------------------------------------------------------------*\
-                         Class dsmcParcel Declaration
-\*---------------------------------------------------------------------------*/
-/*
-class dsmcParcel
-:
-    public DsmcParcel<dsmcParcel>
-{
-
-public:
-
-    //- Run-time type information
-    TypeName("dsmcParcel");
-
-
-    // Constructors
-
-        //- Construct from components
-        dsmcParcel
-        (
-            DsmcCloud<dsmcParcel>& owner,
-            const vector& position,
-            const vector& U,
-            const scalar Ei,
-            const label cellI,
-            const label tetFaceI,
-            const label tetPtI,
-            const label typeId
-        );
-
-        //- Construct from Istream
-        dsmcParcel
-        (
-            const Cloud<dsmcParcel>& c,
-            Istream& is,
-            bool readFields = true
-        );
-
-        //- Construct and return a clone
-        autoPtr<Particle<dsmcParcel> > clone() const
-        {
-            return autoPtr<Particle<dsmcParcel> >(new dsmcParcel(*this));
-        }
-
-
-    //- Destructor
-    virtual ~dsmcParcel();
-};
-
-
-template<>
-inline bool contiguous<dsmcParcel>()
-{
-    return true;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-*/
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/utilities/Make/options b/src/postProcessing/functionObjects/utilities/Make/options
index d7868cbb8a..0ec41c4a47 100644
--- a/src/postProcessing/functionObjects/utilities/Make/options
+++ b/src/postProcessing/functionObjects/utilities/Make/options
@@ -2,7 +2,7 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
-    -I$(LIB_SRC)/lagrangian/dsmc/lnInclude \
+    -I$(LIB_SRC)/lagrangian/DSMC/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
@@ -14,7 +14,7 @@ LIB_LIBS = \
     -lmeshTools \
     -lsampling \
     -llagrangian \
-    -ldsmc \
+    -lDSMC \
     -lincompressibleTransportModels \
     -lturbulenceModels \
     -lfluidThermophysicalModels