diff --git a/applications/solvers/lagrangian/sprayFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/Make/options
index f9cb15cc2f..9d6d7d5398 100644
--- a/applications/solvers/lagrangian/sprayFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/Make/options
@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I$(FOAM_SOLVERS)/lagrangian/reactingParcelFoam \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I${LIB_SRC}/meshTools/lnInclude \
     -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
@@ -20,8 +21,7 @@ EXE_INC = \
     -I$(LIB_SRC)/ODE/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
-    -I$(LIB_SRC)/combustionModels/lnInclude \
-    -I$(FOAM_SOLVERS)/lagrangian/reactingParcelFoam
+    -I$(LIB_SRC)/combustionModels/lnInclude
 
 
 EXE_LIBS = \
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/Make/files b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/files
similarity index 100%
rename from applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/Make/files
rename to applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/files
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
similarity index 100%
rename from applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/Make/options
rename to applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/createClouds.H b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/createClouds.H
similarity index 100%
rename from applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/createClouds.H
rename to applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/createClouds.H
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/logSummary.H b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/logSummary.H
similarity index 100%
rename from applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/logSummary.H
rename to applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/logSummary.H
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/pEqn.H b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/pEqn.H
new file mode 100644
index 0000000000..5109788ea1
--- /dev/null
+++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/pEqn.H
@@ -0,0 +1,73 @@
+rho = thermo.rho();
+
+volScalarField rAU(1.0/UEqn.A());
+U = rAU*UEqn.H();
+
+if (pimple.transonic())
+{
+    surfaceScalarField phid
+    (
+        "phid",
+        fvc::interpolate(psi)
+       *(
+            ((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U))
+          + fvc::ddtPhiCorr(rAU, rho, U, phi)
+        )
+    );
+
+    while (pimple.correctNonOrthogonal())
+    {
+        fvScalarMatrix pEqn
+        (
+            fvm::ddt(psi, p)
+          + fvm::div(phid, p)
+          - fvm::laplacian(rho*rAU, p)
+         ==
+            parcels.Srho()
+        );
+
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
+
+        if (pimple.finalNonOrthogonalIter())
+        {
+            phi == pEqn.flux();
+        }
+    }
+}
+else
+{
+    phi =
+        fvc::interpolate(rho)
+       *(
+            ((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U))
+          + fvc::ddtPhiCorr(rAU, rho, U, phi)
+        );
+
+    while (pimple.correctNonOrthogonal())
+    {
+        fvScalarMatrix pEqn
+        (
+            fvm::ddt(psi, p)
+          + fvc::div(phi)
+          - fvm::laplacian(rho*rAU, p)
+         ==
+            parcels.Srho()
+        );
+
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
+
+        if (pimple.finalNonOrthogonalIter())
+        {
+            phi += pEqn.flux();
+        }
+    }
+}
+
+#include "rhoEqn.H"
+#include "compressibleContinuityErrs.H"
+
+U -= rAU*fvc::grad(p);
+U.correctBoundaryConditions();
+K = 0.5*magSqr(U);
+
+dpdt = fvc::ddt(p);
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/readEngineTimeControls.H b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/readEngineTimeControls.H
similarity index 100%
rename from applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/readEngineTimeControls.H
rename to applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/readEngineTimeControls.H
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/sprayEngineFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C
similarity index 99%
rename from applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/sprayEngineFoam.C
rename to applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C
index 7014cc1af3..a4ae147f51 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/sprayEngineFoam.C
+++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C
@@ -74,6 +74,8 @@ int main(int argc, char *argv[])
 
         Info<< "Crank angle = " << runTime.theta() << " CA-deg" << endl;
 
+        mesh.move();
+
         parcels.evolve();
 
         #include "rhoEqn.H"
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/startSummary.H b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/startSummary.H
similarity index 100%
rename from applications/solvers/lagrangian/sprayFoam/sprayEnginFoam/startSummary.H
rename to applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/startSummary.H
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
index 6d2add98f9..97c9d455f1 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
@@ -114,11 +114,11 @@ public:
         //- the dragfunction K used in the momentum eq.
         //    ddt(alpha*rhoa*Ua) + ... = ... alpha*beta*K*(Ua-Ub)
         //    ddt(beta*rhob*Ub) + ...  = ... alpha*beta*K*(Ub-Ua)
-        // **********************************�NB ! *****************************
+        // ********************************** NB! *****************************
         // for numerical reasons alpha and beta has been
         // extracted from the dragFunction K,
         // so you MUST divide K by alpha*beta when implemnting the drag function
-        // **********************************�NB ! *****************************
+        // ********************************** NB! *****************************
         virtual tmp<volScalarField> K(const volScalarField& Ur) const = 0;
 };
 
diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
index e4871f2c51..f83a03804b 100644
--- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
+++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
@@ -114,12 +114,12 @@ public:
         //- the heat-transfer function K used in the enthalpy eq.
         //    ddt(alpha*rhoa*ha) + ... = ... alpha*beta*K*(Ta - Tb)
         //    ddt(beta*rhob*hb) + ...  = ... alpha*beta*K*(Tb - Ta)
-        // **********************************�NB ! *****************************
+        // ********************************** NB!*****************************
         // for numerical reasons alpha and beta has been
         // extracted from the heat-transfer function K,
         // so you MUST divide K by alpha*beta when implementing the
         // heat-transfer function
-        // **********************************�NB ! *****************************
+        // ********************************** NB!*****************************
         virtual tmp<volScalarField> K(const volScalarField& Ur) const = 0;
 };
 
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H
index 31ea8164df..74f8f2b931 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H
@@ -35,8 +35,8 @@ Description
     \verbatim
         Kunz, R.F., Boger, D.A., Stinebring, D.R., Chyczewski, Lindau. J.W.,
         Gibeling, H.J., Venkateswaran, S., Govindan, T.R.,
-        “A Preconditioned Implicit Method for Two-Phase Flows with Application
-         to Cavitation Prediction,”
+        "A Preconditioned Implicit Method for Two-Phase Flows with Application
+         to Cavitation Prediction,"
         Computers and Fluids,
         29(8):849-875, 2000.
     \endverbatim
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
index a775d91e45..3a9536c881 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
@@ -131,11 +131,11 @@ public:
         //- the dragfunction K used in the momentum eq.
         //    ddt(alpha*rhoa*Ua) + ... = ... alpha*beta*K*(Ua-Ub)
         //    ddt(beta*rhob*Ub) + ...  = ... alpha*beta*K*(Ub-Ua)
-        // **********************************�NB ! *****************************
+        // ********************************** NB! *****************************
         // for numerical reasons alpha and beta has been
         // extracted from the dragFunction K,
         // so you MUST divide K by alpha*beta when implemnting the drag function
-        // **********************************�NB ! *****************************
+        // ********************************** NB! *****************************
         virtual tmp<volScalarField> K(const volScalarField& Ur) const = 0;
 };
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
index e4871f2c51..5541795bfd 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
@@ -114,12 +114,12 @@ public:
         //- the heat-transfer function K used in the enthalpy eq.
         //    ddt(alpha*rhoa*ha) + ... = ... alpha*beta*K*(Ta - Tb)
         //    ddt(beta*rhob*hb) + ...  = ... alpha*beta*K*(Tb - Ta)
-        // **********************************�NB ! *****************************
+        // ********************************** NB! *****************************
         // for numerical reasons alpha and beta has been
         // extracted from the heat-transfer function K,
         // so you MUST divide K by alpha*beta when implementing the
         // heat-transfer function
-        // **********************************�NB ! *****************************
+        // ********************************** NB! *****************************
         virtual tmp<volScalarField> K(const volScalarField& Ur) const = 0;
 };
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
index 237c7cfb64..0831f158b6 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
@@ -114,11 +114,11 @@ public:
         //- the dragfunction K used in the momentum eq.
         //    ddt(alpha*rhoa*Ua) + ... = ... alpha*beta*K*(Ua-Ub)
         //    ddt(beta*rhob*Ub) + ...  = ... alpha*beta*K*(Ub-Ua)
-        // **********************************�NB ! *****************************
+        // ********************************** NB ! *****************************
         // for numerical reasons alpha and beta has been
         // extracted from the dragFunction K,
         // so you MUST divide K by alpha*beta when implemnting the drag function
-        // **********************************�NB ! *****************************
+        // ********************************** NB ! *****************************
         virtual tmp<volScalarField> K(const volScalarField& Ur) const = 0;
 };
 
diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
index 4ba6d43b4e..b32c249e7c 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -1637,6 +1637,7 @@ int main(int argc, char *argv[])
 
     #include "addRegionOption.H"
     #include "addOverwriteOption.H"
+    argList::addOption("dict", "name", "specify alternative dictionary");
 
     #include "setRootCase.H"
     #include "createTime.H"
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
index a96179e970..cb7f5705aa 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,6 +35,9 @@ Usage
     \param -ascii \n
     Write Ensight data in ASCII format instead of "C Binary"
 
+    \parm -name \<subdir\>\n
+    define sub-directory name to use for Ensight data (default: "Ensight")
+
     \param -noZero \n
     Exclude the often incomplete initial conditions.
 
@@ -46,6 +49,9 @@ Usage
     Suppress writing the geometry. Can be useful for converting partial
     results for a static geometry.
 
+    \param -width \<n\>\n
+    width of Ensight data subdir
+
 Note
     - no parallel data.
     - writes to \a Ensight directory to avoid collisions with foamToEnsight.
@@ -96,6 +102,19 @@ int main(int argc, char *argv[])
         "suppress writing the geometry. "
         "Can be useful for converting partial results for a static geometry"
     );
+    argList::addOption
+    (
+        "name",
+        "subdir",
+        "define sub-directory name to use for Ensight data "
+        "(default: \"Ensight\")"
+    );
+    argList::addOption
+    (
+        "width",
+        "n",
+        "width of Ensight data subdir"
+    );
 
     // the volume field types that we handle
     wordHashSet volFieldTypes;
@@ -133,7 +152,21 @@ int main(int argc, char *argv[])
     // always write the geometry, unless the -noMesh option is specified
     bool optNoMesh = args.optionFound("noMesh");
 
-    fileName ensightDir = args.rootPath()/args.globalCaseName()/"Ensight";
+    // adjust output width
+    if (args.optionFound("width"))
+    {
+        ensightFile::subDirWidth(args.optionRead<label>("width"));
+    }
+
+    // define sub-directory name to use for Ensight data
+    fileName ensightDir = "Ensight";
+    args.optionReadIfPresent("name", ensightDir);
+
+    if (!ensightDir.isAbsolute())
+    {
+        ensightDir = args.rootPath()/args.globalCaseName()/ensightDir;
+    }
+
     fileName dataDir = ensightDir/"data";
     fileName caseFileName = "Ensight.case";
     fileName dataMask = fileName("data")/ensightFile::mask();
diff --git a/etc/config/settings.csh b/etc/config/settings.csh
index 2566cd6a9a..5eaed0c13c 100644
--- a/etc/config/settings.csh
+++ b/etc/config/settings.csh
@@ -372,7 +372,7 @@ unsetenv MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN
 
 switch ("$WM_MPLIB")
 case OPENMPI:
-    setenv FOAM_MPI openmpi-1.5.3
+    setenv FOAM_MPI openmpi-1.5.4
     # optional configuration tweaks:
     _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/openmpi.csh`
 
diff --git a/etc/config/settings.sh b/etc/config/settings.sh
index 55810e6e9f..13939070cd 100644
--- a/etc/config/settings.sh
+++ b/etc/config/settings.sh
@@ -114,6 +114,16 @@ Linux)
         export WM_LDFLAGS='-mabi=64 -G0'
         ;;
 
+    armv7l)
+        WM_ARCH=linuxARM7
+        export WM_COMPILER_LIB_ARCH=32
+        export WM_CC='gcc'
+        export WM_CXX='g++'
+        export WM_CFLAGS='-fPIC'
+        export WM_CXXFLAGS='-fPIC'
+        export WM_LDFLAGS=
+        ;;
+
     ppc64)
         WM_ARCH=linuxPPC64
         export WM_COMPILER_LIB_ARCH=64
@@ -393,7 +403,7 @@ unset MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN
 
 case "$WM_MPLIB" in
 OPENMPI)
-    export FOAM_MPI=openmpi-1.5.3
+    export FOAM_MPI=openmpi-1.5.4
     # optional configuration tweaks:
     _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/openmpi.sh`
 
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 4bab8ad32a..fefabee690 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -45,7 +45,9 @@ primitives/Tensor/lists/symmTensorList.C
 primitives/Tensor/lists/tensorList.C
 
 primitives/Vector/complexVector/complexVector.C
+#if !defined(WM_SP)
 primitives/Vector/floatVector/floatVector.C
+#endif
 primitives/Vector/labelVector/labelVector.C
 primitives/Vector/vector/vector.C
 primitives/Vector/lists/vectorList.C
diff --git a/src/OpenFOAM/primitives/Vector/floatVector/floatVector.H b/src/OpenFOAM/primitives/Vector/floatVector/floatVector.H
index 438adc1776..9d8eee773d 100644
--- a/src/OpenFOAM/primitives/Vector/floatVector/floatVector.H
+++ b/src/OpenFOAM/primitives/Vector/floatVector/floatVector.H
@@ -47,11 +47,11 @@ namespace Foam
 
 typedef Vector<float> floatVector;
 
-
 //- Data associated with floatVector type are contiguous
+#if !defined(WM_SP)
 template<>
 inline bool contiguous<floatVector>() {return true;}
-
+#endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/conversion/ensight/file/ensightFile.C b/src/conversion/ensight/file/ensightFile.C
index 7748a236f2..9c8219424b 100644
--- a/src/conversion/ensight/file/ensightFile.C
+++ b/src/conversion/ensight/file/ensightFile.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "ensightFile.H"
+#include <sstream>
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -31,6 +32,53 @@ bool Foam::ensightFile::allowUndef_ = false;
 
 Foam::scalar Foam::ensightFile::undefValue_ = Foam::floatScalarVGREAT;
 
+// default is width 8
+Foam::string Foam::ensightFile::mask_ = "********";
+
+Foam::string Foam::ensightFile::dirFmt_ = "%08d";
+
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+Foam::string Foam::ensightFile::mask()
+{
+    return mask_;
+}
+
+
+Foam::string Foam::ensightFile::subDir(const label n)
+{
+    char buf[32];
+
+    sprintf(buf, dirFmt_.c_str(), n);
+    return buf;
+}
+
+
+void Foam::ensightFile::subDirWidth(const label n)
+{
+    // enforce max limit to avoid buffer overflow in subDir()
+    if (n < 1 || n > 31)
+    {
+        return;
+    }
+
+    // appropriate printf format
+    std::ostringstream oss;
+    oss << "%0" << n << "d";
+    dirFmt_ = oss.str();
+
+    // set mask accordingly
+    mask_.resize(n, '*');
+}
+
+
+Foam::label Foam::ensightFile::subDirWidth()
+{
+    return mask_.size();
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::ensightFile::ensightFile
@@ -247,22 +295,4 @@ Foam::Ostream& Foam::ensightFile::writeBinaryHeader()
 }
 
 
-// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
-
-Foam::string Foam::ensightFile::mask()
-{
-    char buf[16] = "********";
-    return buf;
-}
-
-
-Foam::string Foam::ensightFile::subDir(const label n)
-{
-    char buf[16];
-
-    sprintf(buf, "%08d", n);
-    return buf;
-}
-
-
 // ************************************************************************* //
diff --git a/src/conversion/ensight/file/ensightFile.H b/src/conversion/ensight/file/ensightFile.H
index 17cd722c22..f8c24755b7 100644
--- a/src/conversion/ensight/file/ensightFile.H
+++ b/src/conversion/ensight/file/ensightFile.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,6 +57,12 @@ class ensightFile
         //- value to represent undef in results
         static scalar undefValue_;
 
+        //- The '*' mask appropriate for subDir
+        static string mask_;
+
+        //- The printf format for zero-padded subdirectory numbers
+        static string dirFmt_;
+
 
     // Private Member Functions
 
@@ -88,12 +94,19 @@ public:
         //- Return setting for whether 'undef' values are allowed in results
         static bool allowUndef();
 
-        //- '*' mask appropriate for subDir
+        //- The '*' mask appropriate for subDir
         static string mask();
 
-        //- consistent zero-padded numbers for subdirectories
+        //- Consistent zero-padded numbers for subdirectories
         static string subDir(const label);
 
+        //- Set width of subDir and mask. Default width is 8 digits.
+        //  Max width is 31 digits.
+        static void subDirWidth(const label);
+
+        //- Return current width of subDir and mask.
+        static label subDirWidth();
+
 
     // Edit
 
diff --git a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H
index 632e5d37ad..8319bf50bc 100644
--- a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H
+++ b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H
@@ -76,7 +76,7 @@ class reducedUnits
 
                 scalar refPressure_;
 
-               scalar refMassDensity_;
+                scalar refMassDensity_;
 
                 scalar refNumberDensity_;
 
@@ -103,9 +103,9 @@ public:
     // Constructors
 
         //- Construct with no argument, uses default values:
-        // length  = 1nm
-        // mass = 1.660538782e−27kg (unified atomic mass unit)
-        // temperature = 1K (therefore, energy = 1*kb)
+        //  length  = 1nm
+        //  mass = 1.660538782e-27kg (unified atomic mass unit)
+        //  temperature = 1K (therefore, energy = 1*kb)
         reducedUnits();
 
         //- Construct from components
diff --git a/src/lagrangian/molecularDynamics/old/reducedUnits/reducedUnits.H b/src/lagrangian/molecularDynamics/old/reducedUnits/reducedUnits.H
index 632e5d37ad..8319bf50bc 100644
--- a/src/lagrangian/molecularDynamics/old/reducedUnits/reducedUnits.H
+++ b/src/lagrangian/molecularDynamics/old/reducedUnits/reducedUnits.H
@@ -76,7 +76,7 @@ class reducedUnits
 
                 scalar refPressure_;
 
-               scalar refMassDensity_;
+                scalar refMassDensity_;
 
                 scalar refNumberDensity_;
 
@@ -103,9 +103,9 @@ public:
     // Constructors
 
         //- Construct with no argument, uses default values:
-        // length  = 1nm
-        // mass = 1.660538782e−27kg (unified atomic mass unit)
-        // temperature = 1K (therefore, energy = 1*kb)
+        //  length  = 1nm
+        //  mass = 1.660538782e-27kg (unified atomic mass unit)
+        //  temperature = 1K (therefore, energy = 1*kb)
         reducedUnits();
 
         //- Construct from components
diff --git a/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
index 821ef00dec..67414fa432 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
@@ -366,7 +366,7 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch
     AMIPtr_(NULL),
     AMIReverse_(false),
     surfPtr_(NULL),
-    surfDict_(dictionary::null)
+    surfDict_(fileName("surface"))
 {
     // Neighbour patch might not be valid yet so no transformation
     // calculation possible
@@ -474,7 +474,7 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch
     AMIPtr_(NULL),
     AMIReverse_(pp.AMIReverse_),
     surfPtr_(NULL),
-    surfDict_(dictionary::null)
+    surfDict_(pp.surfDict_)
 {
     // Neighbour patch might not be valid yet so no transformation
     // calculation possible
@@ -501,7 +501,7 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch
     AMIPtr_(NULL),
     AMIReverse_(pp.AMIReverse_),
     surfPtr_(NULL),
-    surfDict_(dictionary::null)
+    surfDict_(pp.surfDict_)
 {
     if (nbrPatchName_ == name())
     {
@@ -825,7 +825,7 @@ void Foam::cyclicAMIPolyPatch::write(Ostream& os) const
             << token::END_STATEMENT << nl;
     }
 
-    if (surfDict_ != dictionary::null)
+    if (!surfDict_.empty())
     {
         os.writeKeyword(surfDict_.dictName());
         os  << surfDict_;
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
index ec3d7c7471..9ccaf089c0 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
@@ -798,7 +798,7 @@ Foam::mappedPatchBase::mappedPatchBase
     AMIPtr_(NULL),
     AMIReverse_(false),
     surfPtr_(NULL),
-    surfDict_(dictionary::null)
+    surfDict_(fileName("surface"))
 {}
 
 
@@ -824,7 +824,7 @@ Foam::mappedPatchBase::mappedPatchBase
     AMIPtr_(NULL),
     AMIReverse_(false),
     surfPtr_(NULL),
-    surfDict_(dictionary::null)
+    surfDict_(fileName("surface"))
 {}
 
 
@@ -850,7 +850,7 @@ Foam::mappedPatchBase::mappedPatchBase
     AMIPtr_(NULL),
     AMIReverse_(false),
     surfPtr_(NULL),
-    surfDict_(dictionary::null)
+    surfDict_(fileName("surface"))
 {}
 
 
@@ -876,7 +876,7 @@ Foam::mappedPatchBase::mappedPatchBase
     AMIPtr_(NULL),
     AMIReverse_(false),
     surfPtr_(NULL),
-    surfDict_(dictionary::null)
+    surfDict_(fileName("surface"))
 {}
 
 
@@ -1216,8 +1216,11 @@ void Foam::mappedPatchBase::write(Ostream& os) const
                 << token::END_STATEMENT << nl;
         }
 
-        os.writeKeyword(surfDict_.dictName());
-        os  << surfDict_;
+        if (!surfDict_.empty())
+        {
+            os.writeKeyword(surfDict_.dictName());
+            os  << surfDict_;
+        }
     }
 }
 
diff --git a/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.H b/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.H
index d392958e81..388f645f3f 100644
--- a/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.H
+++ b/src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.H
@@ -81,8 +81,8 @@ class tetOverlapVolume
             const point& fc
         ) const;
 
-public:
 
+public:
 
     //- Runtime type information
     ClassName("tetOverlapVolume");
diff --git a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H
index f0bc077531..947b49fa75 100644
--- a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H
+++ b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,7 +113,13 @@ public:
         //  calculated from the given velocity gradient
         tmp<volScalarField> k(const tmp<volTensorField>& gradU) const
         {
-            return (2.0*ck_/ce_)*sqr(delta())*magSqr(dev(symm(gradU)));
+            volSymmTensorField D(symm(gradU));
+
+            volScalarField a(ce_/delta());
+            volScalarField b((2.0/3.0)*tr(D));
+            volScalarField c(2*ck_*delta()*(dev(D) && D));
+
+            return sqr((-b + sqrt(sqr(b) + 4*a*c))/(2*a));
         }
 
         //- Return SGS kinetic energy
diff --git a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
index 9faed1215c..f3b83a1148 100644
--- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
@@ -33,7 +33,7 @@ Description
         "A One-Equation Turbulence Model for Aerodynamic Flows"
         P.R. Spalart,
         S.R. Allmaras,
-        La Recherche A´rospatiale, No. 1, 1994, pp. 5–21.
+        La Recherche Aerospatiale, No. 1, 1994, pp. 5-21.
 
         Extended according to:
 
diff --git a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H
index f3104787ab..fbd1248181 100644
--- a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H
@@ -33,7 +33,7 @@ Description
         "A One-Equation Turbulence Model for Aerodynamic Flows"
         P.R. Spalart,
         S.R. Allmaras,
-        La Recherche A´rospatiale, No. 1, 1994, pp. 5–21.
+        La Recherche Aerospatiale, No. 1, 1994, pp. 5-21.
 
         Extended according to:
 
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution
index b974671521..c8105e447d 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution
@@ -105,8 +105,8 @@ PIMPLE
 
 relaxationFactors
 {
-    U               1;
-    nuTilda         1;
+    "U.*"               1;
+    "nuTilda.*"         1;
 }
 
 
diff --git a/wmake/rules/linuxARM7Gcc/c b/wmake/rules/linuxARM7Gcc/c
new file mode 100644
index 0000000000..5be3206f84
--- /dev/null
+++ b/wmake/rules/linuxARM7Gcc/c
@@ -0,0 +1,16 @@
+.SUFFIXES: .c .h
+
+cWARN        = -Wall
+
+cc          = gcc
+
+include $(RULES)/c$(WM_COMPILE_OPTION)
+
+cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
+
+ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
+
+LINK_LIBS   = $(cDBUG)
+
+LINKLIBSO   = $(cc) -shared
+LINKEXE     = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
diff --git a/wmake/rules/linuxARM7Gcc/c++ b/wmake/rules/linuxARM7Gcc/c++
new file mode 100644
index 0000000000..10d6b9cb33
--- /dev/null
+++ b/wmake/rules/linuxARM7Gcc/c++
@@ -0,0 +1,21 @@
+.SUFFIXES: .C .cxx .cc .cpp
+
+c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast
+
+CC          = g++
+
+include $(RULES)/c++$(WM_COMPILE_OPTION)
+
+ptFLAGS     = -DNoRepository -ftemplate-depth-100
+
+c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
+
+Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
+cxxtoo      = $(Ctoo)
+cctoo       = $(Ctoo)
+cpptoo      = $(Ctoo)
+
+LINK_LIBS   = $(c++DBUG)
+
+LINKLIBSO   = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed
+LINKEXE     = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed
diff --git a/wmake/rules/linuxARM7Gcc/c++Debug b/wmake/rules/linuxARM7Gcc/c++Debug
new file mode 100644
index 0000000000..19bdb9c334
--- /dev/null
+++ b/wmake/rules/linuxARM7Gcc/c++Debug
@@ -0,0 +1,2 @@
+c++DBUG    = -ggdb3 -DFULLDEBUG
+c++OPT      = -O0 -fdefault-inline
diff --git a/wmake/rules/linuxARM7Gcc/c++Opt b/wmake/rules/linuxARM7Gcc/c++Opt
new file mode 100644
index 0000000000..35fb837535
--- /dev/null
+++ b/wmake/rules/linuxARM7Gcc/c++Opt
@@ -0,0 +1,3 @@
+c++DBUG     =
+#c++OPT      = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard
+c++OPT      = -O2 -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=soft
diff --git a/wmake/rules/linuxARM7Gcc/c++Prof b/wmake/rules/linuxARM7Gcc/c++Prof
new file mode 100644
index 0000000000..3bda4dad55
--- /dev/null
+++ b/wmake/rules/linuxARM7Gcc/c++Prof
@@ -0,0 +1,2 @@
+c++DBUG    = -pg
+c++OPT     = -O2
diff --git a/wmake/rules/linuxARM7Gcc/cDebug b/wmake/rules/linuxARM7Gcc/cDebug
new file mode 100644
index 0000000000..72b638f458
--- /dev/null
+++ b/wmake/rules/linuxARM7Gcc/cDebug
@@ -0,0 +1,2 @@
+cDBUG       = -ggdb -DFULLDEBUG
+cOPT        = -O1 -fdefault-inline -finline-functions
diff --git a/wmake/rules/linuxARM7Gcc/cOpt b/wmake/rules/linuxARM7Gcc/cOpt
new file mode 100644
index 0000000000..4d60afe8f9
--- /dev/null
+++ b/wmake/rules/linuxARM7Gcc/cOpt
@@ -0,0 +1,3 @@
+cDBUG       =
+#cOPT        = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard
+cOPT        = -O3 -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard
diff --git a/wmake/rules/linuxARM7Gcc/cProf b/wmake/rules/linuxARM7Gcc/cProf
new file mode 100644
index 0000000000..ca3ac9bf5f
--- /dev/null
+++ b/wmake/rules/linuxARM7Gcc/cProf
@@ -0,0 +1,2 @@
+cDBUG       = -pg
+cOPT        = -O2
diff --git a/wmake/rules/linuxARM7Gcc/general b/wmake/rules/linuxARM7Gcc/general
new file mode 100644
index 0000000000..376c614846
--- /dev/null
+++ b/wmake/rules/linuxARM7Gcc/general
@@ -0,0 +1,9 @@
+CPP        = cpp -traditional-cpp $(GFLAGS)
+LD         = ld
+
+PROJECT_LIBS = -l$(WM_PROJECT) -ldl
+
+include $(GENERAL_RULES)/standard
+
+include $(RULES)/c
+include $(RULES)/c++
diff --git a/wmake/rules/linuxARM7Gcc/mplibHPMPI b/wmake/rules/linuxARM7Gcc/mplibHPMPI
new file mode 100644
index 0000000000..8aff40632b
--- /dev/null
+++ b/wmake/rules/linuxARM7Gcc/mplibHPMPI
@@ -0,0 +1,3 @@
+PFLAGS     =
+PINC       = -I$(MPI_ARCH_PATH)/include -D_MPICC_H
+PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi