diff --git a/.gitignore b/.gitignore
index 1b8ce3cde3c2234cfe982189852129106303b871..e2c6f9b41f320800ffa96e192129bb90a8eab745 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,6 +60,8 @@ doc/[Dd]oxygen/man
 # untracked configuration files
 /etc/prefs.csh
 /etc/prefs.sh
+/etc/config/*.csh
+/etc/config/*.sh
 
 # source packages - anywhere
 *.tar.bz2
diff --git a/ReleaseNotes-dev b/ReleaseNotes-dev
index 9ba620e2dc61d54cfad656133f30f87b088f687d..5f25edc27664f2a9a9f10dcc372420b72bc0971d 100644
--- a/ReleaseNotes-dev
+++ b/ReleaseNotes-dev
@@ -266,8 +266,6 @@
     internal field instead of boundary field.
     + =ensight=: new output format for all sampledSurfaces.
   + Function objects:
-    + =residualControl=: new function object to allow users to terminate steady
-    state calculations when the defined residual levels are achieved
     + =abortCalculation=: watches for presence of the named file in the
     $FOAM_CASE directory and aborts the calculation if it is present
     + =timeActivatedFileUpdate=: performs a file copy/replacement once a
diff --git a/applications/solvers/DNS/dnsFoam/createFields.H b/applications/solvers/DNS/dnsFoam/createFields.H
index 36fc513e020c5e795f7cb38106cfdff97aa80f3c..6c1bb42929f735ff76ef1cde36455aec48255ff9 100644
--- a/applications/solvers/DNS/dnsFoam/createFields.H
+++ b/applications/solvers/DNS/dnsFoam/createFields.H
@@ -26,4 +26,4 @@
         mesh
     );
 
-#   include "createPhi.H"
+    #include "createPhi.H"
diff --git a/applications/solvers/DNS/dnsFoam/dnsFoam.C b/applications/solvers/DNS/dnsFoam/dnsFoam.C
index d3f1da2d99ff5a743499cc1544b23ba13ffc4512..befa5e965523baec8d99ede08a2c602cf4e3bcd1 100644
--- a/applications/solvers/DNS/dnsFoam/dnsFoam.C
+++ b/applications/solvers/DNS/dnsFoam/dnsFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -110,7 +110,12 @@ int main(int argc, char *argv[])
 
         if (runTime.outputTime())
         {
-            calcEk(U, K).write(runTime.timePath()/"Ek", runTime.graphFormat());
+            calcEk(U, K).write
+            (
+                runTime.path()/"graphs"/runTime.timeName(),
+                "Ek",
+                runTime.graphFormat()
+            );
         }
 
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C
index c58339940e18c793f10829be01f861cd58e62807..4817928910e67ffc1011b7c29e22aec73e5b56ab 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
index ed860d9ca988197a790ab61605314db487a8b6a0..d97dd54463c5e95b180f250456a6a3d7b75e7af5 100644
--- a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
+++ b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/combustion/reactingFoam/chemistry.H b/applications/solvers/combustion/reactingFoam/chemistry.H
index 3a36aaac520a9bf63fd20c6b0373ae7e4751a61f..99f418af6f10ac69b44d08fc2271e2dd79c73fc4 100644
--- a/applications/solvers/combustion/reactingFoam/chemistry.H
+++ b/applications/solvers/combustion/reactingFoam/chemistry.H
@@ -1,3 +1,4 @@
+if (chemistry.chemistry())
 {
     Info<< "Solving chemistry" << endl;
 
@@ -10,17 +11,29 @@
     // turbulent time scale
     if (turbulentReaction)
     {
-        volScalarField tk
-        (
-            Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon())
-        );
-        volScalarField tc
-        (
-            chemistry.tc()
-        );
+        tmp<volScalarField> tepsilon(turbulence->epsilon());
+        const volScalarField& epsilon = tepsilon();
+        tmp<volScalarField> tmuEff(turbulence->muEff());
+        const volScalarField& muEff = tmuEff();
+        tmp<volScalarField> ttc(chemistry.tc());
+        const volScalarField& tc = ttc();
 
-        // Chalmers PaSR model
-        kappa = (runTime.deltaT() + tc)/(runTime.deltaT() + tc + tk);
+        forAll(epsilon, i)
+        {
+            if (epsilon[i] > 0)
+            {
+                // Chalmers PaSR model
+                scalar tk = Cmix.value()*Foam::sqrt(muEff[i]/rho[i]/epsilon[i]);
+                kappa[i] =
+                    (runTime.deltaTValue() + tc[i])
+                   /(runTime.deltaTValue() + tc[i] + tk);
+            }
+            else
+            {
+                // Return to laminar combustion
+                kappa[i] = 1.0;
+            }
+        }
     }
     else
     {
diff --git a/applications/solvers/combustion/rhoReactingFoam/Make/options b/applications/solvers/combustion/rhoReactingFoam/Make/options
index 6386af8c557fcea5ace76bfe7c203c36ab85cd6e..d6306816fd8174d34268711983ddb53cdb4eb040 100644
--- a/applications/solvers/combustion/rhoReactingFoam/Make/options
+++ b/applications/solvers/combustion/rhoReactingFoam/Make/options
@@ -5,7 +5,9 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
     -I$(LIB_SRC)/ODE/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(FOAM_SOLVERS)/combustion/reactingFoam
+
 
 EXE_LIBS = \
     -lcompressibleTurbulenceModel \
diff --git a/applications/solvers/combustion/rhoReactingFoam/chemistry.H b/applications/solvers/combustion/rhoReactingFoam/chemistry.H
deleted file mode 100644
index 841b434a7176d259a77f9d6f756bd1834af773a5..0000000000000000000000000000000000000000
--- a/applications/solvers/combustion/rhoReactingFoam/chemistry.H
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    Info<< "Solving chemistry" << endl;
-
-    chemistry.solve
-    (
-        runTime.value() - runTime.deltaTValue(),
-        runTime.deltaTValue()
-    );
-
-    // turbulent time scale
-    if (turbulentReaction)
-    {
-        volScalarField tk
-        (
-            Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon())
-        );
-        volScalarField tc(chemistry.tc());
-
-        // Chalmers PaSR model
-        kappa = (runTime.deltaT() + tc)/(runTime.deltaT() + tc + tk);
-    }
-    else
-    {
-        kappa = 1.0;
-    }
-
-    chemistrySh = kappa*chemistry.Sh()();
-}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/coupledDerivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/coupledDerivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
index a0b356578bcef3e396498d6fe1155aabee87931c..262b9da61f0256a1efae6baa70f5835c63a7bf6d 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/coupledDerivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/coupledDerivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/applications/solvers/lagrangian/LTSReactingParcelFoam/Make/options b/applications/solvers/lagrangian/LTSReactingParcelFoam/Make/options
index 1ff1aaa6129259368b371693f66f75fa3b1bac4f..91ee4a594d0a3ff79918481ebcc7764fe2823dee 100644
--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/Make/options
@@ -19,7 +19,8 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \
     -I$(LIB_SRC)/ODE/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-    -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude
+    -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
@@ -42,4 +43,5 @@ EXE_LIBS = \
     -lradiationModels \
     -lODE \
     -lregionModels \
-    -lsurfaceFilmModels
+    -lsurfaceFilmModels \
+    -lsampling
diff --git a/applications/solvers/lagrangian/LTSReactingParcelFoam/readTimeControls.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/readTimeControls.H
index 5513848c647124e13a8e6ebbcf4214ce2eda0e05..b73efd593e1bcc40490583f034237dbec2b728ea 100644
--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/readTimeControls.H
+++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/readTimeControls.H
@@ -27,13 +27,16 @@ License
 scalar maxCo(readScalar(pimple.dict().lookup("maxCo")));
 
 // Maximum time scale
-scalar maxDeltaT = readScalar(pimple.dict().lookup("maxDeltaT"));
+scalar maxDeltaT(pimple.dict().lookupOrDefault<scalar>("maxDeltaT", GREAT));
 
 // Smoothing parameter (0-1) when smoothing iterations > 0
-scalar alphaTauSmooth(pimple.dict().lookupOrDefault("alphaTauSmooth", 0.1));
+scalar rDeltaTSmoothingCoeff
+(
+    pimple.dict().lookupOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.1)
+);
 
 // Maximum change in cell temperature per iteration (relative to previous value)
-scalar alphaTauTemp(pimple.dict().lookupOrDefault("alphaTauTemp", 0.05));
+scalar alphaTemp(pimple.dict().lookupOrDefault("alphaTemp", 0.05));
 
 
 // ************************************************************************* //
diff --git a/applications/solvers/lagrangian/LTSReactingParcelFoam/timeScales.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/timeScales.H
index d93b5a40ed0fc18389fd9bad86528657907eed7f..e6d0fa85c4919cb322b30620c2850d408fb0fb8f 100644
--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/timeScales.H
+++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/timeScales.H
@@ -82,7 +82,7 @@ Info<< "Time scales min/max:" << endl;
            /rho
         );
 
-        tau = alphaTauTemp*thermo.Cp()*T/(tau + ROOTVSMALL);
+        tau = alphaTemp*thermo.Cp()*T/(tau + ROOTVSMALL);
 
         Info<< "    Temperature = " << min(maxDeltaT, gMin(tau)) << ", "
             << min(maxDeltaT, gMax(tau)) << endl;
@@ -105,7 +105,7 @@ Info<< "Time scales min/max:" << endl;
 
     // Spatially smooth the time scale field
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    fvc::smooth(rDeltaT, alphaTauSmooth);
+    fvc::smooth(rDeltaT, rDeltaTSmoothingCoeff);
 
     Info<< "    Overall     = " << min(1/rDeltaT).value()
         << ", " << max(1/rDeltaT).value() << nl << endl;
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/Make/options b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
index ab0bd2c08a582fa8af1eb5acd781c2773d696e5f..f2f8d1e75874dd9361753b992bad7d1847ff0dc1 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options
+++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
@@ -19,7 +19,10 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
-    -I$(LIB_SRC)/ODE/lnInclude
+    -I$(LIB_SRC)/ODE/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(FOAM_SOLVERS)/combustion/reactingFoam
+
 
 EXE_LIBS = \
     -lfiniteVolume \
@@ -43,4 +46,5 @@ EXE_LIBS = \
     -lradiationModels \
     -lregionModels \
     -lsurfaceFilmModels \
-    -lODE
+    -lODE \
+    -lsampling
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/chemistry.H b/applications/solvers/lagrangian/coalChemistryFoam/chemistry.H
deleted file mode 100644
index a1a5cb39ba27fde8c7492d6b43bc9a28a2141188..0000000000000000000000000000000000000000
--- a/applications/solvers/lagrangian/coalChemistryFoam/chemistry.H
+++ /dev/null
@@ -1,32 +0,0 @@
-if (chemistry.chemistry())
-{
-    Info<< "Solving chemistry" << endl;
-
-    chemistry.solve
-    (
-        runTime.value() - runTime.deltaTValue(),
-        runTime.deltaTValue()
-    );
-
-    // turbulent time scale
-    if (turbulentReaction)
-    {
-        DimensionedField<scalar, volMesh> tk
-        (
-            Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon())
-        );
-        DimensionedField<scalar, volMesh> tc
-        (
-            chemistry.tc()().dimensionedInternalField()
-        );
-
-        // Chalmers PaSR model
-        kappa = (runTime.deltaT() + tc)/(runTime.deltaT() + tc + tk);
-    }
-    else
-    {
-        kappa = 1.0;
-    }
-
-    chemistrySh = kappa*chemistry.Sh()();
-}
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/Make/options
index f7bb7d2f2d26c5dc2efb6d8830df8f885d317a5e..07869335410a004c24d88d0d093635e1235cba03 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/Make/options
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/Make/options
@@ -14,7 +14,8 @@ EXE_INC = \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/dynamicFvMesh/lnInclude
+    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude
 
 
 EXE_LIBS = \
@@ -33,4 +34,5 @@ EXE_LIBS = \
     -lsurfaceFilmModels \
     -ldynamicMesh \
     -ldynamicFvMesh \
-    -ltopoChangerFvMesh
+    -ltopoChangerFvMesh \
+    -lsampling
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
index 1de2ec74de1244c96df6880c49a7388b977f2267..58d80278f824feebc3e2539c6bd5ed637502370a 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
@@ -12,6 +12,7 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude
 
 EXE_LIBS = \
     -llagrangian \
@@ -26,4 +27,5 @@ EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
     -lregionModels \
-    -lsurfaceFilmModels
+    -lsurfaceFilmModels \
+    -lsampling
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options
index 1ff1aaa6129259368b371693f66f75fa3b1bac4f..f2dffe2998bacfbb04d2fd06d7f8f9de0f802905 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options
@@ -19,7 +19,10 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \
     -I$(LIB_SRC)/ODE/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-    -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude
+    -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(FOAM_SOLVERS)/combustion/reactingFoam
+
 
 EXE_LIBS = \
     -lfiniteVolume \
@@ -42,4 +45,5 @@ EXE_LIBS = \
     -lradiationModels \
     -lODE \
     -lregionModels \
-    -lsurfaceFilmModels
+    -lsurfaceFilmModels \
+    -lsampling
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H
deleted file mode 100644
index 1690487b45db2e49964b43a9219cdbfa1d08853f..0000000000000000000000000000000000000000
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    Info<< "Solving chemistry" << endl;
-
-    chemistry.solve
-    (
-        runTime.value() - runTime.deltaTValue(),
-        runTime.deltaTValue()
-    );
-
-    // turbulent time scale
-    if (turbulentReaction)
-    {
-        DimensionedField<scalar, volMesh> tk
-        (
-            Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon())
-        );
-        DimensionedField<scalar, volMesh> tc
-        (
-            chemistry.tc()().dimensionedInternalField()
-        );
-
-        // Chalmers PaSR model
-        kappa = (runTime.deltaT() + tc)/(runTime.deltaT() + tc + tk);
-    }
-    else
-    {
-        kappa = 1.0;
-    }
-
-    chemistrySh = kappa*chemistry.Sh()();
-}
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
index 1efc598b5b1dedd44f98783de44fab8e39f650a7..6e225cc09231bc0c0d7cd2b39dafd6270885ebf6 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
@@ -18,7 +18,10 @@ EXE_INC = \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
-    -I$(LIB_SRC)/ODE/lnInclude
+    -I$(LIB_SRC)/ODE/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(FOAM_SOLVERS)/combustion/reactingFoam
+
 
 EXE_LIBS = \
     -lfiniteVolume \
@@ -37,4 +40,5 @@ EXE_LIBS = \
     -lradiationModels \
     -lsurfaceFilmModels \
     -llagrangianIntermediate \
-    -lODE
+    -lODE \
+    -lsampling
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/chemistry.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/chemistry.H
deleted file mode 100644
index ce36fa0d1b5b6b472958ed9c38a0010c4f710888..0000000000000000000000000000000000000000
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/chemistry.H
+++ /dev/null
@@ -1,32 +0,0 @@
-if (chemistry.chemistry())
-{
-    Info << "Solving chemistry" << endl;
-
-    chemistry.solve
-    (
-        runTime.value() - runTime.deltaTValue(),
-        runTime.deltaTValue()
-    );
-
-    // turbulent time scale
-    if (turbulentReaction)
-    {
-        DimensionedField<scalar, volMesh> tk
-        (
-            Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon())
-        );
-        DimensionedField<scalar, volMesh> tc
-        (
-            chemistry.tc()().dimensionedInternalField()
-        );
-
-        // Chalmers PaSR model
-        kappa = (runTime.deltaT() + tc)/(runTime.deltaT() + tc + tk);
-    }
-    else
-    {
-        kappa = 1.0;
-    }
-
-    chemistrySh = kappa*chemistry.Sh()();
-}
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
index fb54b88e26984daa386646fdb38b5cc2b968e25a..fc312bb5fa8e3e8c7dc14254607ad907eb4d8c11 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
@@ -18,7 +18,10 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \
     -I$(LIB_SRC)/ODE/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-    -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude
+    -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(FOAM_SOLVERS)/combustion/reactingFoam
+
 
 EXE_LIBS = \
     -lfiniteVolume \
@@ -41,4 +44,5 @@ EXE_LIBS = \
     -lradiationModels \
     -lODE \
     -lregionModels \
-    -lsurfaceFilmModels
+    -lsurfaceFilmModels \
+    -lsampling
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/chemistry.H b/applications/solvers/lagrangian/reactingParcelFoam/chemistry.H
deleted file mode 100644
index 1690487b45db2e49964b43a9219cdbfa1d08853f..0000000000000000000000000000000000000000
--- a/applications/solvers/lagrangian/reactingParcelFoam/chemistry.H
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    Info<< "Solving chemistry" << endl;
-
-    chemistry.solve
-    (
-        runTime.value() - runTime.deltaTValue(),
-        runTime.deltaTValue()
-    );
-
-    // turbulent time scale
-    if (turbulentReaction)
-    {
-        DimensionedField<scalar, volMesh> tk
-        (
-            Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon())
-        );
-        DimensionedField<scalar, volMesh> tc
-        (
-            chemistry.tc()().dimensionedInternalField()
-        );
-
-        // Chalmers PaSR model
-        kappa = (runTime.deltaT() + tc)/(runTime.deltaT() + tc + tk);
-    }
-    else
-    {
-        kappa = 1.0;
-    }
-
-    chemistrySh = kappa*chemistry.Sh()();
-}
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
index d302015a3140a22865e1becbadc725afd5ed5b05..7a7ddc0432750f614fde11aed81552971c8b29db 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
@@ -9,7 +9,8 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-    -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude
+    -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude
 
 EXE_LIBS = \
     -llagrangian \
@@ -24,4 +25,5 @@ EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
     -lregionModels \
-    -lsurfaceFilmModels
+    -lsurfaceFilmModels \
+    -lsampling
diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C b/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C
index 74cffd7495335899fbe6ca66a3f18e3677e1e508..10ea651604f771af5384e7e8b205bc25b80ab97d 100644
--- a/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C
+++ b/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/multiphase/settlingFoam/settlingFoam.C b/applications/solvers/multiphase/settlingFoam/settlingFoam.C
index 483cb276cdf402a260a7c47e7fd630d449adb9ce..3b27deb210e121a00a9e8a5dd621568418447a7b 100644
--- a/applications/solvers/multiphase/settlingFoam/settlingFoam.C
+++ b/applications/solvers/multiphase/settlingFoam/settlingFoam.C
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (pimple.loop())
+    while (runTime.loop())
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
diff --git a/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C b/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C
index b28d976832232f00b3f5685a51ca77edb9242dde..c8beecc361677e5ae805de86375a0f8e346caca1 100644
--- a/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C
+++ b/applications/utilities/miscellaneous/expandDictionary/expandDictionary.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,12 +28,33 @@ Description
     Read the dictionary provided as an argument, expand the macros etc. and
     write the resulting dictionary to standard output.
 
+Usage
+    - expandDictionary inputDict [OPTION]
+
+    \param -list \n
+    Report the #include/#includeIfPresent to stdout only.
+
+Note
+    The \c -list option can be useful when determining which files
+    are actually included by a directory. It can also be used to
+    determine which files may need to be copied when transferring
+    simulation to another environment. The following code snippet
+    could be a useful basis for such cases:
+
+    \verbatim
+        for i in . 0 constant system
+        do
+            find $i -maxdepth 1 -type f -exec expandDictionary -list '{}' \;
+        done | sed -ne '/^"\//!{ s/^"//; s/"$//; p }' | sort | uniq
+    \endverbatim
+
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
 #include "IFstream.H"
 #include "IOobject.H"
 #include "dictionary.H"
+#include "includeEntry.H"
 
 using namespace Foam;
 
@@ -48,6 +69,12 @@ int main(int argc, char *argv[])
         "the resulting dictionary to standard output."
     );
 
+    argList::addBoolOption
+    (
+        "list",
+        "Report the #include/#includeIfPresent to stdout only"
+    );
+
     argList::noBanner();
     argList::noParallel();
     argList::validArgs.append("inputDict");
@@ -55,12 +82,22 @@ int main(int argc, char *argv[])
 
     const string dictName = args[1];
 
-    IOobject::writeBanner(Info)
-        <<"//\n// " << dictName << "\n//\n";
+    const bool listOpt = args.optionFound("list");
+
+    if (listOpt)
+    {
+        Foam::functionEntries::includeEntry::report = true;
+    }
 
-    dictionary(IFstream(dictName)(), true).write(Info, false);
+    dictionary dict(IFstream(dictName)(), true);
 
-    IOobject::writeDivider(Info);
+    if (!listOpt)
+    {
+        IOobject::writeBanner(Info)
+            <<"//\n// " << dictName << "\n//\n";
+        dict.write(Info, false);
+        IOobject::writeDivider(Info);
+    }
 
     return 0;
 }
diff --git a/applications/utilities/preProcessing/boxTurb/boxTurb.C b/applications/utilities/preProcessing/boxTurb/boxTurb.C
index dd00016f5bec884978437f095abe6a07cc0f45c3..3d6dc8e68fc4db6c0162efa7be6a9e42ee8359eb 100644
--- a/applications/utilities/preProcessing/boxTurb/boxTurb.C
+++ b/applications/utilities/preProcessing/boxTurb/boxTurb.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,15 +43,15 @@ Description
 int main(int argc, char *argv[])
 {
     argList::noParallel();
-#   include "setRootCase.H"
+    #include "setRootCase.H"
 
-#   include "createTime.H"
-#   include "createMesh.H"
-#   include "createFields.H"
-#   include "readBoxTurbDict.H"
+    #include "createTime.H"
+    #include "createMesh.H"
+    #include "createFields.H"
+    #include "readBoxTurbDict.H"
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Kmesh K(mesh);
 
@@ -67,7 +67,12 @@ int main(int argc, char *argv[])
 
     U.write();
 
-    calcEk(U, K).write(runTime.timePath()/"Ek", runTime.graphFormat());
+    calcEk(U, K).write
+    (
+        runTime.path()/"graphs"/runTime.timeName(),
+        "Ek",
+        runTime.graphFormat()
+    );
 
     Info<< "end" << endl;
 
diff --git a/applications/utilities/surface/surfaceMeshInfo/Make/files b/applications/utilities/surface/surfaceMeshInfo/Make/files
new file mode 100644
index 0000000000000000000000000000000000000000..a008b33fd2bd29a071cf5d6a9cf43bed995f29bb
--- /dev/null
+++ b/applications/utilities/surface/surfaceMeshInfo/Make/files
@@ -0,0 +1,3 @@
+surfaceMeshInfo.C
+
+EXE = $(FOAM_APPBIN)/surfaceMeshInfo
diff --git a/applications/utilities/surface/surfaceMeshInfo/Make/options b/applications/utilities/surface/surfaceMeshInfo/Make/options
new file mode 100644
index 0000000000000000000000000000000000000000..42b30c86523f83efafbd2dbe5d52cc7487ec4101
--- /dev/null
+++ b/applications/utilities/surface/surfaceMeshInfo/Make/options
@@ -0,0 +1,5 @@
+EXE_INC = \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude
+
+EXE_LIBS = -lmeshTools -lsurfMesh
diff --git a/applications/utilities/surface/surfaceMeshInfo/surfaceMeshInfo.C b/applications/utilities/surface/surfaceMeshInfo/surfaceMeshInfo.C
new file mode 100644
index 0000000000000000000000000000000000000000..0e08e333fdbf02a43d877cbafbeffdea4c1034ba
--- /dev/null
+++ b/applications/utilities/surface/surfaceMeshInfo/surfaceMeshInfo.C
@@ -0,0 +1,177 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Application
+    surfaceMeshInfo
+
+Description
+    Miscellaneous information about surface meshes
+
+Usage
+    - surfaceMeshInfo surfaceFile [OPTION]
+
+    \param -areas \n
+    Report area for each face.
+
+    \param -scale \<scale\> \n
+    Specify a scaling factor when reading files.
+
+    \param -xml \n
+    Write output in XML format.
+
+Note
+    The filename extensions are used to determine the file format type.
+
+    The XML-like output can be useful for extraction with other tools,
+    but either output format can be easily extracted with a simple sed
+    command:
+    \verbatim
+        surfaceMeshInfo surfaceFile -areas | \
+            sed -ne '/areas/,/:/{ /:/!p }'
+
+        surfaceMeshInfo surfaceFile -areas -xml | \
+            sed -ne '/<areas/,/</{ /</!p }'
+    \endverbatim
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "timeSelector.H"
+#include "Time.H"
+
+#include "UnsortedMeshedSurfaces.H"
+
+using namespace Foam;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+//  Main program:
+
+int main(int argc, char *argv[])
+{
+    argList::addNote
+    (
+        "information about surface meshes"
+    );
+
+    argList::noBanner();
+    argList::noParallel();
+    argList::validArgs.append("surfaceFile");
+
+    argList::addOption
+    (
+        "scale",
+        "factor",
+        "geometry scaling factor - default is 1"
+    );
+    argList::addBoolOption
+    (
+        "areas",
+        "display area of each face"
+    );
+    argList::addBoolOption
+    (
+        "xml",
+        "write output in XML format"
+    );
+
+    argList args(argc, argv);
+    Time runTime(args.rootPath(), args.caseName());
+
+    const fileName importName = args[1];
+
+    // check that reading is supported
+    if (!UnsortedMeshedSurface<face>::canRead(importName, true))
+    {
+        return 1;
+    }
+
+    const bool writeXML = args.optionFound("xml");
+    const bool writeAreas = args.optionFound("areas");
+
+
+    // use UnsortedMeshedSurface, not MeshedSurface to maintain ordering
+    UnsortedMeshedSurface<face> surf(importName);
+
+    scalar scaling = 0;
+    if (args.optionReadIfPresent("scale", scaling) && scaling > 0)
+    {
+        Info<< " -scale " << scaling << endl;
+        surf.scalePoints(scaling);
+    }
+
+    scalar areaTotal = 0;
+
+    if (writeXML)
+    {
+        Info<<"<?xml version='1.0' encoding='utf-8'?>" << nl
+            <<"<surfaceMeshInfo>" << nl
+            << "<npoints>" << surf.nPoints() << "</npoints>" << nl
+            << "<nfaces>"  << surf.size() << "</nfaces>" << nl;
+
+        if (writeAreas)
+        {
+            Info<<"<areas size='" << surf.size() << "'>" << nl;
+        }
+    }
+    else
+    {
+        Info<< "nPoints   : " << surf.nPoints() << nl
+            << "nFaces    : " << surf.size() << nl;
+
+        if (writeAreas)
+        {
+            Info<< "areas     : " << nl;
+        }
+    }
+
+    forAll(surf, faceI)
+    {
+        const scalar fArea(surf[faceI].mag(surf.points()));
+        areaTotal += fArea;
+
+        if (writeAreas)
+        {
+            Info<< fArea << nl;
+        }
+    }
+
+    if (writeXML)
+    {
+        if (writeAreas)
+        {
+            Info<<"</areas>" << nl;
+        }
+
+        Info<< "<area>" << areaTotal << "</area>" << nl
+            << "</surfaceMeshInfo>" << nl;
+    }
+    else
+    {
+        Info<< "area      : " << areaTotal << nl;
+    }
+
+    return 0;
+}
+
+// ************************************************************************* //
diff --git a/bin/foamEtcFile b/bin/foamEtcFile
index a6859b6ae5a1a4f52e4b4084937acf8c1c0016de..8a1f5d97e627a1eed729cfb6d725f54a11f8cbf0 100755
--- a/bin/foamEtcFile
+++ b/bin/foamEtcFile
@@ -38,9 +38,13 @@
 #            && _foamSource $foamPrefs
 #     \endcode
 #
+# Note
+#     This script must exist in <foamInstall>/OpenFOAM-<VERSION>/bin/
+#     or <foamInstall>/openfoam<VERSION>/bin/ (for the debian version)
+#
 #-------------------------------------------------------------------------------
 usage() {
-    [ "$quietOpt" = true ] && exit 1
+    [ "${quietOpt:-$silentOpt}" = true ] && exit 1
 
     exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
@@ -53,6 +57,7 @@ options:
   -mode <mode>      any combination of u(user), g(group), o(other)
   -prefix <dir>     specify an alternative installation prefix
   -quiet            suppress all normal output
+  -silent           suppress all stderr output
   -version <ver>    specify an alternative OpenFOAM version
                     in the form Maj.Min.Rev (eg, 1.7.0)
   -help             print the usage
@@ -72,13 +77,9 @@ USAGE
     exit 1
 }
 
-#
-# This script must exist in <foamInstall>/OpenFOAM-<VERSION>/bin/
-# or <foamInstall>/openfoam<VERSION>/bin/ (for the debian version)
-#
 #-------------------------------------------------------------------------------
 
-# the bindir:
+# the bin dir:
 binDir="${0%/*}"
 
 # the project dir:
@@ -128,7 +129,7 @@ esac
 
 # default mode is 'ugo'
 mode=ugo
-unset listOpt quietOpt
+unset listOpt quietOpt silentOpt
 
 # parse options
 while [ "$#" -gt 0 ]
@@ -162,6 +163,9 @@ do
     -q | -quiet)
         quietOpt=true
         ;;
+    -s | -silent)
+        silentOpt=true
+        ;;
     -v | -version)
         [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
         version="$2"
@@ -241,7 +245,7 @@ then
     # list directories, or potential file locations
     [ "$nArgs" -le 1 ] || usage
 
-    # a silly combination, but -quiet has precedence
+    # a silly combination, but -quiet does have precedence
     [ "$quietOpt" = true ] && exit 0
 
     for dir
diff --git a/bin/foamExec b/bin/foamExec
index 26ad311349634023a0c9c17ddbfed2dc057f3f1b..fba65934cc9dbe55b91c3c810d46cadc9249f156 100755
--- a/bin/foamExec
+++ b/bin/foamExec
@@ -31,12 +31,21 @@
 #     Runs the <foamVersion> version of executable <foamCommand>
 #     with the rest of the arguments.
 #
-#     Can also be used for parallel runs e.g.
-#     mpirun -np <nProcs> \
-#         foamExec -v <foamVersion> <foamCommand> ... -parallel
+#     Can also be used for parallel runs. For example,
+#     \code
+#         mpirun -np <nProcs> \
+#             foamExec -version <foamVersion> <foamCommand> ... -parallel
+#     \endcode
+#
+# Note
+#     This script must exist in <foamInstall>/OpenFOAM-<VERSION>/bin/
+#     or <foamInstall>/openfoam<VERSION>/bin/ (for the debian version)
+#
+#     foamEtcFile must be found in the same directory as this script
 #
 # SeeAlso
 #    foamEtcFile
+#
 #------------------------------------------------------------------------------
 usage() {
     exec 1>&2
@@ -46,9 +55,11 @@ usage() {
 Usage: ${0##*/} [OPTION] <application> ...
 
 options:
+  -prefix <dir>     specify an alternative installation prefix
+                    pass through to foamEtcFile and set as FOAM_INST_DIR
   -version <ver>    specify an alternative OpenFOAM version
                     pass through to foamEtcFile
-  -help             this usage
+  -help             print the usage
 
 * run a particular OpenFOAM version of <application>
 
@@ -56,13 +67,21 @@ USAGE
     exit 1
 }
 
-#
-# This script must exist in <foamInstall>/OpenFOAM-<VERSION>/bin/
-# or <foamInstall>/openfoam<VERSION>/bin/ (for the debian version)
-#
-# foamEtcFile must be found in the same directory as this script
 #-------------------------------------------------------------------------------
 
+# the bin dir:
+binDir="${0%/*}"
+
+# the project dir:
+projectDir="${binDir%/bin}"
+
+# the prefix dir (same as foamInstall):
+prefixDir="${projectDir%/*}"
+
+# # the name used for the project directory
+# projectDirName="${projectDir##*/}"
+
+
 unset etcOpts version
 # parse options
 while [ "$#" -gt 0 ]
@@ -71,15 +90,21 @@ do
     -h | -help)
         usage
         ;;
-    -v | -version)
+    -m | -mode)
+        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+        etcOpts="$etcOpts $1 $2"    # pass-thru to foamEtcFile
+        shift
+        ;;
+    -p | -prefix)
         [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
-        version="$2"
         etcOpts="$etcOpts $1 $2"    # pass-thru to foamEtcFile
+        prefixDir="$2"
         shift
         ;;
-    -m | -mode | -p | -prefix)
+    -v | -version)
         [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
         etcOpts="$etcOpts $1 $2"    # pass-thru to foamEtcFile
+        version="$2"
         shift
         ;;
     --)
@@ -96,22 +121,21 @@ do
     shift
 done
 
-
 #
 # Find and source OpenFOAM settings (bashrc)
 # placed in function to preserve command-line arguments
 #
 sourceRc()
 {
-    # default is the current version
-    : ${version:=${WM_PROJECT_VERSION:-unknown}}
-
-    foamDotFile="$(${0%/*}/foamEtcFile $etcOpts bashrc)" || {
-        echo "Error : bashrc file could not be found for OpenFOAM-$version" 1>&2
+    foamDotFile="$($binDir/foamEtcFile $etcOpts bashrc)" || {
+        echo "Error : bashrc file could not be found for OpenFOAM-${version:-${WM_PROJECT_VERSION:-???}}" 1>&2
         exit 1
     }
 
-    . $foamDotFile
+    # set to consistent value before sourcing the bashrc
+    export FOAM_INST_DIR="$prefixDir"
+
+    . $foamDotFile $FOAM_SETTINGS
 }
 
 
diff --git a/bin/foamJob b/bin/foamJob
index 4380b3e14731b0dbcfb816b23b337cb839564139..70e2c39f28489556edec25237512b703a7ff63fc 100755
--- a/bin/foamJob
+++ b/bin/foamJob
@@ -26,6 +26,8 @@
 #     foamJob
 #
 # Description
+#     Run an OpenFOAM job in background.
+#     Redirects the output to 'log' in the case directory.
 #
 #------------------------------------------------------------------------------
 usage() {
@@ -36,9 +38,9 @@ usage() {
 Usage: ${0##*/} [OPTION] <application> ...
 options:
   -case <dir>       specify alternative case directory, default is the cwd
-  -p                parallel run of processors
-  -s                also sends output to screen
-  -v <ver>          specify OpenFOAM version
+  -parallel         parallel run of processors
+  -screen           also sends output to screen
+  -version <ver>    specify an alternative OpenFOAM version
   -help             print the usage
 
 * run an OpenFOAM job in background.
@@ -95,23 +97,22 @@ do
       usage
       ;;
    -case)
-      [ "$#" -ge 2 ] || usage "'-case' option requires an argument"
-      caseDir=$2
+      [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+      cd "$2" 2>/dev/null || usage "directory does not exist:  '$2'"
       shift 2
-      cd "$caseDir" 2>/dev/null || usage "directory does not exist:  '$caseDir'"
       ;;
-   -p)
+   -p | -parallel)
       parallelOpt=true
       shift
       ;;
-   -s)
+   -s | -screen)
       screenOpt=true
       shift
       ;;
-   -v)
-      shift
-      version=$1
-      shift
+   -v | -version)
+      [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+      version="$2"
+      shift 2
       ;;
    --)
       shift
@@ -126,29 +127,32 @@ do
    esac
 done
 
-if [ "$#" -lt 1 ]
-then
-    usage "No application specified"
-fi
+[ "$#" -ge 1 ] || usage "No application specified"
+
 
-# use foamExec for a specified version and for remote (parallel) runs
+# use foamExec for a specified version
+# also need foamExec for remote (parallel) runs
 if [ -n "$version" -o "$parallelOpt" = true ]
 then
-    APPLICATION=`findExec foamExec`
-    if [ $? -ne 0 ]
+    # when possible, determine if application even exists
+    if [ -z "$version" ]
     then
-        usage "'foamExec' not found"
+        findExec $1 >/dev/null || usage "Application '$1' not found"
     fi
-    if [ -n "$version" ]
+
+    # use foamExec for dispatching
+    APPLICATION=`findExec foamExec` || usage "'foamExec' not found"
+
+    [ -n "$version" ] && APPLICATION="$APPLICATION -version $version"
+
+    # attempt to preserve the installation directory 'FOAM_INST_DIR'
+    if [ -d "$FOAM_INST_DIR" ]
     then
-        APPLICATION="$APPLICATION -v $version"
+        APPLICATION="$APPLICATION -prefix $FOAM_INST_DIR"
     fi
+
 else
-    APPLICATION=`findExec $1`
-    if [ $? -ne 0 ]
-    then
-        usage "Application '$1' executable not found"
-    fi
+    APPLICATION=`findExec $1` || usage "Application '$1' not found"
     echo "Application : $1"
     shift
 fi
@@ -182,11 +186,7 @@ then
     #
     # locate mpirun
     #
-    mpirun=`findExec mpirun`
-    if [ $? -ne 0 ]
-    then
-        usage "'mpirun' not found"
-    fi
+    mpirun=`findExec mpirun` || usage "'mpirun' not found"
     mpiopts="-np $NPROCS"
 
     #
@@ -217,10 +217,10 @@ then
     #
     if [ "$screenOpt" = true ]
     then
-        echo "Executing: mpirun $mpiopts $APPLICATION $@ -parallel | tee log"
-        $mpirun $mpiopts $APPLICATION $@ -parallel  | tee log
+        echo "Executing: $mpirun $mpiopts $APPLICATION $@ -parallel | tee log"
+        $mpirun $mpiopts $APPLICATION $@ -parallel | tee log
     else
-        echo "Executing: mpirun $mpiopts $APPLICATION $@ -parallel > log 2>&1"
+        echo "Executing: $mpirun $mpiopts $APPLICATION $@ -parallel > log 2>&1"
         $mpirun $mpiopts $APPLICATION $@ -parallel > log 2>&1 &
     fi
 
diff --git a/doc/changes/inotify.txt b/doc/changes/inotify.txt
index 0f91d7c03b35140c3fa0f33656638165fe231e47..74e2fc7bb4adb50e007fd659817fbdeddae76661 100644
--- a/doc/changes/inotify.txt
+++ b/doc/changes/inotify.txt
@@ -55,15 +55,25 @@ timestamps as before or the (linux-specific) 'inotify' system framework
         - the slave processor directories have no system directory and the
           constant directory only contains the mesh.
     - start the job in distributed mode by specifying the slave roots
-      (so one less than the number of processors) with
-      the -roots command line option:
+      (so one fewer than the number of processors) with
+      the -roots command-line option:
 
-        mpirun -np 2 icoFoam -roots '("/tmp")' -parallel
+        mpirun -np 4 icoFoam -roots '("/tmp" "/tmp" "/tmp")' -parallel
 
     - the alternative to the -roots option is to have a
       cavity/system/decomposeParDict on the master with
             distributed     yes;
-            roots           ("/tmp");
+            roots           ("/tmp" "/tmp" "/tmp");
+
+    - as a convenience for cases when the slave roots are identical,
+      a single root entry is interpreted as being the same for all slaves.
+      With the -roots command-line option, this can take one of two forms:
+
+        mpirun -np 4 icoFoam -roots '("/tmp")' -parallel
+
+      or simply
+
+        mpirun -np 4 icoFoam -roots '"/tmp"' -parallel
 
 
 Details:
diff --git a/etc/apps/paraview3/bashrc b/etc/apps/paraview3/bashrc
index e0e6122946c900da0f723fc35d0355ade480ffbe..1dd5386829359ddd134b8d74ee62f3eb157906f0 100644
--- a/etc/apps/paraview3/bashrc
+++ b/etc/apps/paraview3/bashrc
@@ -56,16 +56,22 @@ export ParaView_MAJOR=detect
 
 
 # Evaluate command-line parameters for ParaView
-while [ $# -gt 0 ]
-do
-    case "$1" in
-    ParaView*=*)
-        # name=value  -> export name=value
-        eval "export $1"
-        ;;
-    esac
-    shift
-done
+_foamParaviewEval()
+{
+    while [ $# -gt 0 ]
+    do
+        case "$1" in
+        ParaView*=*)
+            # name=value  -> export name=value
+            eval "export $1"
+            ;;
+        esac
+        shift
+    done
+}
+
+# Evaluate command-line parameters
+_foamParaviewEval $@
 
 
 # set MAJOR version to correspond to VERSION
@@ -108,6 +114,7 @@ else
 fi
 
 
+unset _foamParaviewEval
 unset cleaned cmake paraviewInstDir paraviewPython
 
 # -----------------------------------------------------------------------------
diff --git a/etc/bashrc b/etc/bashrc
index 2de27d05134c1c5fd6833c80ef383da814120287..d2539c5b5012bcf606366ef7d4d33bc24f617f1a 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -144,6 +144,10 @@ _foamEval()
     while [ $# -gt 0 ]
     do
         case "$1" in
+        -*)
+            # stray option (not meant for us here) -> get out
+            break
+            ;;
         *=)
             # name=       -> unset name
             [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "unset ${1%=}"
@@ -160,7 +164,7 @@ _foamEval()
             then
                 _foamSource "$1"
             else
-                _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile "$1"`
+                _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile -silent "$1"`
             fi
             ;;
         esac
diff --git a/etc/config/compiler.csh-EXAMPLE b/etc/config/compiler.csh-EXAMPLE
new file mode 100644
index 0000000000000000000000000000000000000000..6d54edbd479480932a8d0ddcb15d27529592e77b
--- /dev/null
+++ b/etc/config/compiler.csh-EXAMPLE
@@ -0,0 +1,51 @@
+#----------------------------------*-sh-*--------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software: you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#
+# File
+#     config/compiler.csh
+#
+# Description
+#     Fine tuning of ThirdParty compiler settings for OpenFOAM
+#     Sourced from OpenFOAM-<VERSION>/etc/settings.csh
+#
+#------------------------------------------------------------------------------
+
+# Modified compiler settings
+switch ("$WM_COMPILER")
+case Gcc46:
+case Gcc46++0x:
+    set gcc_version=gcc-4.6.0
+    set gmp_version=gmp-5.0.1
+    set mpfr_version=mpfr-2.4.2
+    set mpc_version=mpc-0.8.1
+    breaksw
+case Gcc45:
+case Gcc45++0x:
+    set gcc_version=gcc-4.5.2
+    set gmp_version=gmp-5.0.1
+    set mpfr_version=mpfr-2.4.2
+    set mpc_version=mpc-0.8.1
+    breaksw
+endsw
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/etc/config/compiler.sh-EXAMPLE b/etc/config/compiler.sh-EXAMPLE
new file mode 100644
index 0000000000000000000000000000000000000000..bc6aada36e279d1857642f9fcb062d9e359dd22a
--- /dev/null
+++ b/etc/config/compiler.sh-EXAMPLE
@@ -0,0 +1,49 @@
+#----------------------------------*-sh-*--------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software: you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#
+# File
+#     config/compiler.sh
+#
+# Description
+#     Fine tuning of ThirdParty compiler settings for OpenFOAM
+#     Sourced from OpenFOAM-<VERSION>/etc/settings.sh
+#
+#------------------------------------------------------------------------------
+
+# Modified compiler settings
+case "$WM_COMPILER" in
+Gcc46 | Gcc46++0x)
+    gcc_version=gcc-4.6.0
+    gmp_version=gmp-5.0.1
+    mpfr_version=mpfr-2.4.2
+    mpc_version=mpc-0.8.1
+    ;;
+Gcc45 | Gcc45++0x)
+    gcc_version=gcc-4.5.2
+    gmp_version=gmp-5.0.1
+    mpfr_version=mpfr-2.4.2
+    mpc_version=mpc-0.8.1
+    ;;
+esac
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/etc/config/openmpi.csh-EXAMPLE b/etc/config/openmpi.csh-EXAMPLE
new file mode 100644
index 0000000000000000000000000000000000000000..94be702e9d7c051524390808d288609d80a7dc01
--- /dev/null
+++ b/etc/config/openmpi.csh-EXAMPLE
@@ -0,0 +1,36 @@
+#----------------------------------*-sh-*--------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software: you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#
+# File
+#     config/openmpi.csh
+#
+# Description
+#     Fine tuning of openmpi settings for OpenFOAM
+#     Sourced from OpenFOAM-<VERSION>/etc/settings.csh
+#
+#------------------------------------------------------------------------------
+
+# Modified openmpi settings
+setenv FOAM_MPI openmpi-1.4.3
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/etc/config/openmpi.sh-EXAMPLE b/etc/config/openmpi.sh-EXAMPLE
new file mode 100644
index 0000000000000000000000000000000000000000..b7c5035b0487fc65c9c29563772e5c7af0b9fd4e
--- /dev/null
+++ b/etc/config/openmpi.sh-EXAMPLE
@@ -0,0 +1,36 @@
+#----------------------------------*-sh-*--------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software: you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#
+# File
+#     config/openmpi.sh
+#
+# Description
+#     Fine tuning of openmpi settings for OpenFOAM
+#     Sourced from OpenFOAM-<VERSION>/etc/settings.sh
+#
+#------------------------------------------------------------------------------
+
+# Modified openmpi settings
+export FOAM_MPI=openmpi-1.4.3
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/etc/cshrc b/etc/cshrc
index a23a607fff1e0fc4c21bab62777bb2a77b935164..c2c1b12a9b7757074536e74a937a034b7e07ad58 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -142,6 +142,10 @@ _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile prefs.csh`
 setenv FOAM_SETTINGS "${*}"
 while ( $#argv > 0 )
     switch ($argv[1])
+    case -*:
+        # stray option (not meant for us here) -> get out
+        break
+        breaksw
     case *=:
         # name=       -> unsetenv name
         if ($?FOAM_VERBOSE && $?prompt) echo "unsetenv $argv[1]:s/=//"
@@ -157,7 +161,7 @@ while ( $#argv > 0 )
         if ( -f "$1" ) then
             _foamSource "$1"
         else
-            _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile "$1"`
+            _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile -silent "$1"`
         endif
         breaksw
     endsw
diff --git a/etc/settings.csh b/etc/settings.csh
index 5b4c41df822789c03d1c2cb96f1aa1d7eebc41b2..b3daf1e2884c471bb3ff465c21f540dc43838b63 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -248,6 +248,9 @@ case ThirdParty:
         breaksw
     endsw
 
+    # optional configuration tweaks:
+    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/compiler.csh`
+
     if ( $?gcc_version ) then
         set gccDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$gcc_version
         set gmpDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$gmp_version
@@ -367,8 +370,10 @@ unsetenv MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN
 
 switch ("$WM_MPLIB")
 case OPENMPI:
-    #setenv FOAM_MPI openmpi-1.4.3
     setenv FOAM_MPI openmpi-1.5.3
+    # optional configuration tweaks:
+    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/openmpi.csh`
+
     setenv MPI_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
 
     # Tell OpenMPI where to find its install directory
diff --git a/etc/settings.sh b/etc/settings.sh
index 84c6fd0bc1a3f38aca695c570d5da8a510c33539..954868dad157e58c271ae94d02e808128bb1cb58 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -265,6 +265,9 @@ OpenFOAM | ThirdParty)
         ;;
     esac
 
+    # optional configuration tweaks:
+    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/compiler.sh`
+
     if [ -n "$gcc_version" ]
     then
         gccDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$gcc_version
@@ -387,8 +390,10 @@ unset MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN
 
 case "$WM_MPLIB" in
 OPENMPI)
-    #export FOAM_MPI=openmpi-1.4.3
     export FOAM_MPI=openmpi-1.5.3
+    # optional configuration tweaks:
+    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/openmpi.sh`
+
     export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
 
     # Tell OpenMPI where to find its install directory
diff --git a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
index 6020d24d196faa3a8075cfe3ddd09a0e5381ad64..10cb44fa272e2d7581a50d0a6083019745358525 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
+++ b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
@@ -2282,7 +2282,7 @@ void Foam::indexedOctree<Type>::writeOBJ
     {
         subBb = nodes_[getNode(index)].bb_;
     }
-    else if (isContent(index))
+    else if (isContent(index) || isEmpty(index))
     {
         subBb = nodes_[nodeI].bb_.subBbox(octant);
     }
@@ -2290,17 +2290,21 @@ void Foam::indexedOctree<Type>::writeOBJ
     Pout<< "dumpContentNode : writing node:" << nodeI << " octant:" << octant
         << " to " << str.name() << endl;
 
-    label vertI = 0;
-
     // Dump bounding box
     pointField bbPoints(subBb.points());
 
-    label pointVertI = vertI;
+    forAll(bbPoints, i)
+    {
+        const point& pt = bbPoints[i];
+
+        str<< "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << endl;
+    }
+
     forAll(treeBoundBox::edges, i)
     {
         const edge& e = treeBoundBox::edges[i];
 
-        str<< "l " << e[0]+pointVertI+1 << ' ' << e[1]+pointVertI+1 << nl;
+        str<< "l " << e[0] + 1 << ' ' << e[1] + 1 << nl;
     }
 }
 
@@ -2852,6 +2856,11 @@ void Foam::indexedOctree<Type>::print
         {
             const labelList& indices = contents_[getContent(index)];
 
+            if (debug)
+            {
+                writeOBJ(nodeI, octant);
+            }
+
             os  << "octant:" << octant
                 << " content: n:" << indices.size()
                 << " bb:" << subBb;
@@ -2868,6 +2877,11 @@ void Foam::indexedOctree<Type>::print
         }
         else
         {
+            if (debug)
+            {
+                writeOBJ(nodeI, octant);
+            }
+
             os  << "octant:" << octant << " empty:" << subBb << endl;
         }
     }
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C
index ee20e33191c14bc05e5a780cee322ffbb631217f..c45ef4f29132f0315ae90d9bae4eae06a5ca19fd 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,6 +39,9 @@ const Foam::word Foam::functionEntries::includeEntry::typeName
 // might include includeEntry
 int Foam::functionEntries::includeEntry::debug(0);
 
+bool Foam::functionEntries::includeEntry::report(false);
+
+
 namespace Foam
 {
 namespace functionEntries
@@ -89,10 +92,15 @@ bool Foam::functionEntries::includeEntry::execute
     Istream& is
 )
 {
-    IFstream ifs(includeFileName(is));
+    const fileName fName(includeFileName(is));
+    IFstream ifs(fName);
 
     if (ifs)
     {
+        if (Foam::functionEntries::includeEntry::report)
+        {
+            Info<< fName << endl;
+        }
         parentDict.read(ifs);
         return true;
     }
@@ -119,10 +127,15 @@ bool Foam::functionEntries::includeEntry::execute
     Istream& is
 )
 {
-    IFstream ifs(includeFileName(is));
+    const fileName fName(includeFileName(is));
+    IFstream ifs(fName);
 
     if (ifs)
     {
+        if (Foam::functionEntries::includeEntry::report)
+        {
+            Info<< fName << endl;
+        }
         entry.read(parentDict, ifs);
         return true;
     }
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H
index 5145b742ae69ce331399881dc0151e17ce4aed9b..be99bf588afd91bae67f2ed5f4606165145dbec7 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H
@@ -82,6 +82,12 @@ protected:
 
 public:
 
+    // Static data members
+
+        //- Report which file is included to stdout
+        static bool report;
+
+
     //- Runtime type information
     ClassName("include");
 
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeIfPresentEntry/includeIfPresentEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/includeIfPresentEntry/includeIfPresentEntry.C
index 86f16181637017f9b4fd3c2c69bf90473da846c9..8e1bc9b7f11f99df0778e688432bf37708d6a2c7 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/includeIfPresentEntry/includeIfPresentEntry.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/includeIfPresentEntry/includeIfPresentEntry.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,10 +69,15 @@ bool Foam::functionEntries::includeIfPresentEntry::execute
     Istream& is
 )
 {
-    IFstream ifs(includeFileName(is));
+    const fileName fName(includeFileName(is));
+    IFstream ifs(fName);
 
     if (ifs)
     {
+        if (Foam::functionEntries::includeEntry::report)
+        {
+            Info<< fName << endl;
+        }
         parentDict.read(ifs);
     }
 
@@ -87,10 +92,15 @@ bool Foam::functionEntries::includeIfPresentEntry::execute
     Istream& is
 )
 {
-    IFstream ifs(includeFileName(is));
+    const fileName fName(includeFileName(is));
+    IFstream ifs(fName);
 
     if (ifs)
     {
+        if (Foam::functionEntries::includeEntry::report)
+        {
+            Info<< fName << endl;
+        }
         entry.read(parentDict, ifs);
     }
 
diff --git a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C
index 56402b28e5400e51f9371154b44c37ebe702121e..78b696fa5af3bd02b67948a52aac53721c9afc56 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C
+++ b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.H b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.H
index 61a49e60cd669154ec88cd02772c37ba6e1b0c71..2d5003a2e5313c89e097e99be1f9005700afbc55 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.H
+++ b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::dynamicCode
diff --git a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.C b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.C
index 93d6ebbdd722790aecec848957251fed5e51fae2..48691501eeca585848b66d0c10214a20599f8546 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.C
+++ b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.H b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.H
index 8ff83b0724ff02f26f6a26788031eb5265f936ff..2aa4403137b792f86be0dcd780a098ff68e29855 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.H
+++ b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::dynamicCodeContext
diff --git a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.C b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.C
index f81e6427f1524689cb45ac52b579dd5ce68a29a1..1a10d52c3196a4a0f2b3050408b2c11117e40a7a 100644
--- a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.C
+++ b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H
index 0133167ee73ba526ba095dfabf9319bda3b48a41..c2c3ded50f19fbe5e534dcacd0f3ff7c9dd007bf 100644
--- a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H
+++ b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C
index 4f21fb5afa30146eb754321a7c836a4acee3ff04..37fd27a36dcf790b8d1624e547116bb1bf3dd64d 100644
--- a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C
+++ b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H
index d0adec4e9c5d374d76cf2bbb6309e99a090aac7e..e4c763005c6e405955d96cbd1d89796ffa4c3d13 100644
--- a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H
+++ b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
index 721f61e94949c8cef41a10a601d26b1df0587403..83859ea173541028b38403e90b5b926653c6517e 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
index dc4f1449517b9a11558a5958d4663e0d00ec0c73..c688b6dae11a7a5fa6aacd2404649ce21976c115 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
index d58eaf4311baf27bcd8575fdacb491761c40000f..937b789c4475faaed7a182eeee2f3d6b9eda0a4d 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
index 0c1f4f70843f0240c81ec34a85d03cc4635f56fb..58296fcf602b777f857bbce542847bae09cc5ed1 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C b/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C
index c119eb33fc9559849e9236c7f6f6c0020e113ee7..91ae13e70fb9a044c627d504e08ee42c41ceacc4 100644
--- a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C
+++ b/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.H b/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.H
index 3096ed4f2fc0c35a4c0a78c5ea7e56be3ff5e999..edb260a63ca8d82e24239a45f72ccd45248fec00 100644
--- a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.H
+++ b/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/fields/FieldFields/oneFieldField/oneFieldField.H b/src/OpenFOAM/fields/FieldFields/oneFieldField/oneFieldField.H
index fbd2a0b702a2b37cfcb93dbb40b6f66fa071fdf2..7be335362454fd9cea3d1f86073177c87a54ec88 100644
--- a/src/OpenFOAM/fields/FieldFields/oneFieldField/oneFieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/oneFieldField/oneFieldField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/fields/FieldFields/oneFieldField/oneFieldFieldI.H b/src/OpenFOAM/fields/FieldFields/oneFieldField/oneFieldFieldI.H
index c44b854979eaca45dc2cb8dff81f94958ae37bf6..f724ca74e87ac267f92c9cf957a6ed5f51510509 100644
--- a/src/OpenFOAM/fields/FieldFields/oneFieldField/oneFieldFieldI.H
+++ b/src/OpenFOAM/fields/FieldFields/oneFieldField/oneFieldFieldI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/fields/FieldFields/zeroFieldField/zeroFieldField.H b/src/OpenFOAM/fields/FieldFields/zeroFieldField/zeroFieldField.H
index ee9d5996f353549174367db0842831dcb0ecf389..94aa81923b96739733ca8e341eb943fe2c7e1d18 100644
--- a/src/OpenFOAM/fields/FieldFields/zeroFieldField/zeroFieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/zeroFieldField/zeroFieldField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/fields/FieldFields/zeroFieldField/zeroFieldFieldI.H b/src/OpenFOAM/fields/FieldFields/zeroFieldField/zeroFieldFieldI.H
index b813d487bc7a5582f76000521329ea678068fca7..69902a18ca61d503227869be11457dddab5093c4 100644
--- a/src/OpenFOAM/fields/FieldFields/zeroFieldField/zeroFieldFieldI.H
+++ b/src/OpenFOAM/fields/FieldFields/zeroFieldField/zeroFieldFieldI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/fields/Fields/labelField/labelFieldIOField.C b/src/OpenFOAM/fields/Fields/labelField/labelFieldIOField.C
index 10466a4b1f6c938a77e0b065b20439eb7ad5327f..888c5a8966979a64f58f4cde0e063f5cf257bb0f 100644
--- a/src/OpenFOAM/fields/Fields/labelField/labelFieldIOField.C
+++ b/src/OpenFOAM/fields/Fields/labelField/labelFieldIOField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/fields/Fields/labelField/labelFieldIOField.H b/src/OpenFOAM/fields/Fields/labelField/labelFieldIOField.H
index f94c497f9bc8092abe3d44f1002703706a33a6b7..976270e65fe294f8f3de59e84f936dc1f190e36b 100644
--- a/src/OpenFOAM/fields/Fields/labelField/labelFieldIOField.H
+++ b/src/OpenFOAM/fields/Fields/labelField/labelFieldIOField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/fields/Fields/scalarField/scalarFieldIOField.C b/src/OpenFOAM/fields/Fields/scalarField/scalarFieldIOField.C
index 9ac585cba5e24b995ce787f899e1d705f26711ea..07a22b365b0dbc8589fa4ced109a8783a671cafa 100644
--- a/src/OpenFOAM/fields/Fields/scalarField/scalarFieldIOField.C
+++ b/src/OpenFOAM/fields/Fields/scalarField/scalarFieldIOField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/fields/Fields/scalarField/scalarFieldIOField.H b/src/OpenFOAM/fields/Fields/scalarField/scalarFieldIOField.H
index f01fbe4bd60af5570d8d4c59542ce875a8ef0c00..d67704049e6bcdc1047f2eaa8c1fe6d6bda71297 100644
--- a/src/OpenFOAM/fields/Fields/scalarField/scalarFieldIOField.H
+++ b/src/OpenFOAM/fields/Fields/scalarField/scalarFieldIOField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H b/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H
index db192a19804bf8ba711cd15325b13338215ec3b1..76b096cb1ecba4793f4972650b2714d5b4a92b8d 100644
--- a/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H
+++ b/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneFieldI.H b/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneFieldI.H
index 240615af96a74a4404475c0fb6f3a2eaba6a5fdd..52409d02a5f44c306829093534e9d3128a76cd87 100644
--- a/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneFieldI.H
+++ b/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneFieldI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroField.H b/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroField.H
index 1524f7ac700cc8bc872d3917f3213548c0f67d88..ec7c6ff48a58f843cb0212b9d67e7b079ae937d9 100644
--- a/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroField.H
+++ b/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroFieldI.H b/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroFieldI.H
index 78a154faa4fe2fb719af6d997d11a34924d3cba9..eecca2bc0d2b01ba17b5ca46a6c6c9abf332ff57 100644
--- a/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroFieldI.H
+++ b/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroFieldI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index f055011bce90f4de68a76783b2b0cc185bfb6652..a020f3e5bdca03111bb057e80410af55fec0d0f8 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -548,10 +548,14 @@ Foam::argList::argList
 
             if (options_.found("roots"))
             {
-                source = "'-roots' option";
-                IStringStream str(options_["roots"]);
-                str >> roots;
-                dictNProcs = roots.size()+1;
+                source = "-roots";
+                IStringStream is(options_["roots"]);
+                roots = readList<fileName>(is);
+
+                if (roots.size() != 1)
+                {
+                    dictNProcs = roots.size()+1;
+                }
             }
             else
             {
@@ -579,6 +583,21 @@ Foam::argList::argList
                 }
             }
 
+            // convenience:
+            // when a single root is specified, use it for all processes
+            if (roots.size() == 1)
+            {
+                const fileName rootName(roots[0]);
+                roots.setSize(Pstream::nProcs()-1, rootName);
+
+                // adjust dictNProcs for command-line '-roots' option
+                if (dictNProcs < 0)
+                {
+                    dictNProcs = roots.size()+1;
+                }
+            }
+
+
             // Check number of processors.
             // nProcs     => number of actual procs
             // dictNProcs => number of procs specified in decompositionDict
@@ -602,11 +621,6 @@ Foam::argList::argList
             // distributed data
             if (roots.size())
             {
-                forAll(roots, i)
-                {
-                    roots[i].expand();
-                }
-
                 if (roots.size() != Pstream::nProcs()-1)
                 {
                     FatalError
@@ -617,6 +631,11 @@ Foam::argList::argList
                         << exit(FatalError);
                 }
 
+                forAll(roots, i)
+                {
+                    roots[i].expand();
+                }
+
                 // Distribute the master's argument list (with new root)
                 bool hadCaseOpt = options_.found("case");
                 for
@@ -626,11 +645,7 @@ Foam::argList::argList
                     slave++
                 )
                 {
-                    options_.set
-                    (
-                        "case",
-                        fileName(roots[slave-1])/globalCase_
-                    );
+                    options_.set("case", roots[slave-1]/globalCase_);
 
                     OPstream toSlave(Pstream::scheduled, slave);
                     toSlave << args_ << options_;
diff --git a/src/OpenFOAM/graph/graph.C b/src/OpenFOAM/graph/graph.C
index 1a0b8d1a4f3c0d32259147dc176e6b312eb4eca6..7dbefcb424a79f022c613d2d6e398df0d57cddb4 100644
--- a/src/OpenFOAM/graph/graph.C
+++ b/src/OpenFOAM/graph/graph.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,6 +27,7 @@ License
 #include "OFstream.H"
 #include "IOmanip.H"
 #include "Pair.H"
+#include "OSspecific.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -211,11 +212,11 @@ void Foam::graph::write(Ostream& os, const word& format) const
 }
 
 
-void Foam::graph::write(const fileName& fName, const word& format) const
+void Foam::graph::write(const fileName& pName, const word& format) const
 {
     autoPtr<writer> graphWriter(writer::New(format));
 
-    OFstream graphFile(fName + '.' + graphWriter().ext());
+    OFstream graphFile(pName + '.' + graphWriter().ext());
 
     if (graphFile.good())
     {
@@ -230,6 +231,18 @@ void Foam::graph::write(const fileName& fName, const word& format) const
 }
 
 
+void Foam::graph::write
+(
+    const fileName& path,
+    const word& name,
+    const word& format
+) const
+{
+    mkDir(path);
+    write(path/name, format);
+}
+
+
 Foam::Ostream& Foam::operator<<(Ostream& os, const graph& g)
 {
     g.writeTable(os);
diff --git a/src/OpenFOAM/graph/graph.H b/src/OpenFOAM/graph/graph.H
index 2e86c17efaec999e9ba33cca7964bd95ffc8ccaf..2519ca78f8bba9b2ec5d6cf5bfd74fc685bf2c75 100644
--- a/src/OpenFOAM/graph/graph.H
+++ b/src/OpenFOAM/graph/graph.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -252,8 +252,16 @@ public:
             //- Write graph to stream in given format
             void write(Ostream&, const word& format) const;
 
-            //- Write graph to file in given format
-            void write(const fileName& fName, const word& format) const;
+            //- Write graph to file in given path-name and format
+            void write(const fileName& pName, const word& format) const;
+
+            //- Write graph to file in given path, name and format
+            void write
+            (
+                const fileName& path,
+                const word& name,
+                const word& format
+            ) const;
 
 
     // Friend operators
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C
index 3e8618c17fa73f767f2c9fcd4f378802ea7a51f1..fc500af4aa5ffbb45f4f84385218690e65e3c508 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H
index 3c823f2e194930a3d956fd5ca5c95de90c215d24..30c9e8d9eb4d4872d8cab6efa184d5af136db105 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::tableReader
+    Foam::csvTableReader
 
 Description
     Reads an interpolation table from a file - CSV-format
@@ -44,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class csvTableReader Declaration
+                        Class csvTableReader Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Type>
@@ -52,26 +52,30 @@ class csvTableReader
 :
     public tableReader<Type>
 {
-    //- does the file have a header line?
-    const bool headerLine_;
+    // Private data
 
-    //- column of the time
-    const label timeColumn_;
+        //- Does the file have a header line?
+        const bool headerLine_;
 
-    //- labels of the components
-    const labelList componentColumns_;
+        //- Column of the time
+        const label timeColumn_;
 
-    //- read the next value from the splitted string
-    Type readValue(const List<string>&);
+        //- Labels of the components
+        const labelList componentColumns_;
+
+        //- Read the next value from the splitted string
+        Type readValue(const List<string>&);
+
+        //- Separator character
+        const char separator_;
 
-    //- separator character
-    const char separator_;
 
 public:
 
     //- Runtime type information
     TypeName("csv");
 
+
     // Constructors
 
         //- Construct from dictionary
@@ -91,8 +95,7 @@ public:
 
 
     //- Destructor
-
-        virtual ~csvTableReader();
+    virtual ~csvTableReader();
 
 
     // Member Functions
@@ -102,7 +105,6 @@ public:
 
         //- write the remaining parameters
         virtual void write(Ostream& os) const;
-
 };
 
 
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReaders.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReaders.C
index 5893436dd9de51c2900c85c3f02bcfe49dd4bea0..a6ffe258d6bc255f09c7a69cceae2cbc85b13f65 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReaders.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReaders.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.C
index 3ad1a87510e4dcd5a9a4ed4ddd43957125ed8b08..10a04b2bb1a953678717e66ac5b989461951e95e 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.H b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.H
index dd04df78d6a6c3f3a9aeb50d82355cf337fce408..8cde06f1a7736acae6c69aa9964c252718c178d1 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.H
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,13 +22,13 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::tableReader
+    Foam::openFoamTableReader
 
 Description
     Reads an interpolation table from a file - OpenFOAM-format
 
 SourceFiles
-    tableReader.C
+    openFoamTableReader.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -43,7 +43,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class openFoamTableReader Declaration
+                     Class openFoamTableReader Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Type>
@@ -57,6 +57,7 @@ public:
     //- Runtime type information
     TypeName("openFoam");
 
+
     // Constructors
 
         //- Construct from dictionary
@@ -76,15 +77,13 @@ public:
 
 
     //- Destructor
-
-        virtual ~openFoamTableReader();
+    virtual ~openFoamTableReader();
 
 
     // Member functions
 
         //- Read the table
         virtual void operator()(const fileName&, List<Tuple2<scalar, Type> > &);
-
 };
 
 
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReaders.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReaders.C
index 8dd7db0a9f9a4054394099b2bad1b53f93bfa8ec..847ac1dabb95a91913566d80bf59857d9ae22376 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReaders.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReaders.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C
index bcad2aa965e3ce19773eb657aa1a67b2d77597e8..8f8a5548a61cc9460655accf14f68c4c64d4bddf 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.H b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.H
index b85af66c101243c0cc9446f14154ee6326798924..9020fbd133de94a7e9900bdafafab06cb9b37ede 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.H
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class tableReader Declaration
+                         Class tableReader Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Type>
@@ -91,8 +91,7 @@ public:
 
 
     //- Destructor
-
-        virtual ~tableReader();
+    virtual ~tableReader();
 
 
     // Member functions
@@ -106,7 +105,6 @@ public:
 
         //- Write additional information
         virtual void write(Ostream& os) const;
-
 };
 
 
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.C
index a28c83218f3b8cd722b8e7ae418f75075385cd54..2500070484689d507485481e4e0756e7e43645be 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.H b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.H
index 9507ac2bfb5ab9fbdd8b030515cc3257dd33d65f..8e1c8a056104a9aff92e0fe1585ff9293bd6193d 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.H
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReaders.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/memory/Xfer/Xfer.H b/src/OpenFOAM/memory/Xfer/Xfer.H
index dbee0e641bfb202c786258c73f095e0067c9f829..cf49d6559a0d6ff4a6b65ab01e5a3908d6dd8e1e 100644
--- a/src/OpenFOAM/memory/Xfer/Xfer.H
+++ b/src/OpenFOAM/memory/Xfer/Xfer.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.C b/src/OpenFOAM/meshes/meshShapes/face/face.C
index 7dbd202335067831d33b8c138c903c2604a1d126..4128afc9a9036a0a8f79528c2ce6d7ca16f2ecb4 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -491,51 +491,52 @@ void Foam::face::flip()
 }
 
 
-Foam::point Foam::face::centre(const pointField& meshPoints) const
+Foam::point Foam::face::centre(const pointField& points) const
 {
     // Calculate the centre by breaking the face into triangles and
     // area-weighted averaging their centres
 
+    const label nPoints = size();
+
     // If the face is a triangle, do a direct calculation
-    if (size() == 3)
+    if (nPoints == 3)
     {
         return
             (1.0/3.0)
            *(
-               meshPoints[operator[](0)]
-             + meshPoints[operator[](1)]
-             + meshPoints[operator[](2)]
+               points[operator[](0)]
+             + points[operator[](1)]
+             + points[operator[](2)]
             );
     }
 
-    label nPoints = size();
 
     point centrePoint = point::zero;
-    for (register label pI=0; pI<nPoints; pI++)
+    for (register label pI=0; pI<nPoints; ++pI)
     {
-        centrePoint += meshPoints[operator[](pI)];
+        centrePoint += points[operator[](pI)];
     }
     centrePoint /= nPoints;
 
     scalar sumA = 0;
     vector sumAc = vector::zero;
 
-    for (register label pI=0; pI<nPoints; pI++)
+    for (register label pI=0; pI<nPoints; ++pI)
     {
-        const point& nextPoint = meshPoints[operator[]((pI + 1) % nPoints)];
+        const point& nextPoint = points[operator[]((pI + 1) % nPoints)];
 
         // Calculate 3*triangle centre
-        vector ttc
+        const vector ttc
         (
-            meshPoints[operator[](pI)]
+            points[operator[](pI)]
           + nextPoint
           + centrePoint
         );
 
         // Calculate 2*triangle area
-        scalar ta = Foam::mag
+        const scalar ta = Foam::mag
         (
-            (meshPoints[operator[](pI)] - centrePoint)
+            (points[operator[](pI)] - centrePoint)
           ^ (nextPoint - centrePoint)
         );
 
@@ -545,7 +546,7 @@ Foam::point Foam::face::centre(const pointField& meshPoints) const
 
     if (sumA > VSMALL)
     {
-        return sumAc/(3*sumA);
+        return sumAc/(3.0*sumA);
     }
     else
     {
@@ -556,6 +557,8 @@ Foam::point Foam::face::centre(const pointField& meshPoints) const
 
 Foam::vector Foam::face::normal(const pointField& p) const
 {
+    const label nPoints = size();
+
     // Calculate the normal by summing the face triangle normals.
     // Changed to deal with small concavity by using a central decomposition
     //
@@ -563,7 +566,7 @@ Foam::vector Foam::face::normal(const pointField& p) const
     // If the face is a triangle, do a direct calculation to avoid round-off
     // error-related problems
     //
-    if (size() == 3)
+    if (nPoints == 3)
     {
         return triPointRef
         (
@@ -573,12 +576,10 @@ Foam::vector Foam::face::normal(const pointField& p) const
         ).normal();
     }
 
-    label nPoints = size();
-
     register label pI;
 
     point centrePoint = vector::zero;
-    for (pI = 0; pI < nPoints; pI++)
+    for (pI = 0; pI < nPoints; ++pI)
     {
         centrePoint += p[operator[](pI)];
     }
@@ -588,7 +589,7 @@ Foam::vector Foam::face::normal(const pointField& p) const
 
     point nextPoint = centrePoint;
 
-    for (pI = 0; pI < nPoints; pI++)
+    for (pI = 0; pI < nPoints; ++pI)
     {
         if (pI < nPoints - 1)
         {
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.H b/src/OpenFOAM/meshes/meshShapes/face/face.H
index 34a66b85242bf25d7a5d6c31bcc9a3bb46fec162..723d9bbfb70717641948e3c94533c0feaae8f818 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.H
@@ -178,7 +178,7 @@ public:
         void flip();
 
         //- Return the points corresponding to this face
-        inline pointField points(const pointField& meshPoints) const;
+        inline pointField points(const pointField&) const;
 
         //- Centre point of face
         point centre(const pointField&) const;
@@ -187,7 +187,7 @@ public:
         template<class Type>
         Type average(const pointField&, const Field<Type>&) const;
 
-        //- Scalar magnitude
+        //- Magnitude of face area
         inline scalar mag(const pointField&) const;
 
         //- Vector normal; magnitude is equal to area of face
@@ -228,8 +228,8 @@ public:
 
         //- Return potential intersection with face with a ray starting
         //  at p, direction n (does not need to be normalized)
-        //  Does face-center decomposition and returns triangle intersection
-        //  point closest to p. Face-center is calculated from point average.
+        //  Does face-centre decomposition and returns triangle intersection
+        //  point closest to p. Face-centre is calculated from point average.
         //  For a hit, the distance is signed.  Positive number
         //  represents the point in front of triangle
         //  In case of miss the point is the nearest point on the face
@@ -242,20 +242,20 @@ public:
         (
             const point& p,
             const vector& n,
-            const pointField& meshPoints,
+            const pointField&,
             const intersection::algorithm alg = intersection::FULL_RAY,
             const intersection::direction dir = intersection::VECTOR
         ) const;
 
         //- Fast intersection with a ray.
-        //  Does face-center decomposition and returns triangle intersection
+        //  Does face-centre decomposition and returns triangle intersection
         //  point closest to p. See triangle::intersection for details.
         pointHit intersection
         (
             const point& p,
             const vector& q,
             const point& ctr,
-            const pointField& meshPoints,
+            const pointField&,
             const intersection::algorithm alg,
             const scalar tol = 0.0
         ) const;
@@ -264,7 +264,7 @@ public:
         pointHit nearestPoint
         (
             const point& p,
-            const pointField& meshPoints
+            const pointField&
         ) const;
 
         //- Return nearest point to face and classify it:
@@ -276,7 +276,7 @@ public:
         pointHit nearestPointClassify
         (
             const point& p,
-            const pointField& meshPoints,
+            const pointField&,
             label& nearType,
             label& nearLabel
         ) const;
@@ -286,13 +286,13 @@ public:
         (
             const point& p,
             const vector& n,
-            const pointField& meshPoints
+            const pointField&
         ) const;
 
         //- Return area in contact, given the displacement in vertices
         scalar areaInContact
         (
-            const pointField& points,
+            const pointField&,
             const scalarField& v
         ) const;
 
diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
index 03e992575f3eebeabfa76968177236ec70eb1a44..933cb522391b253b8d03d7ec6ff28e8bed2e8a28 100644
--- a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
+++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
@@ -103,7 +103,7 @@ public:
         inline void flip();
 
         //- Return the points corresponding to this face
-        inline pointField points(const pointField& meshPoints) const;
+        inline pointField points(const pointField&) const;
 
         //- Return triangle as a face
         inline face triFaceFace() const;
@@ -118,10 +118,10 @@ public:
         template<class Type>
         Type average(const pointField&, const Field<Type>&) const;
 
-        //- Return scalar magnitude
+        //- Magnitude of face area
         inline scalar mag(const pointField&) const;
 
-        //- Return vector normal
+        //- Vector normal; magnitude is equal to area of face
         inline vector normal(const pointField&) const;
 
         //- Number of triangles after splitting
diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
index e12f17567524cbe10413a3e2b26c2dbd97a549fe..af62aa1aa323b211f5b8d645da65090081eaddc4 100644
--- a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
+++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -176,6 +176,7 @@ inline Foam::scalar Foam::triFace::mag(const pointField& points) const
     return ::Foam::mag(normal(points));
 }
 
+
 // could also delegate to triPointRef(...).normal()
 inline Foam::vector Foam::triFace::normal(const pointField& points) const
 {
diff --git a/src/Pstream/Allwmake b/src/Pstream/Allwmake
index 613263d7bc026a47d5907270b58e8137bea14252..50ccb5fe1d1e175dc705a861cf7fa7454c33839d 100755
--- a/src/Pstream/Allwmake
+++ b/src/Pstream/Allwmake
@@ -1,8 +1,31 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
 makeType=${1:-libso}
-set -x
 
+
+#
+# define how to create an mpi-versioned library of $makeType
+# compile into qualified directory
+# use sentinel file to handle version changes
+#
+wmakeMpiLib()
+{
+    set +x
+    for libName
+    do
+    (
+        WM_OPTIONS="$WM_OPTIONS$WM_MPLIB"
+        whichmpi="$libName/Make/$WM_OPTIONS/using:$FOAM_MPI"
+        [ -e "$whichmpi" ] || wclean $libName
+        echo "wmake $makeType $libName"
+        wmake $makeType $libName
+        touch "$whichmpi"
+    )
+    done
+    set -x
+}
+
+set -x
 wmake $makeType dummy
 
 case "$WM_MPLIB" in
@@ -11,9 +34,7 @@ case "$WM_MPLIB" in
     echo
     echo "Note: ignore spurious warnings about missing mpicxx.h headers"
     echo
-    set -x
-    # force compilation into qualified directory
-    WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB  wmake $makeType mpi
+    wmakeMpiLib mpi
     ;;
 
 #GAMMA)
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.H
index 240e8ace42d9bdc55f73faf8dcb2b218ef8f42c5..2f4d4adc43cb34968a6b801dbc27059d8c13a215 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.H
@@ -344,6 +344,11 @@ public:
 
         // Access
 
+            const polyMesh& mesh() const
+            {
+                return mesh_;
+            }
+
             const labelIOList& cellLevel() const
             {
                 return cellLevel_;
diff --git a/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C b/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C
index 5b3cea13f43a93b1376578454820c011f06d1ff9..7cecea2f8089fe1192c1b53815dc70641af55a8c 100644
--- a/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C
+++ b/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.H b/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.H
index 9e7982a7c6f8cd320f1fe56e160afa0c38d820b1..2a5348e5d43b39e372d932260bf225f2b1053324 100644
--- a/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.H
+++ b/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/cfdTools/general/include/setInitialDeltaT.H b/src/finiteVolume/cfdTools/general/include/setInitialDeltaT.H
index 985ad4d7ad52a5c2b16dbab3330da949a443de98..0314bd1e3f62b798e3586968bb2ac6c8c4fd28bd 100644
--- a/src/finiteVolume/cfdTools/general/include/setInitialDeltaT.H
+++ b/src/finiteVolume/cfdTools/general/include/setInitialDeltaT.H
@@ -26,7 +26,7 @@ Global
 
 Description
     Set the initial timestep corresponding to the timestep adjustment
-    algorithm in setDeltaT
+    algorithm in setDeltaT but only if it would reduce the timestep.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,7 +39,7 @@ if (adjustTimeStep)
             min
             (
                 maxCo*runTime.deltaTValue()/CoNum,
-                maxDeltaT
+                runTime.deltaTValue()
             )
         );
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedInternalValue/directMappedFixedInternalValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedInternalValue/directMappedFixedInternalValueFvPatchField.C
index e4a92fad804e16f6b3e292c5f6722c454a748e4d..6611d20b544398e5c44e9598faa31da65ded9155 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedInternalValue/directMappedFixedInternalValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedInternalValue/directMappedFixedInternalValueFvPatchField.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedInternalValue/directMappedFixedInternalValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedInternalValue/directMappedFixedInternalValueFvPatchField.H
index d9448400a9a3e1737d3157f6f157ff9a01719dfa..16b8054655079b23336430d8742efada924bdea9 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedInternalValue/directMappedFixedInternalValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedInternalValue/directMappedFixedInternalValueFvPatchField.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::directMappedFixedInternalValueFvPatchField
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedInternalValue/directMappedFixedInternalValueFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedInternalValue/directMappedFixedInternalValueFvPatchFields.C
index d64936eb2eded94521589c1434b2a2166d0f190e..256c02d001dcb3c7f3ba56e9cab601a5359e86ce 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedInternalValue/directMappedFixedInternalValueFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedInternalValue/directMappedFixedInternalValueFvPatchFields.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedInternalValue/directMappedFixedInternalValueFvPatchFields.H b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedInternalValue/directMappedFixedInternalValueFvPatchFields.H
index 4dfabf7304c5798408a6c7dbaa4fa21d823763a6..7cc5f330132a979bcc0dcd87853b36c5812b2418 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedInternalValue/directMappedFixedInternalValueFvPatchFields.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedInternalValue/directMappedFixedInternalValueFvPatchFields.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedInternalValue/directMappedFixedInternalValueFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedInternalValue/directMappedFixedInternalValueFvPatchFieldsFwd.H
index a6759606041c3c1decd10a462bc5c09374aca364..be25beb05ae2244f468c68beb62af12f3fa62999 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedInternalValue/directMappedFixedInternalValueFvPatchFieldsFwd.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedInternalValue/directMappedFixedInternalValueFvPatchFieldsFwd.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedPushedInternalValue/directMappedFixedPushedInternalValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedPushedInternalValue/directMappedFixedPushedInternalValueFvPatchField.C
index 77b8ea18f0f4e864067b34d278c67635a43329cf..74d11f63f95172bec45722eb3354f382727f82d4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedPushedInternalValue/directMappedFixedPushedInternalValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedPushedInternalValue/directMappedFixedPushedInternalValueFvPatchField.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedPushedInternalValue/directMappedFixedPushedInternalValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedPushedInternalValue/directMappedFixedPushedInternalValueFvPatchField.H
index 69bdb1a694ac6a0bafcc6981b26c6559ae2004d8..519d527fa95e806ac6a381976b0515d5a270e112 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedPushedInternalValue/directMappedFixedPushedInternalValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedPushedInternalValue/directMappedFixedPushedInternalValueFvPatchField.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::directMappedFixedPushedInternalValueFvPatchField
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedPushedInternalValue/directMappedFixedPushedInternalValueFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedPushedInternalValue/directMappedFixedPushedInternalValueFvPatchFields.C
index cbbbeb422379fa7b18f606699e7ff38aafde5fee..d9692a4fee93268fb39d0ceb8073e4a1d3e9cb5b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedPushedInternalValue/directMappedFixedPushedInternalValueFvPatchFields.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedPushedInternalValue/directMappedFixedPushedInternalValueFvPatchFields.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedPushedInternalValue/directMappedFixedPushedInternalValueFvPatchFields.H b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedPushedInternalValue/directMappedFixedPushedInternalValueFvPatchFields.H
index bff180bbc2ce350ed81e07627088d786caf0239d..33224759bc0706c0b1246b7ec18356060235ce3b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedPushedInternalValue/directMappedFixedPushedInternalValueFvPatchFields.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedPushedInternalValue/directMappedFixedPushedInternalValueFvPatchFields.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedPushedInternalValue/directMappedFixedPushedInternalValueFvPatchFieldsFwd.H b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedPushedInternalValue/directMappedFixedPushedInternalValueFvPatchFieldsFwd.H
index faae7f722ecf9adbd0aa6643803d4af4f5c9ea91..77be3a47aa0ec969a13ecf9f08026208829e6aa5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedPushedInternalValue/directMappedFixedPushedInternalValueFvPatchFieldsFwd.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/directMappedFixedPushedInternalValue/directMappedFixedPushedInternalValueFvPatchFieldsFwd.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C
index b96bd4f1bac058d14b96f5684d3c40274e323327..f7b42671c97d66ee214113823d15c6b49f4034a8 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.H
index 15e9f36042327bc5c977aeb7759831736f300173..960451d22b245d90a7585aca5e9ddb7387f9f497 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
index 427f64183f685551ffeeab49bff3f60be56ceb2b..c1c05bcece306687f07cd4070cc06838a2d09e9e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.H
index 5a25f6d431817ac37f50931f25dc1661a825b850..9122c533155acce5233cab259f9f24098c9c6a16 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index 6a98e07ed22a29ada56727df5b822b28b7f3a077..976c8e46c965c9b9d426df574f6024519888911e 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -42,16 +42,6 @@ SourceFiles
     fvMesh.C
     fvMeshGeometry.C
 
-See Also
-    hmm
-
-Usage
-    oeuoeuoeu
-
-ToDo
-    oeuoeuoeu
-    oeueouoeu
-
 \*---------------------------------------------------------------------------*/
 
 #ifndef fvMesh_H
diff --git a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C
index 335fc05d1c87f5859014b394e40b2982693219a9..42bbb3eaaa246f2517f479049c4216caf4dc3a17 100644
--- a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C
+++ b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/cellPointWeightWallModified/cellPointWeightWallModified.C b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/cellPointWeightWallModified/cellPointWeightWallModified.C
index 5f08d66b2772f9c20a9e9bdb7cc4fc4fb1e5c48e..4171187963ba37158634cfff713fa6cde65d7c68 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/cellPointWeightWallModified/cellPointWeightWallModified.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/cellPointWeightWallModified/cellPointWeightWallModified.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/cellPointWeightWallModified/cellPointWeightWallModified.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/cellPointWeightWallModified/cellPointWeightWallModified.H
index 018010193f9f1d43b33d5ff26aadcc461b6b0e84..1c9a1a2e700ccc189af5faf5a7f4adc0db87d39d 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/cellPointWeightWallModified/cellPointWeightWallModified.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/cellPointWeightWallModified/cellPointWeightWallModified.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.C b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.C
index 5b10b2fe1ef3447f9b1ba630fe849199766842bf..452006e243994fb8bfc284d1f3152398c769338a 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.H
index 288426789364527b8203f56343ad45d6c48b6f6b..6b57454da722878fc72d2119d7ebfd1b6cc6b26a 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModified.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModifiedI.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModifiedI.H
index 3d3b056af83f6a22ac476a93bb3c42df024fd781..b64a8d86dfe12a64d4b0febf8b002e1eaf502e9e 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModifiedI.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/interpolationCellPointWallModifiedI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/makeInterpolationCellPointWallModified.C b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/makeInterpolationCellPointWallModified.C
index 3d3268185c7f38db7e8cb626b324b418edac2629..6e65dd690395fc99fc14c9f37e85b7b3c5d51fa3 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/makeInterpolationCellPointWallModified.C
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointWallModified/makeInterpolationCellPointWallModified.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwind/quadraticUpwind.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwind/quadraticUpwind.C
index d0779945d330466349202bcc6b4725482aa343ee..442e0d3e8ba529c1ee3b4a773ed9cc610df62174 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwind/quadraticUpwind.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwind/quadraticUpwind.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
index 2ef9bccaa97a398f5d6a336ff2c18db635015a55..7587a7be485fb564867f5bd67bf1084464da578b 100644
--- a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
+++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.H b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.H
index cf3ab35d581696ee86d2df3522d49bd7ff791bdf..e918f0f1337964e6d168b95f05731ea3200b2395 100644
--- a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.H
+++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/genericPatchFields/genericFvPatchField/genericFvPatchFields.C b/src/genericPatchFields/genericFvPatchField/genericFvPatchFields.C
index 2048c05dfa49f899fcb4185797a7b0350c48974b..0099d2b1065dd14a517016315e9b093185c47d3a 100644
--- a/src/genericPatchFields/genericFvPatchField/genericFvPatchFields.C
+++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/genericPatchFields/genericFvPatchField/genericFvPatchFields.H b/src/genericPatchFields/genericFvPatchField/genericFvPatchFields.H
index 8082ed9a3a9769cece5a855a066a7f9eb556316f..2a4ea58abdfdc64be4e3d05d4e4a8468eb219431 100644
--- a/src/genericPatchFields/genericFvPatchField/genericFvPatchFields.H
+++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
index c794f0452044ef284293157bb8b4268b48217f30..bb8fe3f6fe38581f3de9dd720cd852d4bc2b60c6 100644
--- a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
+++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H
index cb981d9bfa974ce5e29b4af402cd190c67b49d3d..bd6321f2399a388101283969a8c07c4fc474ef53 100644
--- a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H
+++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchFields.C b/src/genericPatchFields/genericPointPatchField/genericPointPatchFields.C
index 4c2631bed607497c148686a2d9514bb6470e0378..ca1c8e9ae3ccb7dba8c64641581b5ec4dcf5572e 100644
--- a/src/genericPatchFields/genericPointPatchField/genericPointPatchFields.C
+++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchFields.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchFields.H b/src/genericPatchFields/genericPointPatchField/genericPointPatchFields.H
index 108f8192b2256b743a3f84fc09816994c80e2cfa..d67bb2ffe75988497cefcb8176dab02ad585c718 100644
--- a/src/genericPatchFields/genericPointPatchField/genericPointPatchFields.H
+++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options
index 640565da2e47967be1e6b57b3272cc32b15ffa5b..7253a9073d28280bd4c449621ffcf627fc3d229f 100644
--- a/src/lagrangian/coalCombustion/Make/options
+++ b/src/lagrangian/coalCombustion/Make/options
@@ -19,7 +19,8 @@ EXE_INC = \
     -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
     -I$(LIB_SRC)/turbulenceModels/compressible/LES/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-    -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude
+    -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume \
diff --git a/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C b/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C
index 4a6b297c1d8dff74a500801d683f02a1b08356c5..ee17dd7e3cad16d131e00609d03b11164a86ad31 100644
--- a/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C
+++ b/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C
@@ -25,12 +25,13 @@ License
 
 #include "coalCloud.H"
 
+#include "makeParcelCloudFunctionObjects.H"
+
 // Kinematic
 #include "makeThermoParcelForces.H" // thermo variant
 #include "makeParcelDispersionModels.H"
 #include "makeReactingMultiphaseParcelInjectionModels.H" // MP variant
 #include "makeParcelPatchInteractionModels.H"
-#include "makeParcelPostProcessingModels.H"
 
 // Thermodynamic
 #include "makeParcelHeatTransferModels.H"
@@ -50,12 +51,13 @@ License
 
 namespace Foam
 {
+    makeParcelCloudFunctionObjects(coalCloud);
+
     // Kinematic sub-models
     makeThermoParcelForces(coalCloud);
     makeParcelDispersionModels(coalCloud);
     makeReactingMultiphaseParcelInjectionModels(coalCloud);
     makeParcelPatchInteractionModels(coalCloud);
-    makeParcelPostProcessingModels(coalCloud);
 
     // Thermo sub-models
     makeParcelHeatTransferModels(coalCloud);
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
index 1ac6efe24fcc153fbad4567fcb68d048af36279b..02ef8172b974dea921b1ae7de303b2ce9396b70b 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
@@ -44,7 +44,8 @@ Foam::COxidationDiffusionLimitedRate<CloudType>::COxidationDiffusionLimitedRate
     O2GlobalId_(owner.composition().globalCarrierId("O2")),
     CO2GlobalId_(owner.composition().globalCarrierId("CO2")),
     WC_(0.0),
-    WO2_(0.0)
+    WO2_(0.0),
+    HcCO2_(0.0)
 {
     // Determine Cs ids
     label idSolid = owner.composition().idSolid();
@@ -55,6 +56,8 @@ Foam::COxidationDiffusionLimitedRate<CloudType>::COxidationDiffusionLimitedRate
     const scalar WCO2 = owner.thermo().carrier().W(CO2GlobalId_);
     WC_ = WCO2 - WO2_;
 
+    HcCO2_ = owner.thermo().carrier().Hc(CO2GlobalId_);
+
     if (Sb_ < 0)
     {
         FatalErrorIn
@@ -158,14 +161,11 @@ Foam::scalar Foam::COxidationDiffusionLimitedRate<CloudType>::calculate
     dMassSRCarrier[CO2GlobalId_] += dmCO2;
 
     const scalar HsC = thermo.solids().properties()[CsLocalId_].Hs(T);
-    const scalar HCO2 = thermo.carrier().H(CO2GlobalId_, T);
 
-    // carrier enthalpy transfer handled by change in composition
-    // const scalar HsO2 = thermo.carrier().Hs(O2GlobalId_, T);
-    // dhsTrans -= dmO2*HsO2;
+    // carrier sensible enthalpy exchange handled via change in mass
 
     // Heat of reaction [J]
-    return dmC*HsC - dmCO2*HCO2;
+    return dmC*HsC - dmCO2*HcCO2_;
 }
 
 
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H
index ad388b10f859009060daa3101fafbf67b3c276f4..73097256e772f92072c40dd85b8df09aca0ee933 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H
@@ -86,6 +86,9 @@ class COxidationDiffusionLimitedRate
             //- Molecular weight of O2 [kg/kmol]
             scalar WO2_;
 
+            //- Formation enthalpy for CO2 [J/kg]
+            scalar HcCO2_;
+
 
 public:
 
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
index 5f717530abb838483264d09e25fcc61c38839726..c650687b7e4bb1f13414c0aa0b37045cd385c333 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
@@ -45,7 +45,8 @@ COxidationKineticDiffusionLimitedRate
     O2GlobalId_(owner.composition().globalCarrierId("O2")),
     CO2GlobalId_(owner.composition().globalCarrierId("CO2")),
     WC_(0.0),
-    WO2_(0.0)
+    WO2_(0.0),
+    HcCO2_(0.0)
 {
     // Determine Cs ids
     label idSolid = owner.composition().idSolid();
@@ -56,6 +57,8 @@ COxidationKineticDiffusionLimitedRate
     const scalar WCO2 = owner.thermo().carrier().W(CO2GlobalId_);
     WC_ = WCO2 - WO2_;
 
+    HcCO2_ = owner.thermo().carrier().Hc(CO2GlobalId_);
+
     const scalar YCloc = owner.composition().Y0(idSolid)[CsLocalId_];
     const scalar YSolidTot = owner.composition().YMixture0()[idSolid];
     Info<< "    C(s): particle mass fraction = " << YCloc*YSolidTot << endl;
@@ -161,14 +164,11 @@ Foam::scalar Foam::COxidationKineticDiffusionLimitedRate<CloudType>::calculate
     dMassSRCarrier[CO2GlobalId_] += dmCO2;
 
     const scalar HsC = thermo.solids().properties()[CsLocalId_].Hs(T);
-    const scalar HCO2 = thermo.carrier().H(CO2GlobalId_, T);
 
-    // carrier enthalpy transfer handled by change in composition
-    // const scalar HsO2 = thermo.carrier().Hs(O2GlobalId_, T);
-    // dhsTrans -= dmO2*HsO2;
+    // carrier sensible enthalpy exchange handled via change in mass
 
     // Heat of reaction [J]
-    return dmC*HsC - dmCO2*HCO2;
+    return dmC*HsC - dmCO2*HcCO2_;
 }
 
 
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H
index 3a4b2da2bd58dc8fb1d8c90965c7a2b1ca1ba533..563269b1d6c408c28323d11a02c3c55da56cc0cf 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H
@@ -94,6 +94,9 @@ class COxidationKineticDiffusionLimitedRate
             //- Molecular weight of O2 [kg/kmol]
             scalar WO2_;
 
+            //- Formation enthalpy for CO2 [J/kg]
+            scalar HcCO2_;
+
 
 public:
 
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
index c2ba2899a7b809e56264284525f770fdb372c717..ea4a5e507ae0defb09c90a048e6cd2e76aefb0e9 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
@@ -57,7 +57,8 @@ Foam::COxidationMurphyShaddix<CloudType>::COxidationMurphyShaddix
     O2GlobalId_(owner.composition().globalCarrierId("O2")),
     CO2GlobalId_(owner.composition().globalCarrierId("CO2")),
     WC_(0.0),
-    WO2_(0.0)
+    WO2_(0.0),
+    HcCO2_(0.0)
 {
     // Determine Cs ids
     label idSolid = owner.composition().idSolid();
@@ -68,6 +69,8 @@ Foam::COxidationMurphyShaddix<CloudType>::COxidationMurphyShaddix
     const scalar WCO2 = owner.thermo().carrier().W(CO2GlobalId_);
     WC_ = WCO2 - WO2_;
 
+    HcCO2_ = owner.thermo().carrier().Hc(CO2GlobalId_);
+
     const scalar YCloc = owner.composition().Y0(idSolid)[CsLocalId_];
     const scalar YSolidTot = owner.composition().YMixture0()[idSolid];
     Info<< "    C(s): particle mass fraction = " << YCloc*YSolidTot << endl;
@@ -221,14 +224,11 @@ Foam::scalar Foam::COxidationMurphyShaddix<CloudType>::calculate
     dMassSolid[CsLocalId_] += dOmega*WC_;
 
     const scalar HsC = thermo.solids().properties()[CsLocalId_].Hs(T);
-    const scalar HCO2 = thermo.carrier().H(CO2GlobalId_, T);
 
-    // carrier enthalpy transfer handled by change in composition
-    // const scalar HsO2 = thermo.carrier().Hs(O2GlobalId_, T);
-    // dhsTrans -= dmO2*HsO2;
+    // carrier sensible enthalpy exchange handled via change in mass
 
-    // Heat of reaction
-    return dOmega*(WC_*HsC - (WC_ + WO2_)*HCO2);
+    // Heat of reaction [J]
+    return dOmega*(WC_*HsC - (WC_ + WO2_)*HcCO2_);
 }
 
 
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H
index 73981e79d1916b1dd6326eb472e48ccf89ddd695..26c9cf1701b4ebb8acd4b43eb755c8c504041c92 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H
@@ -115,6 +115,9 @@ class COxidationMurphyShaddix
             //- Molecular weight of O2 [kg/kmol]
             scalar WO2_;
 
+            //- Formation enthalpy for CO2 [J/kg]
+            scalar HcCO2_;
+
 
 public:
 
diff --git a/src/lagrangian/dieselSpray/parcel/setRelaxationTimes.C b/src/lagrangian/dieselSpray/parcel/setRelaxationTimes.C
index c1a289c719dc03c31ab2a6729415ed30eee02dc8..7e45ef3110f816fa4733026e50ebbc5cf950caa3 100644
--- a/src/lagrangian/dieselSpray/parcel/setRelaxationTimes.C
+++ b/src/lagrangian/dieselSpray/parcel/setRelaxationTimes.C
@@ -232,20 +232,20 @@ void Foam::parcel::setRelaxationTimes
                         tBoilingSurface
                     );
                     scalar dp = pBoil - pressure;
-                    if ( (dp > 0.0) && (dp0 > 0.0) )
+                    if ((dp > 0.0) && (dp0 > 0.0))
                     {
                         tBoilingSurface -= deltaT;
                     }
                     else
                     {
-                        if ( (dp < 0.0) && (dp0 < 0.0) )
+                        if ((dp < 0.0) && (dp0 < 0.0))
                         {
                             tBoilingSurface += deltaT;
                         }
                         else
                         {
                             deltaT *= 0.5;
-                            if ( (dp > 0.0) && (dp0 < 0.0) )
+                            if ((dp > 0.0) && (dp0 < 0.0))
                             {
                                 tBoilingSurface -= deltaT;
                             }
diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options
index 6290aae9da6ec786a746ac207854fd84a74827fc..951d16cf589813f98b3bdf69c8def36682d91b0c 100644
--- a/src/lagrangian/intermediate/Make/options
+++ b/src/lagrangian/intermediate/Make/options
@@ -19,7 +19,8 @@ EXE_INC = \
     -I$(LIB_SRC)/turbulenceModels/compressible/LES/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
-    -I$(LIB_SRC)/dynamicFvMesh/lnInclude
+    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume \
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index 80ec5ae74c2bac6c477f7190a0cd1fac99be4680..0ea66723b0eefb57bdfd2e78c782f4d275eb5352 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -31,7 +31,6 @@ License
 #include "DispersionModel.H"
 #include "InjectionModel.H"
 #include "PatchInteractionModel.H"
-#include "PostProcessingModel.H"
 #include "SurfaceFilmModel.H"
 
 // * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
@@ -66,15 +65,6 @@ void Foam::KinematicCloud<CloudType>::setModels()
         ).ptr()
     );
 
-    postProcessingModel_.reset
-    (
-        PostProcessingModel<KinematicCloud<CloudType> >::New
-        (
-            subModelProperties_,
-            *this
-        ).ptr()
-    );
-
     surfaceFilmModel_.reset
     (
         SurfaceFilmModel<KinematicCloud<CloudType> >::New
@@ -245,9 +235,10 @@ void Foam::KinematicCloud<CloudType>::postEvolve()
     }
 
     this->dispersion().cacheFields(false);
+
     forces_.cacheFields(false);
 
-    this->postProcessing().post();
+    functions_.postEvolve();
 
     solution_.nextIter();
 }
@@ -262,10 +253,11 @@ void Foam::KinematicCloud<CloudType>::cloudReset(KinematicCloud<CloudType>& c)
 
     forces_.transfer(c.forces_);
 
+    functions_.transfer(c.functions_);
+
     dispersionModel_.reset(c.dispersionModel_.ptr());
     injectionModel_.reset(c.injectionModel_.ptr());
     patchInteractionModel_.reset(c.patchInteractionModel_.ptr());
-    postProcessingModel_.reset(c.postProcessingModel_.ptr());
     surfaceFilmModel_.reset(c.surfaceFilmModel_.ptr());
 
     UIntegrator_.reset(c.UIntegrator_.ptr());
@@ -309,7 +301,9 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
     rndGen_
     (
         label(0),
+        solution_.steadyState() ?
         particleProperties_.lookupOrDefault<label>("randomSampleSize", 100000)
+      : -1
     ),
     cellOccupancyPtr_(),
     rho_(rho),
@@ -327,10 +321,15 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
         ),
         solution_.active()
     ),
+    functions_
+    (
+        *this,
+        particleProperties_.subOrEmptyDict("cloudFunctions"),
+        solution_.active()
+    ),
     dispersionModel_(NULL),
     injectionModel_(NULL),
     patchInteractionModel_(NULL),
-    postProcessingModel_(NULL),
     surfaceFilmModel_(NULL),
     UIntegrator_(NULL),
     UTrans_
@@ -405,10 +404,10 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
     mu_(c.mu_),
     g_(c.g_),
     forces_(c.forces_),
+    functions_(c.functions_),
     dispersionModel_(c.dispersionModel_->clone()),
     injectionModel_(c.injectionModel_->clone()),
     patchInteractionModel_(c.patchInteractionModel_->clone()),
-    postProcessingModel_(c.postProcessingModel_->clone()),
     surfaceFilmModel_(c.surfaceFilmModel_->clone()),
     UIntegrator_(c.UIntegrator_->clone()),
     UTrans_
@@ -480,10 +479,10 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
     mu_(c.mu_),
     g_(c.g_),
     forces_(*this, mesh),
+    functions_(*this),
     dispersionModel_(NULL),
     injectionModel_(NULL),
     patchInteractionModel_(NULL),
-    postProcessingModel_(NULL),
     surfaceFilmModel_(NULL),
     UIntegrator_(NULL),
     UTrans_(NULL),
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index 88eff6449ff8edc5cab11c4650623fc22734848b..dcd6157226930f95b2ea5e0077a2c9571592547c 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -27,17 +27,19 @@ Class
 Description
     Templated base class for kinematic cloud
 
-    - particle forces
+    - cloud function objects
+
+    - particle forces, e.g.
       - buoyancy
       - drag
       - pressure gradient
+      - ...
 
     - sub-models:
-      - Dispersion model
-      - Injection model
-      - Patch interaction model
-      - Post-processing model
-      - Surface film model
+      - dispersion model
+      - injection model
+      - patch interaction model
+      - surface film model
 
 SourceFiles
     KinematicCloudI.H
@@ -61,6 +63,7 @@ SourceFiles
 #include "cloudSolution.H"
 
 #include "ParticleForceList.H"
+#include "CloudFunctionObjectList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -78,9 +81,6 @@ class InjectionModel;
 template<class CloudType>
 class PatchInteractionModel;
 
-template<class CloudType>
-class PostProcessingModel;
-
 template<class CloudType>
 class SurfaceFilmModel;
 
@@ -108,9 +108,13 @@ public:
         //- Convenience typedef for this cloud type
         typedef KinematicCloud<CloudType> kinematicCloudType;
 
-        //- Force type
+        //- Force models type
         typedef ParticleForceList<KinematicCloud<CloudType> > forceType;
 
+        //- Function object type
+        typedef CloudFunctionObjectList<KinematicCloud<CloudType> >
+            functionType;
+
 
 private:
 
@@ -176,6 +180,9 @@ protected:
         //- Optional particle forces
         forceType forces_;
 
+        //- Optional cloud function objects
+        functionType functions_;
+
 
         // References to the cloud sub-models
 
@@ -191,10 +198,6 @@ protected:
             autoPtr<PatchInteractionModel<KinematicCloud<CloudType> > >
                 patchInteractionModel_;
 
-            //- Post-processing model
-            autoPtr<PostProcessingModel<KinematicCloud<CloudType> > >
-                postProcessingModel_;
-
             //- Surface film model
             autoPtr<SurfaceFilmModel<KinematicCloud<CloudType> > >
                 surfaceFilmModel_;
@@ -369,6 +372,9 @@ public:
 //            inline const typename parcelType::forceType& forces() const;
             inline const forceType& forces() const;
 
+            //- Optional cloud function objects
+            inline functionType& functions();
+
 
             // Sub-models
 
@@ -396,10 +402,6 @@ public:
                 inline PatchInteractionModel<KinematicCloud<CloudType> >&
                     patchInteraction();
 
-                //- Return reference to post-processing model
-                inline PostProcessingModel<KinematicCloud<CloudType> >&
-                    postProcessing();
-
                 //- Return const-access to the surface film model
                 inline const SurfaceFilmModel<KinematicCloud<CloudType> >&
                     surfaceFilm() const;
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index 568d089030afbec347bcbc003123eab5d4f6a2ff..b317fbcc737c99ac2e01590b117e02e2e89538d9 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -118,6 +118,14 @@ Foam::KinematicCloud<CloudType>::forces() const
 }
 
 
+template<class CloudType>
+inline typename Foam::KinematicCloud<CloudType>::functionType&
+Foam::KinematicCloud<CloudType>::functions()
+{
+    return functions_;
+}
+
+
 template<class CloudType>
 inline const Foam::DispersionModel<Foam::KinematicCloud<CloudType> >&
 Foam::KinematicCloud<CloudType>::dispersion() const
@@ -166,14 +174,6 @@ Foam::KinematicCloud<CloudType>::injection()
 }
 
 
-template<class CloudType>
-inline Foam::PostProcessingModel<Foam::KinematicCloud<CloudType> >&
-Foam::KinematicCloud<CloudType>::postProcessing()
-{
-    return postProcessingModel_();
-}
-
-
 template<class CloudType>
 inline const Foam::SurfaceFilmModel<Foam::KinematicCloud<CloudType> >&
 Foam::KinematicCloud<CloudType>::surfaceFilm() const
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index b75b20f8456997de81b12c300c2917d569d1a350..5888a6a952c3c303efa18548e9599a1101912339 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -104,13 +104,10 @@ void Foam::KinematicParcel<ParcelType>::calc
     // Define local properties at beginning of time step
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     const scalar np0 = nParticle_;
-    const scalar d0 = d_;
-    const vector U0 = U_;
-    const scalar rho0 = rho_;
     const scalar mass0 = mass();
 
     // Reynolds number
-    const scalar Re = this->Re(U0, d0, rhoc_, muc_);
+    const scalar Re = this->Re(U_, d_, rhoc_, muc_);
 
 
     // Sources
@@ -119,6 +116,9 @@ void Foam::KinematicParcel<ParcelType>::calc
     // Explicit momentum source for particle
     vector Su = vector::zero;
 
+    // Linearised momentum source coefficient
+    scalar Spu = 0.0;
+
     // Momentum transfer from the particle to the carrier phase
     vector dUTrans = vector::zero;
 
@@ -127,23 +127,7 @@ void Foam::KinematicParcel<ParcelType>::calc
     // ~~~~~~
 
     // Calculate new particle velocity
-    scalar Spu = 0.0;
-    vector U1 =
-        calcVelocity
-        (
-            td,
-            dt,
-            cellI,
-            Re,
-            muc_,
-            d0,
-            U0,
-            rho0,
-            mass0,
-            Su,
-            dUTrans,
-            Spu
-        );
+    this->U_ = calcVelocity(td, dt, cellI, Re, muc_, mass0, Su, dUTrans, Spu);
 
 
     // Accumulate carrier phase source terms
@@ -156,11 +140,6 @@ void Foam::KinematicParcel<ParcelType>::calc
         // Update momentum transfer coefficient
         td.cloud().UCoeff()[cellI] += np0*Spu;
     }
-
-
-    // Set new particle properties
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    U_ = U1;
 }
 
 
@@ -173,9 +152,6 @@ const Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
     const label cellI,
     const scalar Re,
     const scalar mu,
-    const scalar d,
-    const vector& U,
-    const scalar rho,
     const scalar mass,
     const vector& Su,
     vector& dUTrans,
@@ -205,7 +181,7 @@ const Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
     Spu = dt*Feff.Sp();
 
     IntegrationScheme<vector>::integrationResult Ures =
-        td.cloud().UIntegrator().integrate(U, dt, abp, bp);
+        td.cloud().UIntegrator().integrate(U_, dt, abp, bp);
 
     vector Unew = Ures.value();
 
@@ -361,7 +337,7 @@ void Foam::KinematicParcel<ParcelType>::hitFace(TrackData& td)
     typename TrackData::cloudType::parcelType& p =
         static_cast<typename TrackData::cloudType::parcelType&>(*this);
 
-    td.cloud().postProcessing().postFace(p);
+    td.cloud().functions().postFace(p);
 }
 
 
@@ -385,7 +361,7 @@ bool Foam::KinematicParcel<ParcelType>::hitPatch
         static_cast<typename TrackData::cloudType::parcelType&>(*this);
 
     // Invoke post-processing model
-    td.cloud().postProcessing().postPatch(p, patchI);
+    td.cloud().functions().postPatch(p, patchI);
 
     // Invoke surface film model
     if (td.cloud().surfaceFilm().transferParcel(p, pp, td.keepParticle))
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index a937ba3f7a369d32f70e13f05e6dd2e90fe5a3ce..19b953b7e78184004f4250a81449431dcbfd7018 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -297,9 +297,6 @@ protected:
             const label cellI,         // owner cell
             const scalar Re,           // Reynolds number
             const scalar mu,           // local carrier viscosity
-            const scalar d,            // diameter
-            const vector& U,           // velocity
-            const scalar rho,          // density
             const scalar mass,         // mass
             const vector& Su,          // explicit particle momentum source
             vector& dUTrans,           // momentum transfer to carrier
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 664fac9781053758c3c890505fb8919c21e8462f..ae95fa21ef2a2eb8c14adf5ff0f0dfd022a2d3e8 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -172,12 +172,11 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
 
     // Define local properties at beginning of timestep
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
     const scalar np0 = this->nParticle_;
     const scalar d0 = this->d_;
     const vector& U0 = this->U_;
-    const scalar rho0 = this->rho_;
     const scalar T0 = this->T_;
-    const scalar Cp0 = this->Cp_;
     const scalar mass0 = this->mass();
 
     const scalar pc = this->pc_;
@@ -189,11 +188,8 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
 
 
     // Calc surface values
-    // ~~~~~~~~~~~~~~~~~~~
     scalar Ts, rhos, mus, Prs, kappas;
     this->calcSurfaceValues(td, cellI, T0, Ts, rhos, mus, Prs, kappas);
-
-    // Reynolds number
     scalar Res = this->Re(U0, d0, rhos, mus);
 
 
@@ -203,16 +199,25 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     // Explicit momentum source for particle
     vector Su = vector::zero;
 
+    // Linearised momentum source coefficient
+    scalar Spu = 0.0;
+
     // Momentum transfer from the particle to the carrier phase
     vector dUTrans = vector::zero;
 
     // Explicit enthalpy source for particle
     scalar Sh = 0.0;
 
+    // Linearised enthalpy source coefficient
+    scalar Sph = 0.0;
+
     // Sensible enthalpy transfer from the particle to the carrier phase
     scalar dhsTrans = 0.0;
 
 
+    // 1. Compute models that contribute to mass transfer - U, T held constant
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
     // Phase change in liquid phase
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -310,28 +315,78 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
     );
 
 
-    // Correct surface values due to emitted species
-    this->correctSurfaceValues(td, cellI, Ts, Cs, rhos, mus, Prs, kappas);
-    Res = this->Re(U0, d0, rhos, mus);
-
-
-    // Update component mass fractions
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // 2. Update the parcel properties due to change in mass
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     scalarField dMassGas(dMassDV + dMassSRGas);
     scalarField dMassLiquid(dMassPC + dMassSRLiquid);
     scalarField dMassSolid(dMassSRSolid);
-
     scalar mass1 =
         updateMassFractions(mass0, dMassGas, dMassLiquid, dMassSolid);
 
+    this->Cp_ = CpEff(td, pc, T0, idG, idL, idS);
+
+    // Update particle density or diameter
+    if (td.cloud().constProps().constantVolume())
+    {
+        this->rho_ = mass1/this->volume();
+    }
+    else
+    {
+        this->d_ = cbrt(mass1/this->rho_*6.0/pi);
+    }
+
+    // Remove the particle when mass falls below minimum threshold
+    if (np0*mass1 < td.cloud().constProps().minParticleMass())
+    {
+        td.keepParticle = false;
+
+        if (td.cloud().solution().coupled())
+        {
+            scalar dm = np0*mass1;
+
+            // Absorb parcel into carrier phase
+            forAll(YGas_, i)
+            {
+                label gid = composition.localToGlobalCarrierId(GAS, i);
+                td.cloud().rhoTrans(gid)[cellI] += dm*YMix[GAS]*YGas_[i];
+            }
+            forAll(YLiquid_, i)
+            {
+                label gid = composition.localToGlobalCarrierId(LIQ, i);
+                td.cloud().rhoTrans(gid)[cellI] += dm*YMix[LIQ]*YLiquid_[i];
+            }
+/*
+            // No mapping between solid components and carrier phase
+            forAll(YSolid_, i)
+            {
+                label gid = composition.localToGlobalCarrierId(SLD, i);
+                td.cloud().rhoTrans(gid)[cellI] += dm*YMix[SLD]*YSolid_[i];
+            }
+*/
+            td.cloud().UTrans()[cellI] += dm*U0;
+
+            td.cloud().hsTrans()[cellI] += dm*HsEff(td, pc, T0, idG, idL, idS);
+
+            td.cloud().addToMassPhaseChange(dm);
+        }
+
+        return;
+    }
+
+    // Correct surface values due to emitted species
+    this->correctSurfaceValues(td, cellI, Ts, Cs, rhos, mus, Prs, kappas);
+    Res = this->Re(U0, this->d_, rhos, mus);
+
+
+    // 3. Compute heat- and momentum transfers
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     // Heat transfer
     // ~~~~~~~~~~~~~
 
     // Calculate new particle temperature
-    scalar Sph = 0.0;
-    scalar T1 =
+    this->T_ =
         this->calcHeatTransfer
         (
             td,
@@ -340,10 +395,6 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
             Res,
             Prs,
             kappas,
-            d0,
-            rho0,
-            T0,
-            Cp0,
             NCpW,
             Sh,
             dhsTrans,
@@ -351,35 +402,23 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
         );
 
 
+    this->Cp_ = CpEff(td, pc, this->T_, idG, idL, idS);
+
+
     // Motion
     // ~~~~~~
 
     // Calculate new particle velocity
-    scalar Spu = 0;
-    vector U1 =
-        this->calcVelocity
-        (
-            td,
-            dt,
-            cellI,
-            Res,
-            mus,
-            d0,
-            U0,
-            rho0,
-            mass0,
-            Su,
-            dUTrans,
-            Spu
-        );
+    this->U_ =
+        this->calcVelocity(td, dt, cellI, Res, mus, mass1, Su, dUTrans, Spu);
 
 
-    // Accumulate carrier phase source terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // 4. Accumulate carrier phase source terms
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     if (td.cloud().solution().coupled())
     {
-        // Transfer mass lost from particle to carrier mass source
+        // Transfer mass lost to carrier mass, momentum and enthalpy sources
         forAll(YGas_, i)
         {
             scalar dm = np0*dMassGas[i];
@@ -421,76 +460,12 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc
 
         // Update momentum transfer
         td.cloud().UTrans()[cellI] += np0*dUTrans;
-
-        // Update momentum transfer coefficient
         td.cloud().UCoeff()[cellI] += np0*Spu;
 
         // Update sensible enthalpy transfer
         td.cloud().hsTrans()[cellI] += np0*dhsTrans;
-
-        // Update sensible enthalpy coefficient
         td.cloud().hsCoeff()[cellI] += np0*Sph;
     }
-
-
-    // Remove the particle when mass falls below minimum threshold
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    if (np0*mass1 < td.cloud().constProps().minParticleMass())
-    {
-        td.keepParticle = false;
-
-        if (td.cloud().solution().coupled())
-        {
-            scalar dm = np0*mass1;
-
-            // Absorb parcel into carrier phase
-            forAll(YGas_, i)
-            {
-                label gid = composition.localToGlobalCarrierId(GAS, i);
-                td.cloud().rhoTrans(gid)[cellI] += dm*YMix[GAS]*YGas_[i];
-            }
-            forAll(YLiquid_, i)
-            {
-                label gid = composition.localToGlobalCarrierId(LIQ, i);
-                td.cloud().rhoTrans(gid)[cellI] += dm*YMix[LIQ]*YLiquid_[i];
-            }
-/*
-            // No mapping between solid components and carrier phase
-            forAll(YSolid_, i)
-            {
-                label gid = composition.localToGlobalCarrierId(SLD, i);
-                td.cloud().rhoTrans(gid)[cellI] += dm*YMix[SLD]*YSolid_[i];
-            }
-*/
-            td.cloud().UTrans()[cellI] += dm*U1;
-
-            td.cloud().hsTrans()[cellI] += dm*HsEff(td, pc, T1, idG, idL, idS);
-
-            td.cloud().addToMassPhaseChange(dm);
-        }
-    }
-
-
-    // Set new particle properties
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    else
-    {
-        this->Cp_ = CpEff(td, pc, T1, idG, idL, idS);
-        this->T_ = T1;
-        this->U_ = U1;
-
-        // Update particle density or diameter
-        if (td.cloud().constProps().constantVolume())
-        {
-            this->rho_ = mass1/this->volume();
-        }
-        else
-        {
-            this->d_ = cbrt(mass1/this->rho_*6.0/pi);
-        }
-    }
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index 71330144640a7a641b30a1d2b32251f56afc8102..21e7768aa777951685425719c4872de4de739332 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -267,21 +267,17 @@ void Foam::ReactingParcel<ParcelType>::calc
 
     // Define local properties at beginning of time step
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
     const scalar np0 = this->nParticle_;
     const scalar d0 = this->d_;
     const vector& U0 = this->U_;
-    const scalar rho0 = this->rho_;
     const scalar T0 = this->T_;
-    const scalar Cp0 = this->Cp_;
     const scalar mass0 = this->mass();
 
 
     // Calc surface values
-    // ~~~~~~~~~~~~~~~~~~~
     scalar Ts, rhos, mus, Prs, kappas;
     this->calcSurfaceValues(td, cellI, T0, Ts, rhos, mus, Prs, kappas);
-
-    // Reynolds number
     scalar Res = this->Re(U0, d0, rhos, mus);
 
 
@@ -291,16 +287,25 @@ void Foam::ReactingParcel<ParcelType>::calc
     // Explicit momentum source for particle
     vector Su = vector::zero;
 
+    // Linearised momentum source coefficient
+    scalar Spu = 0.0;
+
     // Momentum transfer from the particle to the carrier phase
     vector dUTrans = vector::zero;
 
     // Explicit enthalpy source for particle
     scalar Sh = 0.0;
 
+    // Linearised enthalpy source coefficient
+    scalar Sph = 0.0;
+
     // Sensible enthalpy transfer from the particle to the carrier phase
     scalar dhsTrans = 0.0;
 
 
+    // 1. Compute models that contribute to mass transfer - U, T held constant
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
     // Phase change
     // ~~~~~~~~~~~~
 
@@ -338,22 +343,65 @@ void Foam::ReactingParcel<ParcelType>::calc
         Cs
     );
 
-    // Correct surface values due to emitted species
-    correctSurfaceValues(td, cellI, Ts, Cs, rhos, mus, Prs, kappas);
-    Res = this->Re(U0, d0, rhos, mus);
 
-    // Update particle component mass and mass fractions
-    scalarField dMass(dMassPC);
+    // 2. Update the parcel properties due to change in mass
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+    scalarField dMass(dMassPC);
     scalar mass1 = updateMassFraction(mass0, dMass, Y_);
 
+    this->Cp_ = composition.Cp(0, Y_, pc_, T0);
+
+    // Update particle density or diameter
+    if (td.cloud().constProps().constantVolume())
+    {
+        this->rho_ = mass1/this->volume();
+    }
+    else
+    {
+        this->d_ = cbrt(mass1/this->rho_*6.0/pi);
+    }
+
+    // Remove the particle when mass falls below minimum threshold
+    if (np0*mass1 < td.cloud().constProps().minParticleMass())
+    {
+        td.keepParticle = false;
+
+        if (td.cloud().solution().coupled())
+        {
+            scalar dm = np0*mass1;
+
+            // Absorb parcel into carrier phase
+            forAll(Y_, i)
+            {
+                scalar dmi = dm*Y_[i];
+                label gid = composition.localToGlobalCarrierId(0, i);
+                scalar hs = composition.carrier().Hs(gid, T0);
+
+                td.cloud().rhoTrans(gid)[cellI] += dmi;
+                td.cloud().hsTrans()[cellI] += dmi*hs;
+            }
+            td.cloud().UTrans()[cellI] += dm*U0;
+
+            td.cloud().addToMassPhaseChange(dm);
+        }
+
+        return;
+    }
+
+    // Correct surface values due to emitted species
+    correctSurfaceValues(td, cellI, Ts, Cs, rhos, mus, Prs, kappas);
+    Res = this->Re(U0, this->d_, rhos, mus);
+
+
+    // 3. Compute heat- and momentum transfers
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     // Heat transfer
     // ~~~~~~~~~~~~~
 
     // Calculate new particle temperature
-    scalar Sph = 0.0;
-    scalar T1 =
+    this->T_ =
         this->calcHeatTransfer
         (
             td,
@@ -362,45 +410,29 @@ void Foam::ReactingParcel<ParcelType>::calc
             Res,
             Prs,
             kappas,
-            d0,
-            rho0,
-            T0,
-            Cp0,
             NCpW,
             Sh,
             dhsTrans,
             Sph
         );
 
+    this->Cp_ = composition.Cp(0, Y_, pc_, T0);
+
 
     // Motion
     // ~~~~~~
 
     // Calculate new particle velocity
-    scalar Spu = 0.0;
-    vector U1 =
-        this->calcVelocity
-        (
-            td,
-            dt,
-            cellI,
-            Res,
-            mus,
-            d0,
-            U0,
-            rho0,
-            mass0,
-            Su,
-            dUTrans,
-            Spu
-        );
+    this->U_ =
+        this->calcVelocity(td, dt, cellI, Res, mus, mass1, Su, dUTrans, Spu);
 
 
-    // Accumulate carrier phase source terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // 4. Accumulate carrier phase source terms
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
     if (td.cloud().solution().coupled())
     {
-        // Transfer mass lost to carrier mass and enthalpy sources
+        // Transfer mass lost to carrier mass, momentum and enthalpy sources
         forAll(dMass, i)
         {
             scalar dm = np0*dMass[i];
@@ -414,64 +446,12 @@ void Foam::ReactingParcel<ParcelType>::calc
 
         // Update momentum transfer
         td.cloud().UTrans()[cellI] += np0*dUTrans;
-
-        // Update momentum transfer coefficient
         td.cloud().UCoeff()[cellI] += np0*Spu;
 
         // Update sensible enthalpy transfer
         td.cloud().hsTrans()[cellI] += np0*dhsTrans;
-
-        // Update sensible enthalpy coefficient
         td.cloud().hsCoeff()[cellI] += np0*Sph;
     }
-
-
-    // Remove the particle when mass falls below minimum threshold
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    if (np0*mass1 < td.cloud().constProps().minParticleMass())
-    {
-        td.keepParticle = false;
-
-        if (td.cloud().solution().coupled())
-        {
-            scalar dm = np0*mass1;
-
-            // Absorb parcel into carrier phase
-            forAll(Y_, i)
-            {
-                scalar dmi = dm*Y_[i];
-                label gid = composition.localToGlobalCarrierId(0, i);
-                scalar hs = composition.carrier().Hs(gid, T1);
-
-                td.cloud().rhoTrans(gid)[cellI] += dmi;
-                td.cloud().hsTrans()[cellI] += dmi*hs;
-            }
-            td.cloud().UTrans()[cellI] += dm*U1;
-
-            td.cloud().addToMassPhaseChange(dm);
-        }
-    }
-
-
-    // Set new particle properties
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    else
-    {
-        this->Cp_ = composition.Cp(0, Y_, pc_, T1);
-        this->T_ = T1;
-        this->U_ = U1;
-
-        // Update particle density or diameter
-        if (td.cloud().constProps().constantVolume())
-        {
-            this->rho_ = mass1/this->volume();
-        }
-        else
-        {
-            this->d_ = cbrt(mass1/this->rho_*6.0/pi);
-        }
-    }
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
index dbc63e7c2e09a6c02cdac58a9fdaed9cbb752dfc..f7d37f3ad1af996e11f93e3852f60f631b7fc71b 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -172,21 +172,16 @@ void Foam::ThermoParcel<ParcelType>::calc
     // Define local properties at beginning of time step
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     const scalar np0 = this->nParticle_;
-    const scalar d0 = this->d_;
-    const vector U0 = this->U_;
-    const scalar rho0 = this->rho_;
-    const scalar T0 = this->T_;
-    const scalar Cp0 = this->Cp_;
     const scalar mass0 = this->mass();
 
 
     // Calc surface values
     // ~~~~~~~~~~~~~~~~~~~
     scalar Ts, rhos, mus, Pr, kappas;
-    calcSurfaceValues(td, cellI, T0, Ts, rhos, mus, Pr, kappas);
+    calcSurfaceValues(td, cellI, this->T_, Ts, rhos, mus, Pr, kappas);
 
     // Reynolds number
-    scalar Re = this->Re(U0, d0, rhos, mus);
+    scalar Re = this->Re(this->U_, this->d_, rhos, mus);
 
 
     // Sources
@@ -195,12 +190,18 @@ void Foam::ThermoParcel<ParcelType>::calc
     // Explicit momentum source for particle
     vector Su = vector::zero;
 
+    // Linearised momentum source coefficient
+    scalar Spu = 0.0;
+
     // Momentum transfer from the particle to the carrier phase
     vector dUTrans = vector::zero;
 
     // Explicit enthalpy source for particle
     scalar Sh = 0.0;
 
+    // Linearised enthalpy source coefficient
+    scalar Sph = 0.0;
+
     // Sensible enthalpy transfer from the particle to the carrier phase
     scalar dhsTrans = 0.0;
 
@@ -212,8 +213,7 @@ void Foam::ThermoParcel<ParcelType>::calc
     scalar NCpW = 0.0;
 
     // Calculate new particle temperature
-    scalar Sph = 0.0;
-    scalar T1 =
+    this->T_ =
         this->calcHeatTransfer
         (
             td,
@@ -222,10 +222,6 @@ void Foam::ThermoParcel<ParcelType>::calc
             Re,
             Pr,
             kappas,
-            d0,
-            rho0,
-            T0,
-            Cp0,
             NCpW,
             Sh,
             dhsTrans,
@@ -237,23 +233,8 @@ void Foam::ThermoParcel<ParcelType>::calc
     // ~~~~~~
 
     // Calculate new particle velocity
-    scalar Spu = 0.0;
-    vector U1 =
-        this->calcVelocity
-        (
-            td,
-            dt,
-            cellI,
-            Re,
-            mus,
-            d0,
-            U0,
-            rho0,
-            mass0,
-            Su,
-            dUTrans,
-            Spu
-        );
+    this->U_ =
+        this->calcVelocity(td, dt, cellI, Re, mus, mass0, Su, dUTrans, Spu);
 
 
     //  Accumulate carrier phase source terms
@@ -272,11 +253,6 @@ void Foam::ThermoParcel<ParcelType>::calc
         // Update sensible enthalpy coefficient
         td.cloud().hsCoeff()[cellI] += np0*Sph;
     }
-
-    // Set new particle properties
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    this->U_ = U1;
-    T_ = T1;
 }
 
 
@@ -290,10 +266,6 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
     const scalar Re,
     const scalar Pr,
     const scalar kappa,
-    const scalar d,
-    const scalar rho,
-    const scalar T,
-    const scalar Cp,
     const scalar NCpW,
     const scalar Sh,
     scalar& dhsTrans,
@@ -302,9 +274,12 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
 {
     if (!td.cloud().heatTransfer().active())
     {
-        return T;
+        return T_;
     }
 
+    const scalar d = this->d();
+    const scalar rho = this->rho();
+
     // Calc heat transfer coefficient
     scalar htc = td.cloud().heatTransfer().htc(d, Re, Pr, kappa, NCpW);
 
@@ -313,7 +288,7 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
         return
             max
             (
-                T + dt*Sh/(this->volume(d)*rho*Cp),
+                T_ + dt*Sh/(this->volume(d)*rho*Cp_),
                 td.cloud().constProps().TMin()
             );
     }
@@ -322,7 +297,7 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
     const scalar As = this->areaS(d);
 
     scalar ap = Tc_ + Sh/As/htc;
-    scalar bp = 6.0*(Sh/As + htc*(Tc_ - T));
+    scalar bp = 6.0*(Sh/As + htc*(Tc_ - T_));
     if (td.cloud().radiation())
     {
         tetIndices tetIs = this->currentTetIndices();
@@ -330,20 +305,20 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
         const scalar sigma = physicoChemical::sigma.value();
         const scalar epsilon = td.cloud().constProps().epsilon0();
 
-        ap = (ap + epsilon*Gc/(4.0*htc))/(1.0 + epsilon*sigma*pow3(T)/htc);
-        bp += 6.0*(epsilon*(Gc/4.0 - sigma*pow4(T)));
+        ap = (ap + epsilon*Gc/(4.0*htc))/(1.0 + epsilon*sigma*pow3(T_)/htc);
+        bp += 6.0*(epsilon*(Gc/4.0 - sigma*pow4(T_)));
     }
-    bp /= rho*d*Cp*(ap - T) + ROOTVSMALL;
+    bp /= rho*d*Cp_*(ap - T_) + ROOTVSMALL;
 
     // Integrate to find the new parcel temperature
     IntegrationScheme<scalar>::integrationResult Tres =
-        td.cloud().TIntegrator().integrate(T, dt, ap*bp, bp);
+        td.cloud().TIntegrator().integrate(T_, dt, ap*bp, bp);
 
     scalar Tnew = max(Tres.value(), td.cloud().constProps().TMin());
 
     Sph = dt*htc*As;
 
-    dhsTrans += Sph*(0.5*(T + Tnew) - Tc_);
+    dhsTrans += Sph*(0.5*(T_ + Tnew) - Tc_);
 
     return Tnew;
 }
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
index c8fe14ad1a6eaa337f7c64f62d8c030bd3a7faf2..3b494e746e7326a929809e3a18b5ea0840b4ea06 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
@@ -236,10 +236,6 @@ protected:
             const scalar Re,           // Reynolds number
             const scalar Pr,           // Prandtl number - surface
             const scalar kappa,        // Thermal conductivity - surface
-            const scalar d,            // diameter
-            const scalar rho,          // density
-            const scalar T,            // temperature
-            const scalar Cp,           // specific heat capacity
             const scalar NCpW,         // Sum of N*Cp*W of emission species
             const scalar Sh,           // explicit particle enthalpy source
             scalar& dhsTrans,          // sensible enthalpy transfer to carrier
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C
index 51cf60820fbce98a4f451a1fb9044f9bd279ccce..65732f6fcd827b88beb76c143872b1ff07e36f9b 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C
@@ -25,26 +25,28 @@ License
 
 #include "basicKinematicCollidingCloud.H"
 
+#include "makeParcelCloudFunctionObjects.H"
+
 // Kinematic
 #include "makeParcelForces.H"
 #include "makeParcelDispersionModels.H"
 #include "makeParcelInjectionModels.H"
 #include "makeParcelCollisionModels.H"
 #include "makeParcelPatchInteractionModels.H"
-#include "makeParcelPostProcessingModels.H"
 #include "makeParcelSurfaceFilmModels.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    makeParcelCloudFunctionObjects(basicKinematicCollidingCloud);
+
     // Kinematic sub-models
     makeParcelForces(basicKinematicCollidingCloud);
     makeParcelDispersionModels(basicKinematicCollidingCloud);
     makeParcelInjectionModels(basicKinematicCollidingCloud);
     makeParcelCollisionModels(basicKinematicCollidingCloud);
     makeParcelPatchInteractionModels(basicKinematicCollidingCloud);
-    makeParcelPostProcessingModels(basicKinematicCollidingCloud);
     makeParcelSurfaceFilmModels(basicKinematicCollidingCloud);
 }
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C
index 04081254bb6b0b4930404c6f2ae3a999e777bb90..038d18221a625fb829ab55b830e06249cb9e1ec9 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C
@@ -25,24 +25,26 @@ License
 
 #include "basicKinematicCloud.H"
 
+#include "makeParcelCloudFunctionObjects.H"
+
 // Kinematic
 #include "makeParcelForces.H"
 #include "makeParcelDispersionModels.H"
 #include "makeParcelInjectionModels.H"
 #include "makeParcelPatchInteractionModels.H"
-#include "makeParcelPostProcessingModels.H"
 #include "makeParcelSurfaceFilmModels.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    makeParcelCloudFunctionObjects(basicKinematicCloud);
+
     // Kinematic sub-models
     makeParcelForces(basicKinematicCloud);
     makeParcelDispersionModels(basicKinematicCloud);
     makeParcelInjectionModels(basicKinematicCloud);
     makeParcelPatchInteractionModels(basicKinematicCloud);
-    makeParcelPostProcessingModels(basicKinematicCloud);
     makeParcelSurfaceFilmModels(basicKinematicCloud);
 }
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C
index b1185d25d76828cef19872f84df7940f4869094e..6f3058b52e9193511e709292f1724119eaa3796b 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C
@@ -25,12 +25,13 @@ License
 
 #include "basicReactingMultiphaseCloud.H"
 
+#include "makeParcelCloudFunctionObjects.H"
+
 // Kinematic
 #include "makeThermoParcelForces.H" // thermo variant
 #include "makeParcelDispersionModels.H"
 #include "makeReactingMultiphaseParcelInjectionModels.H" // MP variant
 #include "makeParcelPatchInteractionModels.H"
-#include "makeParcelPostProcessingModels.H"
 
 // Thermodynamic
 #include "makeParcelHeatTransferModels.H"
@@ -48,12 +49,13 @@ License
 
 namespace Foam
 {
+    makeParcelCloudFunctionObjects(basicReactingMultiphaseCloud);
+
     // Kinematic sub-models
     makeThermoParcelForces(basicReactingMultiphaseCloud);
     makeParcelDispersionModels(basicReactingMultiphaseCloud);
     makeReactingMultiphaseParcelInjectionModels(basicReactingMultiphaseCloud);
     makeParcelPatchInteractionModels(basicReactingMultiphaseCloud);
-    makeParcelPostProcessingModels(basicReactingMultiphaseCloud);
 
     // Thermo sub-models
     makeParcelHeatTransferModels(basicReactingMultiphaseCloud);
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C
index 47b2fac7ecd495878e1fc15a4166b7e0c0b7404e..acda24158c1cce38125c65408b21488d3aebb270 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C
@@ -25,12 +25,13 @@ License
 
 #include "basicReactingCloud.H"
 
+#include "makeParcelCloudFunctionObjects.H"
+
 // Kinematic
 #include "makeThermoParcelForces.H" // thermo variant
 #include "makeParcelDispersionModels.H"
 #include "makeReactingParcelInjectionModels.H" // Reacting variant
 #include "makeParcelPatchInteractionModels.H"
-#include "makeParcelPostProcessingModels.H"
 
 // Thermodynamic
 #include "makeParcelHeatTransferModels.H"
@@ -47,12 +48,13 @@ namespace Foam
     typedef basicReactingCloud::thermoCloudType thermoCloudType2;
     typedef basicReactingCloud::kinematicCloudType kinematicCloudType2;
 
+    makeParcelCloudFunctionObjects(basicReactingCloud);
+
     // Kinematic sub-models
     makeThermoParcelForces(basicReactingCloud);
     makeParcelDispersionModels(basicReactingCloud);
     makeReactingParcelInjectionModels(basicReactingCloud);
     makeParcelPatchInteractionModels(basicReactingCloud);
-    makeParcelPostProcessingModels(basicReactingCloud);
 
     // Thermo sub-models
     makeParcelHeatTransferModels(basicReactingCloud);
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
index 4a55932786f9e2479bd15ae97253cd20dcaf36d0..371d35e6832dad75a1a156235be3a2d88a486437 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
@@ -25,12 +25,13 @@ License
 
 #include "basicThermoCloud.H"
 
+#include "makeParcelCloudFunctionObjects.H"
+
 // Kinematic
 #include "makeThermoParcelForces.H" // thermo variant
 #include "makeParcelDispersionModels.H"
 #include "makeParcelInjectionModels.H"
 #include "makeParcelPatchInteractionModels.H"
-#include "makeParcelPostProcessingModels.H"
 
 // Thermodynamic
 #include "makeParcelHeatTransferModels.H"
@@ -40,12 +41,13 @@ License
 
 namespace Foam
 {
+    makeParcelCloudFunctionObjects(basicThermoCloud);
+
     // Kinematic sub-models
     makeThermoParcelForces(basicThermoCloud);
     makeParcelDispersionModels(basicThermoCloud);
     makeParcelInjectionModels(basicThermoCloud);
     makeParcelPatchInteractionModels(basicThermoCloud);
-    makeParcelPostProcessingModels(basicThermoCloud);
 
     // Thermo sub-models
     makeParcelHeatTransferModels(basicThermoCloud);
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelPostProcessingModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H
similarity index 77%
rename from src/lagrangian/intermediate/parcels/include/makeParcelPostProcessingModels.H
rename to src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H
index c366916c53d6bc9a0d6455cc2fa8f819f67aa2e9..0074e1c751fd2f2c2beaf3829b31e503b1af6f2b 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelPostProcessingModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,24 +23,24 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef makeParcelPostProcessingModels_H
-#define makeParcelPostProcessingModels_H
+#ifndef makeParcelCloudFunctionObjects_H
+#define makeParcelCloudFunctionObjects_H
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "NoPostProcessing.H"
+#include "FacePostProcessing.H"
 #include "ParticleTracks.H"
 #include "PatchPostProcessing.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeParcelPostProcessingModels(CloudType)                             \
+#define makeParcelCloudFunctionObjects(CloudType)                             \
                                                                               \
-    makePostProcessingModel(CloudType);                                       \
+    makeCloudFunctionObject(CloudType);                                       \
                                                                               \
-    makePostProcessingModelType(NoPostProcessing, CloudType);                 \
-    makePostProcessingModelType(ParticleTracks, CloudType);                   \
-    makePostProcessingModelType(PatchPostProcessing, CloudType);
+    makeCloudFunctionObjectType(FacePostProcessing, CloudType);               \
+    makeCloudFunctionObjectType(ParticleTracks, CloudType);                   \
+    makeCloudFunctionObjectType(PatchPostProcessing, CloudType);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C
similarity index 73%
rename from src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.C
rename to src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C
index eb0b60ca282290cccfdf50b2e7f50b053fe35a17..ba7e86981660bd84ca79cc13b6f87f8efcecd4f6 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,42 +23,42 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "PostProcessingModel.H"
+#include "CloudFunctionObject.H"
 
 // * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * * //
 
 template<class CloudType>
-void Foam::PostProcessingModel<CloudType>::write()
+void Foam::CloudFunctionObject<CloudType>::write()
 {
-    notImplemented("void Foam::PostProcessingModel<CloudType>::write()");
+    notImplemented("void Foam::CloudFunctionObject<CloudType>::write()");
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::PostProcessingModel<CloudType>::PostProcessingModel(CloudType& owner)
+Foam::CloudFunctionObject<CloudType>::CloudFunctionObject(CloudType& owner)
 :
     SubModelBase<CloudType>(owner)
 {}
 
 
 template<class CloudType>
-Foam::PostProcessingModel<CloudType>::PostProcessingModel
+Foam::CloudFunctionObject<CloudType>::CloudFunctionObject
 (
     const dictionary& dict,
     CloudType& owner,
     const word& type
 )
 :
-    SubModelBase<CloudType>(owner, dict, type)
+    SubModelBase<CloudType>(owner, dict, type, "")
 {}
 
 
 template<class CloudType>
-Foam::PostProcessingModel<CloudType>::PostProcessingModel
+Foam::CloudFunctionObject<CloudType>::CloudFunctionObject
 (
-    const PostProcessingModel<CloudType>& ppm
+    const CloudFunctionObject<CloudType>& ppm
 )
 :
     SubModelBase<CloudType>(ppm)
@@ -68,14 +68,14 @@ Foam::PostProcessingModel<CloudType>::PostProcessingModel
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::PostProcessingModel<CloudType>::~PostProcessingModel()
+Foam::CloudFunctionObject<CloudType>::~CloudFunctionObject()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CloudType>
-void Foam::PostProcessingModel<CloudType>::post()
+void Foam::CloudFunctionObject<CloudType>::postEvolve()
 {
     if (this->owner().time().outputTime())
     {
@@ -85,7 +85,7 @@ void Foam::PostProcessingModel<CloudType>::post()
 
 
 template<class CloudType>
-void Foam::PostProcessingModel<CloudType>::postPatch
+void Foam::CloudFunctionObject<CloudType>::postPatch
 (
     const typename CloudType::parcelType&,
     const label
@@ -93,7 +93,7 @@ void Foam::PostProcessingModel<CloudType>::postPatch
 {
     notImplemented
     (
-        "void Foam::PostProcessingModel<CloudType>::postPatch"
+        "void Foam::CloudFunctionObject<CloudType>::postPatch"
         "("
             "const typename CloudType::parcelType&,"
             "const label"
@@ -103,14 +103,14 @@ void Foam::PostProcessingModel<CloudType>::postPatch
 
 
 template<class CloudType>
-void Foam::PostProcessingModel<CloudType>::postFace
+void Foam::CloudFunctionObject<CloudType>::postFace
 (
     const typename CloudType::parcelType&
 )
 {
     notImplemented
     (
-        "void Foam::PostProcessingModel<CloudType>::postFace"
+        "void Foam::CloudFunctionObject<CloudType>::postFace"
         "("
             "const typename CloudType::parcelType&"
         ")"
@@ -120,6 +120,6 @@ void Foam::PostProcessingModel<CloudType>::postFace
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "PostProcessingModelNew.C"
+#include "CloudFunctionObjectNew.C"
 
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
similarity index 76%
rename from src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.H
rename to src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
index 553e03a28ad9e702e776d0d8f4b5d29b66816311..6a2b05d866556f8135a214325da9d3e8f95fa76a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,19 +22,19 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::PostProcessingModel
+    Foam::CloudFunctionObject
 
 Description
-    Templated post-processing model class
+    Templated cloud function object base class
 
 SourceFiles
-    PostProcessingModel.C
-    PostProcessingModelNew.C
+    CloudFunctionObject.C
+    CloudFunctionObjectNew.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef PostProcessingModel_H
-#define PostProcessingModel_H
+#ifndef CloudFunctionObject_H
+#define CloudFunctionObject_H
 
 #include "IOdictionary.H"
 #include "autoPtr.H"
@@ -47,11 +47,11 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                    Class PostProcessingModel Declaration
+                    Class CloudFunctionObject Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class CloudType>
-class PostProcessingModel
+class CloudFunctionObject
 :
     public SubModelBase<CloudType>
 {
@@ -70,7 +70,7 @@ public:
     declareRunTimeSelectionTable
     (
         autoPtr,
-        PostProcessingModel,
+        CloudFunctionObject,
         dictionary,
         (
             const dictionary& dict,
@@ -83,38 +83,39 @@ public:
     // Constructors
 
         //- Construct null from owner
-        PostProcessingModel(CloudType& owner);
+        CloudFunctionObject(CloudType& owner);
 
         //- Construct from dictionary
-        PostProcessingModel
+        CloudFunctionObject
         (
             const dictionary& dict,
             CloudType& owner,
-            const word& type
+            const word& modelType
         );
 
         //- Construct copy
-        PostProcessingModel(const PostProcessingModel<CloudType>& ppm);
+        CloudFunctionObject(const CloudFunctionObject<CloudType>& ppm);
 
         //- Construct and return a clone
-        virtual autoPtr<PostProcessingModel<CloudType> > clone() const
+        virtual autoPtr<CloudFunctionObject<CloudType> > clone() const
         {
-            return autoPtr<PostProcessingModel<CloudType> >
+            return autoPtr<CloudFunctionObject<CloudType> >
             (
-                new PostProcessingModel<CloudType>(*this)
+                new CloudFunctionObject<CloudType>(*this)
             );
         }
 
 
     //- Destructor
-    virtual ~PostProcessingModel();
+    virtual ~CloudFunctionObject();
 
 
     //- Selector
-    static autoPtr<PostProcessingModel<CloudType> > New
+    static autoPtr<CloudFunctionObject<CloudType> > New
     (
         const dictionary& dict,
-        CloudType& owner
+        CloudType& owner,
+        const word& modelType
     );
 
 
@@ -122,17 +123,17 @@ public:
 
         // Evaluation
 
-            //- Main post-processing function
-            virtual void post();
+            //- Post-evolve hook
+            virtual void postEvolve();
 
-            //- Gather post-processing info on patch
+            //- Post-patch hook
             virtual void postPatch
             (
                 const typename CloudType::parcelType& p,
                 const label patchI
             );
 
-            //- Gather post-processing info on a face
+            //- Post-face hook
             virtual void postFace(const typename CloudType::parcelType& p);
 };
 
@@ -143,27 +144,27 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makePostProcessingModel(CloudType)                                    \
+#define makeCloudFunctionObject(CloudType)                                    \
                                                                               \
     typedef CloudType::kinematicCloudType kinematicCloudType;                 \
     defineNamedTemplateTypeNameAndDebug                                       \
     (                                                                         \
-        PostProcessingModel<kinematicCloudType>,                              \
+        CloudFunctionObject<kinematicCloudType>,                              \
         0                                                                     \
     );                                                                        \
     defineTemplateRunTimeSelectionTable                                       \
     (                                                                         \
-        PostProcessingModel<kinematicCloudType>,                              \
+        CloudFunctionObject<kinematicCloudType>,                              \
         dictionary                                                            \
     );
 
 
-#define makePostProcessingModelType(SS, CloudType)                            \
+#define makeCloudFunctionObjectType(SS, CloudType)                            \
                                                                               \
     typedef CloudType::kinematicCloudType kinematicCloudType;                 \
     defineNamedTemplateTypeNameAndDebug(SS<kinematicCloudType>, 0);           \
                                                                               \
-    PostProcessingModel<kinematicCloudType>::                                 \
+    CloudFunctionObject<kinematicCloudType>::                                 \
         adddictionaryConstructorToTable<SS<kinematicCloudType> >              \
             add##SS##CloudType##kinematicCloudType##ConstructorToTable_;
 
@@ -171,7 +172,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "PostProcessingModel.C"
+#   include "CloudFunctionObject.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelNew.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObjectNew.C
similarity index 75%
rename from src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelNew.C
rename to src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObjectNew.C
index d74ec053539dcd2f6b187841b58454adf8cea30c..dbdce2c43a6d8adb1e396bb1866ec9e98adedbe8 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelNew.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObjectNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,21 +23,20 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "PostProcessingModel.H"
+#include "CloudFunctionObject.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::PostProcessingModel<CloudType> >
-Foam::PostProcessingModel<CloudType>::New
+Foam::autoPtr<Foam::CloudFunctionObject<CloudType> >
+Foam::CloudFunctionObject<CloudType>::New
 (
     const dictionary& dict,
-    CloudType& owner
+    CloudType& owner,
+    const word& modelType
 )
 {
-    const word modelType(dict.lookup("postProcessingModel"));
-
-    Info<< "Selecting post-processing model " << modelType << endl;
+    Info<< "    Selecting cloud function " << modelType << endl;
 
     typename dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(modelType);
@@ -46,19 +45,19 @@ Foam::PostProcessingModel<CloudType>::New
     {
         FatalErrorIn
         (
-            "PostProcessingModel<CloudType>::New"
+            "CloudFunctionObject<CloudType>::New"
             "("
                 "const dictionary&, "
                 "CloudType&"
             ")"
-        )   << "Unknown post-processing model type "
+        )   << "Unknown cloud function type "
             << modelType << nl << nl
-            << "Valid post-processing model types are:" << nl
+            << "Valid cloud function types are:" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
-    return autoPtr<PostProcessingModel<CloudType> >(cstrIter()(dict, owner));
+    return autoPtr<CloudFunctionObject<CloudType> >(cstrIter()(dict, owner));
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.C
new file mode 100644
index 0000000000000000000000000000000000000000..e4bb8b187890b4aca161abeadc67bb487340e487
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.C
@@ -0,0 +1,147 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "CloudFunctionObjectList.H"
+#include "entry.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::CloudFunctionObjectList<CloudType>::CloudFunctionObjectList
+(
+    CloudType& owner
+)
+:
+    PtrList<CloudFunctionObject<CloudType> >(),
+    owner_(owner),
+    dict_(dictionary::null)
+{}
+
+
+template<class CloudType>
+Foam::CloudFunctionObjectList<CloudType>::CloudFunctionObjectList
+(
+    CloudType& owner,
+    const dictionary& dict,
+    const bool readFields
+)
+:
+    PtrList<CloudFunctionObject<CloudType> >(),
+    owner_(owner),
+    dict_(dict)
+{
+    if (readFields)
+    {
+        wordList modelNames(dict.toc());
+
+        Info<< "Constructing cloud functions" << endl;
+
+        if (modelNames.size() > 0)
+        {
+            this->setSize(modelNames.size());
+
+            forAll(modelNames, i)
+            {
+                const word& modelName = modelNames[i];
+
+                this->set
+                (
+                    i,
+                    CloudFunctionObject<CloudType>::New
+                    (
+                        dict,
+                        owner,
+                        modelName
+                    )
+                );
+            }
+        }
+        else
+        {
+            Info<< "    none" << endl;
+        }
+    }
+}
+
+
+template<class CloudType>
+Foam::CloudFunctionObjectList<CloudType>::CloudFunctionObjectList
+(
+    const CloudFunctionObjectList& ppm
+)
+:
+    PtrList<CloudFunctionObject<CloudType> >(ppm),
+    owner_(ppm.owner_),
+    dict_(ppm.dict_)
+{}
+
+
+// * * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::CloudFunctionObjectList<CloudType>::~CloudFunctionObjectList()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+void Foam::CloudFunctionObjectList<CloudType>::postEvolve()
+{
+    forAll(*this, i)
+    {
+        this->operator[](i).postEvolve();
+    }
+}
+
+
+template<class CloudType>
+void Foam::CloudFunctionObjectList<CloudType>::postPatch
+(
+    const typename CloudType::parcelType& p,
+    const label patchI
+)
+{
+    forAll(*this, i)
+    {
+        this->operator[](i).postPatch(p, patchI);
+    }
+}
+
+
+template<class CloudType>
+void Foam::CloudFunctionObjectList<CloudType>::postFace
+(
+    const typename CloudType::parcelType& p
+)
+{
+    forAll(*this, i)
+    {
+        this->operator[](i).postFace(p);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.H
similarity index 59%
rename from src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.H
rename to src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.H
index bec8d997e12d75ee1427a26deb91d6105adf3d12..dcc27143ab5ecaf711408710f5bff50362659860 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,20 +22,22 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::NoPostProcessing
+    Foam::CloudFunctionObjectList
 
 Description
-    Place holder for 'none' option
+    List of cloud function objects
 
 SourceFiles
-    NoPostProcessing.C
+    CloudFunctionObjectListI.H
+    CloudFunctionObjectList.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef NoPostProcessing_H
-#define NoPostProcessing_H
+#ifndef CloudFunctionObjectList_H
+#define CloudFunctionObjectList_H
 
-#include "PostProcessingModel.H"
+#include "PtrList.H"
+#include "CloudFunctionObject.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -43,65 +45,75 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                      Class NoPostProcessing Declaration
+                   Class CloudFunctionObjectList Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class CloudType>
-class NoPostProcessing
+class CloudFunctionObjectList
 :
-    public PostProcessingModel<CloudType>
+    public PtrList<CloudFunctionObject<CloudType> >
 {
 protected:
 
-    // Protected Member Functions
+    // Protected Data
 
-        //- Write post-processing info
-        void write();
+        //- Reference to the owner cloud
+        const CloudType& owner_;
 
+        //- Dictionary
+        const dictionary dict_;
 
-public:
-
-    //- Runtime type information
-    TypeName("none");
 
+public:
 
     // Constructors
 
-        //- Construct from components
-        NoPostProcessing(const dictionary&, CloudType&);
+        //- Null constructor
+        CloudFunctionObjectList(CloudType& owner);
 
-        //- Construct copy
-        NoPostProcessing(const NoPostProcessing<CloudType>& ppm);
+        //- Construct from mesh
+        CloudFunctionObjectList
+        (
+            CloudType& owner,
+            const dictionary& dict,
+            const bool readFields
+        );
 
-        //- Construct and return a clone
-        virtual autoPtr<PostProcessingModel<CloudType> > clone() const
-        {
-            return autoPtr<PostProcessingModel<CloudType> >
-            (
-                new NoPostProcessing<CloudType>(*this)
-            );
-        }
+        //- Construct copy
+        CloudFunctionObjectList(const CloudFunctionObjectList& ppml);
 
 
     //- Destructor
-    virtual ~NoPostProcessing();
+    virtual ~CloudFunctionObjectList();
 
 
     // Member Functions
 
+        // Access
+
+            //- Return const access to the cloud owner
+            inline const CloudType& owner() const;
+
+            //- Return refernce to the cloud owner
+            inline CloudType& owner();
+
+            //- Return the forces dictionary
+            inline const dictionary& dict() const;
+
+
         // Evaluation
 
-            //- Flag to indicate whether model activates post-processing model
-            virtual bool active() const;
+            //- Post-evolve hook
+            virtual void postEvolve();
 
-            //- Gather post-processing info on patch
+            //- Post-patch hook
             virtual void postPatch
             (
                 const typename CloudType::parcelType& p,
                 const label patchI
             );
 
-            //- Gather particle data when hit face
+            //- Post-face hook
             virtual void postFace(const typename CloudType::parcelType& p);
 };
 
@@ -112,8 +124,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "CloudFunctionObjectListI.H"
+
 #ifdef NoRepository
-#   include "NoPostProcessing.C"
+    #include "CloudFunctionObjectList.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectListI.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectListI.H
new file mode 100644
index 0000000000000000000000000000000000000000..1dd134cd6c37fe3b36aca68de2e2a88509012d40
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObjectList/CloudFunctionObjectListI.H
@@ -0,0 +1,48 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+inline const CloudType& Foam::CloudFunctionObjectList<CloudType>::owner() const
+{
+    return owner_;
+}
+
+
+template<class CloudType>
+inline CloudType& Foam::CloudFunctionObjectList<CloudType>::owner()
+{
+    return owner_;
+}
+
+
+template<class CloudType>
+inline const Foam::dictionary&
+Foam::CloudFunctionObjectList<CloudType>::dict() const
+{
+    return dict_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C
new file mode 100644
index 0000000000000000000000000000000000000000..b3cdad013e61c74f57e3b800bbe0f9c341bbc1a3
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C
@@ -0,0 +1,281 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "FacePostProcessing.H"
+#include "Pstream.H"
+#include "ListListOps.H"
+#include "surfaceWriter.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::label Foam::FacePostProcessing<CloudType>::applyToFace
+(
+    const label faceI
+) const
+{
+    forAll(fZone_, i)
+    {
+        if (fZone_[i] == faceI)
+        {
+            return i;
+        }
+    }
+
+    return -1;
+}
+
+
+template<class CloudType>
+void Foam::FacePostProcessing<CloudType>::write()
+{
+    const fvMesh& mesh = this->owner().mesh();
+    const scalar dt = this->owner().time().deltaTValue();
+
+    totalTime_ += dt;
+
+    const scalar alpha = (totalTime_ - dt)/totalTime_;
+    const scalar beta = dt/totalTime_;
+
+    massTotal_ += mass_;
+
+    massFlux_ = alpha*massFlux_ + beta*mass_/dt;
+
+    const label procI = Pstream::myProcNo();
+
+    scalarListList allProcMass(Pstream::nProcs());
+    allProcMass[procI].setSize(massTotal_.size());
+    allProcMass[procI] = massTotal_;
+    Pstream::gatherList(allProcMass);
+    scalarList allMass
+    (
+        ListListOps::combine<scalarList>
+        (
+            allProcMass, accessOp<scalarList>()
+        )
+    );
+
+    scalarListList allProcMassFlux(Pstream::nProcs());
+    allProcMassFlux[procI].setSize(massFlux_.size());
+    allProcMassFlux[procI] = massFlux_;
+    Pstream::gatherList(allProcMassFlux);
+    scalarList allMassFlux
+    (
+        ListListOps::combine<scalarList>
+        (
+            allProcMassFlux, accessOp<scalarList>()
+        )
+    );
+
+    Info<< "particleFaceFlux output:" << nl
+        << "    total mass      = " << sum(allMass) << nl
+        << "    average mass flux = " << sum(allMassFlux) << nl << endl;
+
+
+    if (surfaceFormat_ != "none")
+    {
+        labelList pointToGlobal;
+        labelList uniqueMeshPointLabels;
+        autoPtr<globalIndex> globalPointsPtr =
+            mesh.globalData().mergePoints
+            (
+                fZone_().meshPoints(),
+                fZone_().meshPointMap(),
+                pointToGlobal,
+                uniqueMeshPointLabels
+            );
+
+        pointField uniquePoints(mesh.points(), uniqueMeshPointLabels);
+        List<pointField> allProcPoints(Pstream::nProcs());
+        allProcPoints[procI].setSize(uniquePoints.size());
+        allProcPoints[procI] = uniquePoints;
+        Pstream::gatherList(allProcPoints);
+        pointField allPoints
+        (
+            ListListOps::combine<pointField>
+            (
+                allProcPoints, accessOp<pointField>()
+            )
+        );
+
+        faceList faces(fZone_().localFaces());
+        forAll(faces, i)
+        {
+            inplaceRenumber(pointToGlobal, faces[i]);
+        }
+        List<faceList> allProcFaces(Pstream::nProcs());
+        allProcFaces[procI].setSize(faces.size());
+        allProcFaces[procI] = faces;
+        Pstream::gatherList(allProcFaces);
+        faceList allFaces
+        (
+            ListListOps::combine<faceList>
+            (
+                allProcFaces, accessOp<faceList>()
+            )
+        );
+
+
+        if (Pstream::master())
+        {
+            fileName outputDir = mesh.time().path();
+
+            if (Pstream::parRun())
+            {
+                // Put in undecomposed case (Note: gives problems for
+                // distributed data running)
+                outputDir =
+                    outputDir/".."/"postProcessing"/cloud::prefix/
+                    this->owner().name()/mesh.time().timeName();
+            }
+            else
+            {
+                outputDir =
+                    outputDir/"postProcessing"/cloud::prefix/
+                    this->owner().name()/mesh.time().timeName();
+            }
+
+            autoPtr<surfaceWriter> writer(surfaceWriter::New(surfaceFormat_));
+            writer->write
+            (
+                outputDir,
+                "massTotal",
+                allPoints,
+                allFaces,
+                "massTotal",
+                massTotal_,
+                false
+            );
+            writer->write
+            (
+                outputDir,
+                "massFlux",
+                allPoints,
+                allFaces,
+                "massFlux",
+                massFlux_,
+                false
+            );
+        }
+    }
+
+
+    if (resetOnWrite_)
+    {
+        massFlux_ = 0.0;
+        totalTime_ = 0.0;
+    }
+
+    mass_ = 0.0;
+
+    // writeProperties();
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::FacePostProcessing<CloudType>::FacePostProcessing
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+:
+    CloudFunctionObject<CloudType>(dict, owner, typeName),
+    fZone_(owner.mesh().faceZones()[this->coeffDict().lookup("faceZone")]),
+    surfaceFormat_(this->coeffDict().lookup("surfaceFormat")),
+    resetOnWrite_(this->coeffDict().lookup("resetOnWrite")),
+    totalTime_(0.0),
+    mass_(),
+    massTotal_(),
+    massFlux_()
+{
+    label allFaces = returnReduce(fZone_().size(), sumOp<scalar>());
+    Info<< "        Number of faces = " << allFaces << endl;
+
+    mass_.setSize(fZone_.size(), 0.0);
+
+    // readProperties(); AND initialise mass... fields
+
+    massTotal_.setSize(fZone_.size(), 0.0);
+    massFlux_.setSize(fZone_.size(), 0.0);
+}
+
+
+template<class CloudType>
+Foam::FacePostProcessing<CloudType>::FacePostProcessing
+(
+    const FacePostProcessing<CloudType>& pff
+)
+:
+    CloudFunctionObject<CloudType>(pff),
+    fZone_(pff.fZone_.clone(pff.fZone_.zoneMesh())),
+    surfaceFormat_(pff.surfaceFormat_),
+    resetOnWrite_(pff.resetOnWrite_),
+    totalTime_(pff.totalTime_),
+    mass_(pff.mass_),
+    massTotal_(pff.massTotal_),
+    massFlux_(pff.massFlux_)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::FacePostProcessing<CloudType>::~FacePostProcessing()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+void Foam::FacePostProcessing<CloudType>::postPatch
+(
+    const parcelType&,
+    const label
+)
+{}
+
+
+template<class CloudType>
+void Foam::FacePostProcessing<CloudType>::postFace(const parcelType& p)
+{
+    if
+    (
+        this->owner().solution().output()
+     || this->owner().solution().transient()
+    )
+    {
+        const label faceI = applyToFace(p.face());
+
+        if (faceI != -1)
+        {
+            mass_[faceI] += p.mass()*p.nParticle();
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.H
new file mode 100644
index 0000000000000000000000000000000000000000..de239097e6e1fa26c7bd7265baf36b802b477d00
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.H
@@ -0,0 +1,167 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::FacePostProcessing
+
+Description
+    Records particle face quantities on used-specified face zone
+
+    Currently supports:
+        accummulated mass
+        average mass flux
+
+SourceFiles
+    FacePostProcessing.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef FacePostProcessing_H
+#define FacePostProcessing_H
+
+#include "CloudFunctionObject.H"
+#include "faceZone.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class FacePostProcessing Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class FacePostProcessing
+:
+    public CloudFunctionObject<CloudType>
+{
+    // Private Data
+
+        // Typedefs
+
+            //- Convenience typedef for parcel type
+            typedef typename CloudType::parcelType parcelType;
+
+
+        //- Face zone
+        const faceZone& fZone_;
+
+        //- Surface output format
+        const word surfaceFormat_;
+
+        //- Flag to indicate whether data should be reset/cleared on writing
+        Switch resetOnWrite_;
+
+        //- Total time
+        scalar totalTime_;
+
+        //- Mass storage
+        scalarField mass_;
+
+        //- Mass total storage
+        scalarField massTotal_;
+
+        //- Mass flux storage
+        scalarField massFlux_;
+
+
+    // Private Member Functions
+
+        //- Return index into massFlux_ list if valid face, else -1
+        label applyToFace(const label faceI) const;
+
+
+protected:
+
+    // Protected Member Functions
+
+        //- Write post-processing info
+        void write();
+
+
+public:
+
+    //- Runtime type information
+    TypeName("facePostProcessing");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        FacePostProcessing(const dictionary& dict, CloudType& owner);
+
+        //- Construct copy
+        FacePostProcessing(const FacePostProcessing<CloudType>& ppm);
+
+        //- Construct and return a clone
+        virtual autoPtr<CloudFunctionObject<CloudType> > clone() const
+        {
+            return autoPtr<CloudFunctionObject<CloudType> >
+            (
+                new FacePostProcessing<CloudType>(*this)
+            );
+        }
+
+
+    //- Destructor
+    virtual ~FacePostProcessing();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return const access to the reset on write flag
+            inline const Switch& resetOnWrite() const;
+
+
+        // Evaluation
+
+            //- Post-patch hook
+            virtual void postPatch(const parcelType& p, const label patchI);
+
+            //- Post-face hook
+            virtual void postFace(const parcelType& p);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "FacePostProcessingI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "FacePostProcessing.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessingI.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessingI.H
new file mode 100644
index 0000000000000000000000000000000000000000..8c264fc24aa2a37305bbdde06ec3dbbeafbb114d
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessingI.H
@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+inline const Foam::Switch&
+Foam::FacePostProcessing<CloudType>::resetOnWrite() const
+{
+    return resetOnWrite_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/ParticleTracks/ParticleTracks.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C
similarity index 97%
rename from src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/ParticleTracks/ParticleTracks.C
rename to src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C
index 65c2d494878fa40a0def8866ec3aa9f521db7852..f02eb29076dfb21a321f4d0979fce1b9fc4d6164 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/ParticleTracks/ParticleTracks.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C
@@ -62,7 +62,7 @@ Foam::ParticleTracks<CloudType>::ParticleTracks
     CloudType& owner
 )
 :
-    PostProcessingModel<CloudType>(dict, owner, typeName),
+    CloudFunctionObject<CloudType>(dict, owner, typeName),
     trackInterval_(readLabel(this->coeffDict().lookup("trackInterval"))),
     maxSamples_(readLabel(this->coeffDict().lookup("maxSamples"))),
     resetOnWrite_(this->coeffDict().lookup("resetOnWrite")),
@@ -77,7 +77,7 @@ Foam::ParticleTracks<CloudType>::ParticleTracks
     const ParticleTracks<CloudType>& ppm
 )
 :
-    PostProcessingModel<CloudType>(ppm),
+    CloudFunctionObject<CloudType>(ppm),
     trackInterval_(ppm.trackInterval_),
     maxSamples_(ppm.maxSamples_),
     resetOnWrite_(ppm.resetOnWrite_),
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/ParticleTracks/ParticleTracks.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.H
similarity index 93%
rename from src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/ParticleTracks/ParticleTracks.H
rename to src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.H
index 1e1265ff3d61f19dc23bfc28e34453b832a8466a..283d03d7cd3a48c0b0529ba2b7633407bd9f1408 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/ParticleTracks/ParticleTracks.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.H
@@ -35,7 +35,7 @@ SourceFiles
 #ifndef ParticleTracks_H
 #define ParticleTracks_H
 
-#include "PostProcessingModel.H"
+#include "CloudFunctionObject.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -49,7 +49,7 @@ namespace Foam
 template<class CloudType>
 class ParticleTracks
 :
-    public PostProcessingModel<CloudType>
+    public CloudFunctionObject<CloudType>
 {
     // Private data
 
@@ -101,9 +101,9 @@ public:
         ParticleTracks(const ParticleTracks<CloudType>& ppm);
 
         //- Construct and return a clone
-        virtual autoPtr<PostProcessingModel<CloudType> > clone() const
+        virtual autoPtr<CloudFunctionObject<CloudType> > clone() const
         {
-            return autoPtr<PostProcessingModel<CloudType> >
+            return autoPtr<CloudFunctionObject<CloudType> >
             (
                 new ParticleTracks<CloudType>(*this)
             );
@@ -136,10 +136,10 @@ public:
 
         // Evaluation
 
-            //- Gather post-processing info on patch - not used
+            //- Post-patch hook
             virtual void postPatch(const parcelType& p, const label patchI);
 
-            //- Gather particle data when hit face
+            //- Post-face hook
             virtual void postFace(const parcelType& p);
 };
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/ParticleTracks/ParticleTracksI.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracksI.H
similarity index 96%
rename from src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/ParticleTracks/ParticleTracksI.H
rename to src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracksI.H
index f36556c4f11d54e47a36833cf333085e64a56f8c..de16c09709363785456fe33a0d5a3789ca3ddfd3 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/ParticleTracks/ParticleTracksI.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracksI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C
similarity index 98%
rename from src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.C
rename to src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C
index e8aefd500ac261a746d8ba1d56f883d36c0a8f79..a0c462fca02b0b5140bece441573cb40759959ff 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C
@@ -125,7 +125,7 @@ Foam::PatchPostProcessing<CloudType>::PatchPostProcessing
     CloudType& owner
 )
 :
-    PostProcessingModel<CloudType>(dict, owner, typeName),
+    CloudFunctionObject<CloudType>(dict, owner, typeName),
     maxStoredParcels_(readScalar(this->coeffDict().lookup("maxStoredParcels"))),
     patchIDs_(),
     patchData_()
@@ -176,7 +176,7 @@ Foam::PatchPostProcessing<CloudType>::PatchPostProcessing
     const PatchPostProcessing<CloudType>& ppm
 )
 :
-    PostProcessingModel<CloudType>(ppm),
+    CloudFunctionObject<CloudType>(ppm),
     maxStoredParcels_(ppm.maxStoredParcels_),
     patchIDs_(ppm.patchIDs_),
     patchData_(ppm.patchData_)
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.H
similarity index 92%
rename from src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H
rename to src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.H
index 410744fdbe392f7e828040e32bd252822d8b78ce..90a75dd6a0a3e30a6ee924f44739ab2bae1b879e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.H
@@ -35,7 +35,7 @@ SourceFiles
 #ifndef PatchPostProcessing_H
 #define PatchPostProcessing_H
 
-#include "PostProcessingModel.H"
+#include "CloudFunctionObject.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -49,7 +49,7 @@ namespace Foam
 template<class CloudType>
 class PatchPostProcessing
 :
-    public PostProcessingModel<CloudType>
+    public CloudFunctionObject<CloudType>
 {
     // Private data
 
@@ -94,9 +94,9 @@ public:
         PatchPostProcessing(const PatchPostProcessing<CloudType>& ppm);
 
         //- Construct and return a clone
-        virtual autoPtr<PostProcessingModel<CloudType> > clone() const
+        virtual autoPtr<CloudFunctionObject<CloudType> > clone() const
         {
-            return autoPtr<PostProcessingModel<CloudType> >
+            return autoPtr<CloudFunctionObject<CloudType> >
             (
                 new PatchPostProcessing<CloudType>(*this)
             );
@@ -120,10 +120,10 @@ public:
 
         // Evaluation
 
-            //- Gather post-processing info on patch
+            //- Post-patch hook
             virtual void postPatch(const parcelType& p, const label patchI);
 
-            //- Gather particle data when hit face - not used
+            //- Post-face hook
             virtual void postFace(const parcelType& p);
 };
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessingI.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessingI.H
similarity index 100%
rename from src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessingI.H
rename to src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessingI.H
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
index 7808407cab86946cb322e1e15eefa92ac1461fa5..6326b4c2d853de0624f1a424d0f294b8e1aae6c6 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ Foam::label Foam::KinematicLookupTableInjection<CloudType>::parcelsToInject
 {
     if ((time0 >= 0.0) && (time0 < duration_))
     {
-        return round(injectorCells_.size()*(time1 - time0)*nParcelsPerSecond_);
+        return floor(injectorCells_.size()*(time1 - time0)*parcelsPerSecond_);
     }
     else
     {
@@ -78,7 +78,7 @@ Foam::KinematicLookupTableInjection<CloudType>::KinematicLookupTableInjection
     InjectionModel<CloudType>(dict, owner, typeName),
     inputFileName_(this->coeffDict().lookup("inputFile")),
     duration_(readScalar(this->coeffDict().lookup("duration"))),
-    nParcelsPerSecond_
+    parcelsPerSecond_
     (
         readScalar(this->coeffDict().lookup("parcelsPerSecond"))
     ),
@@ -132,7 +132,7 @@ Foam::KinematicLookupTableInjection<CloudType>::KinematicLookupTableInjection
     InjectionModel<CloudType>(im),
     inputFileName_(im.inputFileName_),
     duration_(im.duration_),
-    nParcelsPerSecond_(im.nParcelsPerSecond_),
+    parcelsPerSecond_(im.parcelsPerSecond_),
     injectors_(im.injectors_),
     injectorCells_(im.injectorCells_),
     injectorTetFaces_(im.injectorTetFaces_),
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
index 242797a12023c9820f096382740783d1b60bd87a..86038d90cf9db62d650642d09e723a993890a0b4 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
@@ -76,7 +76,7 @@ class KinematicLookupTableInjection
         const scalar duration_;
 
         //- Number of parcels per injector - common to all injection sources
-        const label nParcelsPerSecond_;
+        const scalar parcelsPerSecond_;
 
         //- List of injectors
         kinematicParcelInjectionDataIOList injectors_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.C b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.C
deleted file mode 100644
index c00cbc4c0ffbe6cc4984f2e4abc7d0a7a7b5f00f..0000000000000000000000000000000000000000
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.C
+++ /dev/null
@@ -1,97 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "NoPostProcessing.H"
-
-// * * * * * * * * * * * * * protected Member Functions  * * * * * * * * * * //
-
-template<class CloudType>
-void Foam::NoPostProcessing<CloudType>::write()
-{
-    // do nothing
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class CloudType>
-Foam::NoPostProcessing<CloudType>::NoPostProcessing
-(
-    const dictionary&,
-    CloudType& owner
-)
-:
-    PostProcessingModel<CloudType>(owner)
-{}
-
-
-template<class CloudType>
-Foam::NoPostProcessing<CloudType>::NoPostProcessing
-(
-    const NoPostProcessing<CloudType>& ppm
-)
-:
-    PostProcessingModel<CloudType>(ppm.owner_)
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-template<class CloudType>
-Foam::NoPostProcessing<CloudType>::~NoPostProcessing()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class CloudType>
-bool Foam::NoPostProcessing<CloudType>::active() const
-{
-    return false;
-}
-
-
-template<class CloudType>
-void Foam::NoPostProcessing<CloudType>::postPatch
-(
-    const typename CloudType::parcelType&,
-    const label
-)
-{
-    // do nothing
-}
-
-
-template<class CloudType>
-void Foam::NoPostProcessing<CloudType>::postFace
-(
-    const typename CloudType::parcelType&
-)
-{
-    // do nothing
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
index 761ce13fcc5782e973959e395fec47ada2680e10..39d1fe6096d04a437d16bd825c9b11357727c3b4 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ Foam::label Foam::ReactingLookupTableInjection<CloudType>::parcelsToInject
 {
     if ((time0 >= 0.0) && (time0 < duration_))
     {
-        return round(injectorCells_.size()*(time1 - time0)*nParcelsPerSecond_);
+        return floor(injectorCells_.size()*(time1 - time0)*parcelsPerSecond_);
     }
     else
     {
@@ -77,7 +77,7 @@ Foam::ReactingLookupTableInjection<CloudType>::ReactingLookupTableInjection
     InjectionModel<CloudType>(dict, owner, typeName),
     inputFileName_(this->coeffDict().lookup("inputFile")),
     duration_(readScalar(this->coeffDict().lookup("duration"))),
-    nParcelsPerSecond_
+    parcelsPerSecond_
     (
         readScalar(this->coeffDict().lookup("parcelsPerSecond"))
     ),
@@ -131,7 +131,7 @@ Foam::ReactingLookupTableInjection<CloudType>::ReactingLookupTableInjection
     InjectionModel<CloudType>(im),
     inputFileName_(im.inputFileName_),
     duration_(im.duration_),
-    nParcelsPerSecond_(im.nParcelsPerSecond_),
+    parcelsPerSecond_(im.parcelsPerSecond_),
     injectors_(im.injectors_),
     injectorCells_(im.injectorCells_),
     injectorTetFaces_(im.injectorTetFaces_),
diff --git a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
index d132886b1acd384677bc751dff1a740f82c54436..955ab3c7d8233e07b1eb06ec20d986056edfaf66 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
@@ -79,7 +79,7 @@ class ReactingLookupTableInjection
         const scalar duration_;
 
         //- Number of parcels per injector - common to all injection sources
-        const label nParcelsPerSecond_;
+        const scalar parcelsPerSecond_;
 
         //- List of injectors
         reactingParcelInjectionDataIOList injectors_;
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
index 60c394e6a6f21930f0dc69021e7b1ce2fcc3b5cf..ea2edafce982a3cbd731408163a00143808d8bf4 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
@@ -194,6 +194,7 @@ void Foam::LiquidEvaporation<CloudType>::calculate
     }
 }
 
+
 template<class CloudType>
 Foam::scalar Foam::LiquidEvaporation<CloudType>::dh
 (
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
index caf3acff4bd9f8c685ed968b4d42e4d3ccc8f265..fd7839b331e87ef0ff64775dfa49f6df10bbdd82 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ Foam::ReactingMultiphaseLookupTableInjection<CloudType>::parcelsToInject
 {
     if ((time0 >= 0.0) && (time0 < duration_))
     {
-        return round(injectorCells_.size()*(time1 - time0)*nParcelsPerSecond_);
+        return floor(injectorCells_.size()*(time1 - time0)*parcelsPerSecond_);
     }
     else
     {
@@ -80,7 +80,7 @@ ReactingMultiphaseLookupTableInjection
     InjectionModel<CloudType>(dict, owner, typeName),
     inputFileName_(this->coeffDict().lookup("inputFile")),
     duration_(readScalar(this->coeffDict().lookup("duration"))),
-    nParcelsPerSecond_
+    parcelsPerSecond_
     (
         readScalar(this->coeffDict().lookup("parcelsPerSecond"))
     ),
@@ -135,7 +135,7 @@ ReactingMultiphaseLookupTableInjection
     InjectionModel<CloudType>(im),
     inputFileName_(im.inputFileName_),
     duration_(im.duration_),
-    nParcelsPerSecond_(im.nParcelsPerSecond_),
+    parcelsPerSecond_(im.parcelsPerSecond_),
     injectors_(im.injectors_),
     injectorCells_(im.injectorCells_),
     injectorTetFaces_(im.injectorTetFaces_),
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
index 00c8c187343d04500983b6041f409edc00328ff3..3ed279fd30217ca423ccc580b0f0a271f77e4ff5 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
@@ -82,7 +82,7 @@ class ReactingMultiphaseLookupTableInjection
         const scalar duration_;
 
         //- Number of parcels per injector - common to all injection sources
-        const label nParcelsPerSecond_;
+        const scalar parcelsPerSecond_;
 
         //- List of injectors
         reactingMultiphaseParcelInjectionDataIOList injectors_;
diff --git a/src/lagrangian/intermediate/submodels/SubModelBase.C b/src/lagrangian/intermediate/submodels/SubModelBase.C
index 4e447c39ddca046386a42cab534058133b0808e5..527342d17431d609307997a6aeb107fbd03b13db 100644
--- a/src/lagrangian/intermediate/submodels/SubModelBase.C
+++ b/src/lagrangian/intermediate/submodels/SubModelBase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,12 +41,13 @@ Foam::SubModelBase<CloudType>::SubModelBase
 (
     CloudType& owner,
     const dictionary& dict,
-    const word& name
+    const word& name,
+    const word& dictExt
 )
 :
     owner_(owner),
     dict_(dict),
-    coeffDict_(dict.subDict(name + "Coeffs"))
+    coeffDict_(dict.subDict(name + dictExt))
 {}
 
 
diff --git a/src/lagrangian/intermediate/submodels/SubModelBase.H b/src/lagrangian/intermediate/submodels/SubModelBase.H
index f9319d975a2b7e15b6cbc65367f39e6554dbdcfe..d5cc8a53bdb63920f34b1881b922b4029e1a6d07 100644
--- a/src/lagrangian/intermediate/submodels/SubModelBase.H
+++ b/src/lagrangian/intermediate/submodels/SubModelBase.H
@@ -80,7 +80,8 @@ public:
         (
             CloudType& owner,
             const dictionary& dict,
-            const word& name
+            const word& name,
+            const word& dictExt = "Coeffs"
         );
 
         //- Construct as copy
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
index 5a4df7d0b38ca3003bbe72f3c3fbd1825d6363e9..8a59b2ec0dcd333d1b14c12d296dbbc13940e1f7 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ Foam::label Foam::ThermoLookupTableInjection<CloudType>::parcelsToInject
 {
     if ((time0 >= 0.0) && (time0 < duration_))
     {
-        return round(injectorCells_.size()*(time1 - time0)*nParcelsPerSecond_);
+        return floor(injectorCells_.size()*(time1 - time0)*parcelsPerSecond_);
     }
     else
     {
@@ -78,7 +78,7 @@ Foam::ThermoLookupTableInjection<CloudType>::ThermoLookupTableInjection
     InjectionModel<CloudType>(dict, owner, typeName),
     inputFileName_(this->coeffDict().lookup("inputFile")),
     duration_(readScalar(this->coeffDict().lookup("duration"))),
-    nParcelsPerSecond_
+    parcelsPerSecond_
     (
         readScalar(this->coeffDict().lookup("parcelsPerSecond"))
     ),
@@ -132,7 +132,7 @@ Foam::ThermoLookupTableInjection<CloudType>::ThermoLookupTableInjection
     InjectionModel<CloudType>(im),
     inputFileName_(im.inputFileName_),
     duration_(im.duration_),
-    nParcelsPerSecond_(im.nParcelsPerSecond_),
+    parcelsPerSecond_(im.parcelsPerSecond_),
     injectors_(im.injectors_),
     injectorCells_(im.injectorCells_),
     injectorTetFaces_(im.injectorTetFaces_),
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
index d3d5dfb9292747799273458cf6445daf208910ef..f9753b2a307a9f3c4a4eee3099b774083cb06d51 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
@@ -78,7 +78,7 @@ class ThermoLookupTableInjection
         const scalar duration_;
 
         //- Number of parcels per injector - common to all injection sources
-        const label nParcelsPerSecond_;
+        const scalar parcelsPerSecond_;
 
         //- List of injectors
         kinematicParcelInjectionDataIOList injectors_;
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
index 541e9831556c32be4f3b5d4a212f6f904e2f1b4b..cfa6b785ca525815ff562d1398e9dcf73940261e 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
@@ -467,7 +467,7 @@ void Foam::ThermoSurfaceFilm<CloudType>::splashInteraction
 
         // Apply correction to velocity for 2-D cases
         meshTools::constrainDirection(mesh, mesh.solutionD(), pPtr->U());
-Info<< "NEW PARTICLE: " << *pPtr << endl;
+
         // Add the new parcel
         this->owner().addParticle(pPtr);
 
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
index 0227234822643be09b1430bc3acea0e1dedfc964..e357dbba655decc10a3046a596725fc1b2b6d0f1 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*----------------------------------------------------------------------------*/
 
diff --git a/src/parallel/decompose/Allwmake b/src/parallel/decompose/Allwmake
index 38898b1ea310da0649bd9918ff1a42a894e2648b..cded295a7e274c66c4c11769013d0957e9beb42d 100755
--- a/src/parallel/decompose/Allwmake
+++ b/src/parallel/decompose/Allwmake
@@ -3,8 +3,7 @@ cd ${0%/*} || exit 1    # run from this directory
 makeType=${1:-libso}
 
 # get SCOTCH_VERSION, SCOTCH_ARCH_PATH
-settings=`$WM_PROJECT_DIR/bin/foamEtcFile apps/scotch/bashrc`
-if [ -f "$settings" ]
+if settings=`$WM_PROJECT_DIR/bin/foamEtcFile apps/scotch/bashrc`
 then
     . $settings
     echo "using SCOTCH_ARCH_PATH=$SCOTCH_ARCH_PATH"
@@ -13,21 +12,45 @@ else
     echo "Error: no apps/scotch/bashrc settings"
     echo
 fi
+
+
+#
+# define how to create an mpi-versioned library of $makeType
+# compile into qualified directory
+# use sentinel file to handle version changes
+#
+wmakeMpiLib()
+{
+    set +x
+    for libName
+    do
+    (
+        WM_OPTIONS="$WM_OPTIONS$WM_MPLIB"
+        whichmpi="$libName/Make/$WM_OPTIONS/using:$FOAM_MPI"
+        whichscotch="$libName/Make/$WM_OPTIONS/using:$SCOTCH_VERSION"
+        [ -e "$whichmpi" -a -e "$whichscotch" ] || wclean $libName
+        echo "wmake $makeType $libName"
+        wmake $makeType $libName
+        touch "$whichmpi" "$whichscotch"
+    )
+    done
+    set -x
+}
+
 set -x
 
 wmakeLnInclude decompositionMethods
 
-wmake $makeType scotchDecomp
-
-if [ -d "$FOAM_LIBBIN/$FOAM_MPI" ]
+if [ -n "$SCOTCH_ARCH_PATH" ]
 then
-(
-    WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB
-    wmake $makeType ptscotchDecomp
-)
+    wmake $makeType scotchDecomp
+    [ -d "$FOAM_LIBBIN/$FOAM_MPI" ] && wmakeMpiLib ptscotchDecomp
+else
+    echo
+    echo "Skipping scotchDecomp (ptscotchDecomp)"
+    echo
 fi
 
 wmake $makeType decompositionMethods
 
-
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/parallel/decompose/scotchDecomp/Make/options b/src/parallel/decompose/scotchDecomp/Make/options
index a198db40af8be9f9ca1d982920b3c2003f2822bc..b2f7015e2468f922d206bb5aae2fd650906c85d7 100644
--- a/src/parallel/decompose/scotchDecomp/Make/options
+++ b/src/parallel/decompose/scotchDecomp/Make/options
@@ -1,6 +1,7 @@
-# Note including of mplib compilation rules. This
-# is purely to avoid scotch.h including mpicxx.h
-# which causes problems.
+/*
+ * Note including of mplib compilation rules.
+ * This is purely to avoid scotch.h including mpicxx.h, which causes problems.
+ */
 sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
 sinclude $(RULES)/mplib$(WM_MPLIB)
 
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/IOwriteRegisteredObject.H b/src/postProcessing/functionObjects/IO/writeRegisteredObject/IOwriteRegisteredObject.H
index cd41cc4f0abf71a773a17ee2cdbbeb73c62089e6..d1d8427829ade5543ab0396c75f38f333d372513 100644
--- a/src/postProcessing/functionObjects/IO/writeRegisteredObject/IOwriteRegisteredObject.H
+++ b/src/postProcessing/functionObjects/IO/writeRegisteredObject/IOwriteRegisteredObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C
index c05f140c0ac246acc0b9ed756a8edfc1b3e3de79..ab24cecb1a3a4e7ab19f49c735b1fb8ef7371bfc 100644
--- a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C
+++ b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H
index df31d87734e45b982269c29d9e1e9d333148c32c..9a65acea9d00c9f1e5fc5b81dc13c8dd619a56ca 100644
--- a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H
+++ b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObjectFunctionObject.C b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObjectFunctionObject.C
index a00fe321176b3cf8247b7793508381ff98ba4edd..6b6180b3b4adabe3fcd435f22ccf109d806900a2 100644
--- a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObjectFunctionObject.C
+++ b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObjectFunctionObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObjectFunctionObject.H b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObjectFunctionObject.H
index 08364ff19a9fa813d220ea4c333993c92f7a4ea3..3b7721968030da2d095f74cba27fee19bc56d947 100644
--- a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObjectFunctionObject.H
+++ b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObjectFunctionObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/IOFieldAverage.H b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/IOFieldAverage.H
index be432b7ec3c1394331b0e275408582d74bec8527..e252ce589ff6245bc405bb8ec24a54972f5a7b3a 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/IOFieldAverage.H
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/IOFieldAverage.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
index 1bf2b82e2cf75c6326a680a56f8a47335999a084..9a99d8e30d0aac1f80df439a0aef4e4001ac841f 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
index 72f71391dd021de2466ade6803ec1b8f698a77df..ed90da9b1b7a0c36669a3a02013c158ac92c21a6 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C
index 4f20269a7872618873a15dac362924ef30629084..95b503a7b88b0432d10d255feeddfc2a8a3b1aa1 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.C b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.C
index 266599d7c1e679ee90826ca326f1ef484544e6c9..c7b920389b2678dda50272bb4647a6014bbb39db 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.C
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.H b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.H
index f80f6d05135f5e4e0e6784dd86c022c432fa9027..e87dceff81d75d4df5f9c545bded8b9b94c4bef8 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.H
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageFunctionObject/fieldAverageFunctionObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C
index 32af6b201b33aa6f7011159295f42a5592efee67..61c0e759593319c5953c0513600f9dca1b736731 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
index 2251a4fa225763f904d690a9c1b537882a7829da..0c4aee6cff8959670782263f95ca65aa817494d8 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C
index 1b9e2bf1e7188a2fd6eef5681f9697c4b3249126..30f4d87027ead8a00cc8af349ddc6cb5c399b0bc 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLine.C b/src/postProcessing/functionObjects/field/streamLine/streamLine.C
index 52dd5288af6626de79a4bd427688497a4514517c..6727ce3dc526894828075634fd06cda13fe47676 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLine.C
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLine.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLine.H b/src/postProcessing/functionObjects/field/streamLine/streamLine.H
index a46a60b5fcca1c51fef2d87ddf9c01f1647143e2..f09ebd9b61b40d27f2472bd7c2cb1b0d51c46f42 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLine.H
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLine.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLineFunctionObject.C b/src/postProcessing/functionObjects/field/streamLine/streamLineFunctionObject.C
index e41a4737ed0a7b847fb0db906410cf59b48fb547..43c724866853c83022bc2db2cc8a02a92f9d871b 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLineFunctionObject.C
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLineFunctionObject.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLineFunctionObject.H b/src/postProcessing/functionObjects/field/streamLine/streamLineFunctionObject.H
index 429dc0cf6ef237aed1ef1c5c0d094d4c39daf156..c434f5fc6327fcad7bfb7083865fce8268ff9846 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLineFunctionObject.H
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLineFunctionObject.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
index f441b12bb7b2a6fc0fcc57505dd9e30172963cfe..c02683f8fada8ec700a37ba6a90eaffef6dcd447 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.H b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.H
index 6a4d944d1e6b970e0caa5ccb1c43693ff3665e16..ea89003f42b7c17fbb8bc2985557ceba92904d3c 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.H
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLineParticleCloud.C b/src/postProcessing/functionObjects/field/streamLine/streamLineParticleCloud.C
index f560108574ebddd3d0c3d13a8cf1a0555e64f28d..89194b1ea35df46551dce80528dfd94b7ec072a1 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLineParticleCloud.C
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLineParticleCloud.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLineParticleCloud.H b/src/postProcessing/functionObjects/field/streamLine/streamLineParticleCloud.H
index 644f5e8bbc40f14768856c01e7a622c5f91715dc..76b3f82bf3cb8cd495c39290b134c69511fbe3ae 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLineParticleCloud.H
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLineParticleCloud.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
index 7885ea1caa14f11b82ab0a2281c98a3adba26158..c001027d461a190633b440732d59d58aff768ffa 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.H
index dda446904af8db962db3889d7f124ef53bf85123..a5ef16c5110db172b9632fee39b934bf2f482e3e 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.C
index 528c64d18f319cefccf78d7ed292c85a697b6d8d..081f6a84e6fb013d5156cd7446d2d57acfae601c 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.H
index 439cc97c72ecd76fb86592b82b8cc1ae879e23ac..20ab5ee090006dab9a95e6909ff7d1969dde0fee 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.C
index 25825f2240b7a9fc145e25d7f1aa8ac94661b2f5..ce75638064f75d56bd2cf878775ee554bd6945c6 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.H
index 131b0ee3607ddae63a8c17b5e5d19cddb7acf22b..df64634a7416c69348adb1698c271533e4533419 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.C
index 61b278bf85c658528ac803c3bd0a3531f7beb1e9..9145e54e7f522ccb7c9574ef6fae5b776aec4132 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.H
index 8ae7358706dca666dd75f89d4e4ba23dad63742d..ccf9e5191d2fefaa57274f01924cd8f0850e12ab 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.C
index fbe31fddc359d501db12e7513442d60c37583b22..cb545efff77c4ffcf161204e00ac2f29817813a4 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.H
index c431653964139b63db0b57d10448304ca8ed86ab..15647e3a15c1fdc97cbdc5a86bc4611a9786bb61 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.C
index cfeac46c3de36e745a5791ad01cd17b927870c7f..b512538e2859405361c57341d962e313f9244fdc 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.H
index e6e848945460762e1998c903e9d2d8a9ce7d1fd8..de36a7714bc2d56259c0f7d026904a11e6cb3bc1 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.C
index 585f6c69a38234c68ba4791d1b8e1142404a7199..ec50b6567727d1aa274e80a3b13ee71b121600e8 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H
index 519aa216684d124576937c1db9fe35d174aaea25..051339706293a6201e2bcfa560dd99b5a05e0a1e 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraintNew.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraintNew.C
index 920ac93c9571a8e1f336eba8b2d67bd28731c86a..d5c774cb6e24e697d51d2ecf08cc67292de88f59 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraintNew.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraintNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C
index 0322954df0db71fddf0b8542ea14749b94835a25..7a045c04d47d4b26cc5f9b1ec396b8d4b0aed68d 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.H
index fc9c226f049a15ccf29ccd68db6f893eaabe6cc0..15b2c30ee56dcb12f468d4639868158788fbc963 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.C
index 24c3209b922e4c8decbcf73bdb7b1764cf948be8..0ef338b942581efba2b251b1e1f763c86678a6cc 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.H
index cef114aef52e1419bd964a466ed46974dae1b0cd..6e4425334fc0f5ab2b53813c808a914e9b2faf65 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.C
index 3a3530375400fa2d0bae1fd5ab437cdb095d01ec..43c1f90400385d30c905122f5a95416275ab148e 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.H
index e506f28a82e7ba1c39465c97df17e08d3382e538..ee7b72dbff921232d7720be895c3b9052f656dcd 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C
index 518b99d9613cd4424a6f655c51bfc9c7b8da076e..001dfb47e5a42b946702ca8f0dee4ab4aedda38f 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraintNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.C
index b8d9f0b3d1d6992f87884d47bcd503a5228c1d75..bec3087ff7344045d7c00cda5f54ddcf4124c9fb 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.H
index 1470c955365615421ee0a7761e519f9dd8c19973..5031f432b806a1cdbdd4a815b35de43bf81a6b4b 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
index 00a08fc7f25f7cee2cf3883eebca76f55d4acd4a..8581b3dd50dd0b1ba7722b15448b6a6f298336e7 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.H
index 4f48629ae23fbf9927bf917a6a4b8ad609577bd7..c1a320758151f9dd745f2631a000ad604b3104bf 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/regionModels/regionModel/regionModel/regionModel.C b/src/regionModels/regionModel/regionModel/regionModel.C
index e72ef348dbeffb84f21189e24f60e450082a1764..bd699e05ae5d9afcbd7f9532e3741291e13e902e 100644
--- a/src/regionModels/regionModel/regionModel/regionModel.C
+++ b/src/regionModels/regionModel/regionModel/regionModel.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/regionModel/regionModel/regionModel.H b/src/regionModels/regionModel/regionModel/regionModel.H
index ec5ad0c2b2fa8b5a552c837e60bc979d5da2d6ca..01300671d92814852ccee38ba2ba4cb10772ba22 100644
--- a/src/regionModels/regionModel/regionModel/regionModel.H
+++ b/src/regionModels/regionModel/regionModel/regionModel.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::regionModel
diff --git a/src/regionModels/regionModel/regionModel/regionModelI.H b/src/regionModels/regionModel/regionModel/regionModelI.H
index f52e328462ffc5d10e1ebb7db025f574609dc930..d99b156bf645062512dc317976f2c0b88917ad84 100644
--- a/src/regionModels/regionModel/regionModel/regionModelI.H
+++ b/src/regionModels/regionModel/regionModel/regionModelI.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/regionModel/regionModel1D/regionModel1D.C b/src/regionModels/regionModel/regionModel1D/regionModel1D.C
index 033db12366227d82cae3345a872315ad87e19baa..3902a689a7676786414db1e9f4f6a10c840b4dca 100644
--- a/src/regionModels/regionModel/regionModel1D/regionModel1D.C
+++ b/src/regionModels/regionModel/regionModel1D/regionModel1D.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/regionModel/regionModel1D/regionModel1D.H b/src/regionModels/regionModel/regionModel1D/regionModel1D.H
index 55812aab2d7e8e51fdf7129796aecde4e8dc4eb2..7d51d3ef365794f4dcf8634e6d1ad44a2377af92 100644
--- a/src/regionModels/regionModel/regionModel1D/regionModel1D.H
+++ b/src/regionModels/regionModel/regionModel1D/regionModel1D.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::regionModel1D
diff --git a/src/regionModels/regionModel/regionModel1D/regionModel1DI.H b/src/regionModels/regionModel/regionModel1D/regionModel1DI.H
index a115fdf4561637847a51ac0fc756a51b93eae387..13abf046cfce56c880b9c7ce02302872a6d8c61d 100644
--- a/src/regionModels/regionModel/regionModel1D/regionModel1DI.H
+++ b/src/regionModels/regionModel/regionModel1D/regionModel1DI.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C
index 91dbaba9ebd4e4037cad2731763c901ca77d3661..c1ba8d5e823c58e9baeaaff08be1290a75d33d5f 100644
--- a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C
+++ b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.H b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.H
index d217ee291d909d8b2ad39afdabd0af382e0ad2ba..996590a55d560499660f63139236f64bf4b7541e 100644
--- a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.H
+++ b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::singleLayerRegion
diff --git a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegionTemplates.C b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegionTemplates.C
index a10fd0c8bbf6ad1091daa37f36586657c0f48add..92c9df812d9a238ea3f4a4e11fc2bfd18fa2cea6 100644
--- a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegionTemplates.C
+++ b/src/regionModels/regionModel/singleLayerRegion/singleLayerRegionTemplates.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C
index df4922f7acde4704ca21d22cc10c4829074e775e..f16ee4913646c44ae00368a152a30f194bb8b596 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.H b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.H
index 938f03d38a326252c5a96ddf2fec330d4c830e44..f13cd133c958e9e3efdb726b444b614979c55192 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.H
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::filmHeightInletVelocityFvPatchVectorField
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
index 2dbbe9b4fb8d2115a76556ce953a3832431ee75c..5de27415613f39a44fef3b5b3df62fbcc3bcfbdc 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.H b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.H
index 462ad9afbc8a00ee5a6455a269f9422ebcc48e79..29861cacad9a6bf1c983b18745d6408493cce368 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.H
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::compressible::RASModels::alphatFilmWallFunctionFvPatchScalarField
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index 81bc701c4ed71daec07cb3618cced34cb9d649a6..cecacd2dfb046dd01b53eb54be9e7c1a914c45ad 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H
index f59bc649e96db2fe27389108671bf3946593079b..765f617719d3721dc2e81fd6dc95680bfeba100c 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::kinematicSingleLayer
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H
index d3b6a54178900a176ec6e8ecc3a2ac1b566f0db9..1777984af2435e18d8f698487a5c436452b98756 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerTemplates.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerTemplates.C
index e5ae5ffd8fe91229f7e2dc535570b17dc7ce39ff..c1fb50103d6fed52f4fb0d5b03fc22dfddecbb3b 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerTemplates.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerTemplates.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/noFilm/noFilm.C b/src/regionModels/surfaceFilmModels/noFilm/noFilm.C
index e1bde38bf14b73f2e1ddf8939146c03ecdf5c5c6..26bad8f390e7d450b9c68c29afdd0baf27164c4c 100644
--- a/src/regionModels/surfaceFilmModels/noFilm/noFilm.C
+++ b/src/regionModels/surfaceFilmModels/noFilm/noFilm.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/noFilm/noFilm.H b/src/regionModels/surfaceFilmModels/noFilm/noFilm.H
index 0c3627beb48a73f0e5c946331c44d7819e580f9b..698e3bbc790485f3b0fab3b461e0a8c9329ad2fb 100644
--- a/src/regionModels/surfaceFilmModels/noFilm/noFilm.H
+++ b/src/regionModels/surfaceFilmModels/noFilm/noFilm.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::noFilm
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
index e2aaa98cd2ed2e4e4b056821c66b1cc51701ec16..8a2d2f4d376fdd5bf898204daee97b1d37fcb714 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.H
index 8ac0c10619c793173ca4fbb492bb2a542e011354..0e0998d80e584af9cb6828c83e8b3fef7b6acdf2 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::curvatureSeparation
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.C
index 026eb573f6c9144ec6104935aed24b69e0645a65..ddc9de60d3f16a3350f0fb4f173295ab4c4d2f54 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.H
index 2181c121aa552269d361f1b50e8be7ff1a41c49c..64b63b3839093b2953841e4df3acb4afc3cb7f85 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::drippingInjection
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.C
index d167131d6e9fdab221f8375c5861af610a15b1d2..44ab87f99d7e088d14f96cbd2a5aef1addb4409b 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.H
index 401a3dee0ffa8577c669d28442f404161748026c..6252a9e7c105bde8284c4586a42694bde0193ab8 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::injectionModel
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C
index 79c908b3db193e00f969f90c38529ba087145ccd..a077d7edd18feed20c382bb2cef62c243db9d724 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.C
index 57f7ae0686c4e0ccb0c1c900b2f0d7e4ba76b062..1d55ae65813e41f6f74379564a2115aac7167ed4 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.H
index 3aaac5f28a7e6f19ff0b887f0148bed74d9d012e..8d54f6be68d3a6ce1d46a7bcde438202741ffe75 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::injectionModelList
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/removeInjection/removeInjection.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/removeInjection/removeInjection.C
index 04360618ef9f6ce00d76ac6f15062082e886ffe4..d226be929cdaa6c94cf512f6440353db59871337 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/removeInjection/removeInjection.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/removeInjection/removeInjection.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/removeInjection/removeInjection.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/removeInjection/removeInjection.H
index 500d06ce890838918ef4c758d6323c7ceafe7008..b2acc436d00fda2b4ba7d677067edb60c010441a 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/removeInjection/removeInjection.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/removeInjection/removeInjection.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::removeInjection
diff --git a/src/regionModels/surfaceFilmModels/submodels/subModelBase.C b/src/regionModels/surfaceFilmModels/submodels/subModelBase.C
index 176bfae777dc377e36f86ae5dffe0f33989d05bd..988e2c5bf04ecc010956afb87ff0d0889c286698 100644
--- a/src/regionModels/surfaceFilmModels/submodels/subModelBase.C
+++ b/src/regionModels/surfaceFilmModels/submodels/subModelBase.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/subModelBase.H b/src/regionModels/surfaceFilmModels/submodels/subModelBase.H
index 715f9405c0e9e074405034cf9bcab0927f2d1c84..7322ec6c5ec5bff95f9ebf606d356860e35e73b4 100644
--- a/src/regionModels/surfaceFilmModels/submodels/subModelBase.H
+++ b/src/regionModels/surfaceFilmModels/submodels/subModelBase.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::subModelBase
diff --git a/src/regionModels/surfaceFilmModels/submodels/subModelBaseI.H b/src/regionModels/surfaceFilmModels/submodels/subModelBaseI.H
index 67551e42f53e856e0271afa0759781c8bf89489c..684c0e9ccb538975b69d0320a456a663cc3a3639 100644
--- a/src/regionModels/surfaceFilmModels/submodels/subModelBaseI.H
+++ b/src/regionModels/surfaceFilmModels/submodels/subModelBaseI.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.C
index ba49b4c5de44741cda1d2698850b80a23db3268d..1d7ff7f86c93d9c6329004cf15273df64b728e27 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.H
index df0ba02e55a8c0286d2f0dd56495e7aa30384469..097d538da87efd1df9a70ec5f6a5dbe9bf1fc2a8 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::filmRadiationModel
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C
index 88b8d422e1869814fcd52f31f3b6d32db2c95dda..7473bddfa649dc4bd61fa693479c406cfe90c559 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C
index c55348259ede0a7d1e1c8c5f2c3beee53eee9e9e..3c757681886e559eea5c503cb59113f16518b7d3 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.H
index 91b9cf6b752f98407f69297f4763e673054b5fcd..3ce5479f4d698327f5f2bf2c3068fb54c2b4b552 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::noRadiation
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
index 8d6fb7937fb75857d4b459e56d308d28969fac8f..ee1dba62ed46a19758abeca149e6a9a5aaf6dd70 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H
index c14314783dab7b958ae448cc2132913fd5aff240..127244068b7717cabcd9e8a666a9ab5847d212c6 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::standardRadiation
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C
index e4bd24203b723f5e7474dd05d63d196de797c2e3..dda1b20dd57b28bd046451ef7acd199940e80ea5 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.H b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.H
index 9844dc974c9928bce38243c2f8276d515138b1fe..c336214a7c0a5bd89f9f3a1c546bb1b17c4eb4b4 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::constantHeatTransfer
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.C b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.C
index ff2c79ecefb3ee6e8770ecea9687845c3ba4d06b..f752d629e3eb8625ee46cfa8e0adeb336b89c74c 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H
index 8b92fc7e708c7a624d65194911d6f3cd1b08f296..3d92cfaff28bb79e962ea54c2428d1a64d78c6a2 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::heatTransferModel
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C
index 89b438a72082f658209f1fd6ab8aa45c347db6b9..d277b56621e49a67bc848ef78a157b5915667105 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.C b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.C
index 5aa7533e5e2ac97c2fb0ff7f58250c084ea0b85f..965b4d9e68c638bb47758553df2651aece2e45c3 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.H b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.H
index 2d1f84f4042651bad64265fba791d2d9e9bc21ad..f9da3375ea7cecd0d12030bbe19fe7c091910a59 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::mappedConvectiveHeatTransfer
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C
index b7736dec1d2063b8c1c69c4647f9f2b0ca24a56a..485ba130bb991a3bb9f732a0556d2c2cde457e0d 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H
index 6108de35bbc8cda39f9f79289e836497e48bb244..1c29a1540f092097cb34be7fd49c169c40493cb8 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::noPhaseChange
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C
index 5ab27c47bf264c71f1ed6650a8703abf91b17761..5fc24ef5f00da9c99548f3e5f4027258da01e74a 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.H b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.H
index b537cf59d7938619f4703f55b07a7ee8c5c9aeca..1212def980bfda1932f1489b15024f24ae623bee 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::phaseChangeModel
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C
index 3a72593e513c07e21ebb8dd776b034640326105d..2b0328bdbeb7ed378a8cfd269a9f7c12572ecabb 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
index 47246b42653e99b5ec5fdac504dae943fd6035d3..b9285a3c881acb7aac1cb2a3e09f3793339bec26 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H
index 3d0c07a54871d7176fe3f6683fb26a574e154565..613e2da18f5c3c8e45f8f0d772887d4c985640e4 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::standardPhaseChange
diff --git a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.C b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.C
index 7433ecf5050998668b46e3ceeeb4b3da297014f3..bfded1d8fae5da31ffdd38331cc0751961ef1124 100644
--- a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.C
+++ b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H
index 8a0f01b6b6dcab3321160f6cf11fa5950ce56722..1e26c9db9c8ab16e9acff145ae93c06b865b2b75 100644
--- a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H
+++ b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::surfaceFilmModel
diff --git a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModelI.H b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModelI.H
index 3e5fdacdbee9c75c577fca120b951e691ea67278..0ba34413df63044b0ed9eca7e223137f14190127 100644
--- a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModelI.H
+++ b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModelI.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModelNew.C b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModelNew.C
index 03ee38a4d5f2497aa2b170a34a7b16aa47675447..fb61f65efb553181395ecd681221970fc1ec15cc 100644
--- a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModelNew.C
+++ b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModelNew.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
index e6ce90d3af1e3c520a50c2e6c54160305c7125aa..9a6ddee82b4244d3c440c0ded967d66427948b4f 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
@@ -273,15 +272,12 @@ void thermoSingleLayer::solveEnergy()
 
     updateSurfaceTemperatures();
 
-    dimensionedScalar hs0("SMALL", hs_.dimensions(), SMALL);
-
     solve
     (
         fvm::ddt(deltaRho_, hs_)
       + fvm::div(phi_, hs_)
      ==
-//      - hsSp_
-      - fvm::Sp(hsSp_/(hs_ + hs0), hs_)
+      - hsSp_
       + q(hs_)
       + radiation_->Shs()
       - fvm::SuSp(rhoSp_, hs_)
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
index a2788f7128e5687466bfac3eaa31dae951bd33cb..19c9560c7c06bf2776dc7d29506dfca581380c60 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::thermoSingleLayer
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H
index 493b1f31b44e70ba3a901fdc3c289891da74e0be..0b2b1b1021e90ab328e214bb737c9aaaddddcbf4 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/sampling/graphField/writeCellGraph.C b/src/sampling/graphField/writeCellGraph.C
index e502eccf2434dd9310c01c1bd9c17f5b6d93304f..740e3172cd64e5bfcb6988b3ba29316a2d498d49 100644
--- a/src/sampling/graphField/writeCellGraph.C
+++ b/src/sampling/graphField/writeCellGraph.C
@@ -16,6 +16,9 @@ void writeCellGraph
     const word& graphFormat
 )
 {
+    fileName path(vsf.time().path()/"graphs"/vsf.time().timeName());
+    mkDir(path);
+
     graph
     (
         vsf.name(),
@@ -23,7 +26,7 @@ void writeCellGraph
         vsf.name(),
         vsf.mesh().C().internalField().component(vector::X),
         vsf.internalField()
-    ).write(vsf.time().timePath()/vsf.name(), graphFormat);
+    ).write(path/vsf.name(), graphFormat);
 }
 
 
diff --git a/src/sampling/sampledSet/writers/csv/csvSetWriter.C b/src/sampling/sampledSet/writers/csv/csvSetWriter.C
index c0b0b694ed7d94a9788f9c71c366b176e461a319..a10205762680c60f46363723b5d52367841ad5c8 100644
--- a/src/sampling/sampledSet/writers/csv/csvSetWriter.C
+++ b/src/sampling/sampledSet/writers/csv/csvSetWriter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSet/writers/csv/csvSetWriter.H b/src/sampling/sampledSet/writers/csv/csvSetWriter.H
index 04987fea2a5ea24a85629937dd48be7e1cf89bf2..1bbff35435f85070aca4cc85d301017d6e858f2b 100644
--- a/src/sampling/sampledSet/writers/csv/csvSetWriter.H
+++ b/src/sampling/sampledSet/writers/csv/csvSetWriter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,6 +25,7 @@ Class
     Foam::csvSetWriter
 
 Description
+    Write set in csv format
 
 SourceFiles
     csvSetWriter.C
@@ -57,10 +58,12 @@ class csvSetWriter
 
         void writeHeader(const coordSet&, const wordList&, Ostream&) const;
 
+
 protected:
 
     virtual void writeSeparator(Ostream&) const;
 
+
 public:
 
     //- Runtime type information
@@ -74,8 +77,7 @@ public:
 
 
     //- Destructor
-
-        virtual ~csvSetWriter();
+    virtual ~csvSetWriter();
 
 
     // Member Functions
diff --git a/src/sampling/sampledSet/writers/csv/csvSetWriterRunTime.C b/src/sampling/sampledSet/writers/csv/csvSetWriterRunTime.C
index 2c22b5f227b070c83f2628756c7bb21dab277ed1..5618e4abf3af0b9d1c0a556dff5a5b8ae6dbfd92 100644
--- a/src/sampling/sampledSet/writers/csv/csvSetWriterRunTime.C
+++ b/src/sampling/sampledSet/writers/csv/csvSetWriterRunTime.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/sampledSet/writers/writer.H b/src/sampling/sampledSet/writers/writer.H
index 6fb810dc1f4b72a1d03b5aae6e95c5f27b4e1d0a..c239312656ae7e328855e4e719a391aee201dbf6 100644
--- a/src/sampling/sampledSet/writers/writer.H
+++ b/src/sampling/sampledSet/writers/writer.H
@@ -110,6 +110,7 @@ protected:
     //- Writes a separator. Used by write functions.
     virtual void writeSeparator(Ostream& os) const;
 
+
 public:
 
     //- Runtime type information
diff --git a/src/thermophysicalModels/properties/solidProperties/C/C.C b/src/thermophysicalModels/properties/solidProperties/C/C.C
index 7a6b3137920dae394439033f9ff3400e32a86f7e..1888c39ba9fc97a7a8a115d6653ecd8f9dd51adc 100644
--- a/src/thermophysicalModels/properties/solidProperties/C/C.C
+++ b/src/thermophysicalModels/properties/solidProperties/C/C.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/properties/solidProperties/C/C.H b/src/thermophysicalModels/properties/solidProperties/C/C.H
index bd4b4364bcc3d2cc84e18bde999873dc5da51e28..37929de2c4ef1aa0e99cbba20e3518d988c756ed 100644
--- a/src/thermophysicalModels/properties/solidProperties/C/C.H
+++ b/src/thermophysicalModels/properties/solidProperties/C/C.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C b/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C
index f199c4e0e1314aa80f869e94fd41d82f3b1c3f7d..4726af5d2fb961dbc140d3e4e27f61dddf3a3d09 100644
--- a/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C
+++ b/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H b/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H
index fc47cd1d953f60ec348d8b35eed11e3dac5c1b0b..b57f68012cd6cff59413ce13f2771c5a8da1a462 100644
--- a/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H
+++ b/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/properties/solidProperties/ash/ash.C b/src/thermophysicalModels/properties/solidProperties/ash/ash.C
index 2ab7370ff713c5b816377417c7876b6c57aa9dde..71c48115cf01332abe24c059e0fd04bef767c974 100644
--- a/src/thermophysicalModels/properties/solidProperties/ash/ash.C
+++ b/src/thermophysicalModels/properties/solidProperties/ash/ash.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/properties/solidProperties/ash/ash.H b/src/thermophysicalModels/properties/solidProperties/ash/ash.H
index 796cc3b3d85b47159aafa2910259ce5956c26fe7..9883a208651a11793dab3227933c96ec8bd0726a 100644
--- a/src/thermophysicalModels/properties/solidProperties/ash/ash.H
+++ b/src/thermophysicalModels/properties/solidProperties/ash/ash.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C
index e3c0f8ed0eee10cf8452849336b0189c4d6e862d..8527387849ae519e2c55cdee9c9d59b60ee2e96e 100644
--- a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C
+++ b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H
index 7ed4e03f145f05338105551dd9a7174f917dfbc1..dc8fc4ae1df5da548cf79afbd4d6fb892f73b8e6 100644
--- a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H
+++ b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesI.H b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesI.H
index 252977569df167f12a3175a6b4c22107daa6f0ca..212324347fd384f19efffcf9fb114ad5eac8ed75 100644
--- a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesI.H
+++ b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C
index 9e2e0d675d3f1592bdebaa601e0b3cf82ec2745f..6c5dda662f72b0ee650a3003d6b1993d9e685d53 100644
--- a/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C
+++ b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.C
index 5e6fe645d3e6d10090728f912340a68ff28bd0a7..7d0017441e5228d091cd7e43b5c1b23d7fbffb6b 100644
--- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.H b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.H
index 35ed979edb899f1ac305bfb415db992022e3c75f..b45ea44f3fe7102c2f4289bbe5b23e821d7f23eb 100644
--- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.H
+++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C
index 903be3cf72c48aa560d379a0240c3958ddf12ba1..753d647f522fae860c697817ebd15dc9e95786f2 100644
--- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.H b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.H
index 3306420baa2c79475eefe7e338915b3da9faecb1..ddc91c4bd3cf6892b98af25a1be5a8b9e8b65b2b 100644
--- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.H
+++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiationModels/radiationModel/P1/P1.C b/src/thermophysicalModels/radiationModels/radiationModel/P1/P1.C
index 907ffc4566361f92b43a2a605a58bf6cdbf44653..31d0034ef6af12700d0c8d0eaa4582c6998875f6 100644
--- a/src/thermophysicalModels/radiationModels/radiationModel/P1/P1.C
+++ b/src/thermophysicalModels/radiationModels/radiationModel/P1/P1.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiationModels/radiationModel/P1/P1.H b/src/thermophysicalModels/radiationModels/radiationModel/P1/P1.H
index d06fb70b2f33f43ed58d21b6d4cb06467d685124..6aa1eaaefca2561e72323c8d2db60d27231463a3 100644
--- a/src/thermophysicalModels/radiationModels/radiationModel/P1/P1.H
+++ b/src/thermophysicalModels/radiationModels/radiationModel/P1/P1.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiationModels/radiationModel/noRadiation/noRadiation.C b/src/thermophysicalModels/radiationModels/radiationModel/noRadiation/noRadiation.C
index 045a420611bb80bc3fa25e8c5ecb4df0dca82f4b..1fadaf99d4aedf2122e4aabd816ca078fd3894bd 100644
--- a/src/thermophysicalModels/radiationModels/radiationModel/noRadiation/noRadiation.C
+++ b/src/thermophysicalModels/radiationModels/radiationModel/noRadiation/noRadiation.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiationModels/radiationModel/noRadiation/noRadiation.H b/src/thermophysicalModels/radiationModels/radiationModel/noRadiation/noRadiation.H
index f383a9912275edfcc5a6c2b34bdf9b0885f0a632..68f62ac891528adb6f65f5f90d5777e7c706bf24 100644
--- a/src/thermophysicalModels/radiationModels/radiationModel/noRadiation/noRadiation.H
+++ b/src/thermophysicalModels/radiationModels/radiationModel/noRadiation/noRadiation.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C
index 13fefd9bc9426cf2f0498ec2e44ec4ba67387ea6..ceeb9aeed498e6c2ee35a3921a40adcb151e4a6f 100644
--- a/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C
+++ b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.H b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.H
index 5af7733d16444d8c1307f5669c642275645afa57..b311496762cbff8ef20906be459b31de5d0b5cc6 100644
--- a/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.H
+++ b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModelNew.C b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModelNew.C
index 3c551651576b034d074dd182d4052ddb90567329..6a1fc6897632885d21ecaff59022b9bc1d409bf6 100644
--- a/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModelNew.C
+++ b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C
index 6f95a84b2f6569e04076084daaff996dd4c0566f..f17a1bd990295d317600c669b5e8957f3b29c494 100644
--- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C
+++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H
index d515c63d0fc71e7dae3694d6335835e34002eb71..60ac427e5d98c38d2ff3d79f2967beeeadbc2dee 100644
--- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H
+++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C
index 92a4f876a2b7c86b2f35e0feb8b43ca47c7406d0..a27a5ab3fc8b7cd2d2d8bfc26e34670b2a8542e4 100644
--- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C
+++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C
index 3ee2c15be359737a34ae37c0d4009f61ec56370d..6b318f10704878a2f889d4ac88a341e2dd124d73 100644
--- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H
index 9d2d437746c37e33527cc2de300505991e9e2474..b9b891ca4f88e131118935a67ed19da7aaa1625b 100644
--- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H
+++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C
index 1ecc37d589c11e3ea7e2a4043da7e5e92b36a48e..e1ebcf8e20cc8ad24a50c02629e033e1329a1dc6 100644
--- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H
index 34460e491ae2fa83aad6d8ae1d1ed7bdc16f18d2..5529e0d1b7e3e9e6acfb11bc51dd9c153b22ea37 100644
--- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H
+++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.C
index eeb2dff45f2a322310afa365a7a3b6ff4245f847..765508fa084dd77deab071b3af7057e275a1b745 100644
--- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H
index 1eacbda555e92331c6be2aad481a2b3e34e152b5..4aab371cd281eddbf274e205d629e32f3c2b2672 100644
--- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H
+++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiationModels/submodels/scatterModel/constantScatter/constantScatter.C b/src/thermophysicalModels/radiationModels/submodels/scatterModel/constantScatter/constantScatter.C
index f2ed95e128417da612a5869b625c9630799f437d..6001aeb40ce7c31f27ba20ea1e87ee13081b06b9 100644
--- a/src/thermophysicalModels/radiationModels/submodels/scatterModel/constantScatter/constantScatter.C
+++ b/src/thermophysicalModels/radiationModels/submodels/scatterModel/constantScatter/constantScatter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiationModels/submodels/scatterModel/constantScatter/constantScatter.H b/src/thermophysicalModels/radiationModels/submodels/scatterModel/constantScatter/constantScatter.H
index f508a979ab4e0ddb558bf5e81ae97adebbb272ce..4d1e3ba000607a3b56df3f2a972c80110111693e 100644
--- a/src/thermophysicalModels/radiationModels/submodels/scatterModel/constantScatter/constantScatter.H
+++ b/src/thermophysicalModels/radiationModels/submodels/scatterModel/constantScatter/constantScatter.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModel.C b/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModel.C
index 76641957ed1838631052c56c068c23067d740eb9..b3a7597727272d9eb72e53f94c1e6d460e290dc6 100644
--- a/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModel.C
+++ b/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModel.H b/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModel.H
index 128b68a45fb427ba81563e0b51a74c058017d744..c8a1a564bb67072196cb32dd398eaf5cd6e2b3d4 100644
--- a/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModel.H
+++ b/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModelNew.C b/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModelNew.C
index 8d10e0d07e2ef53c17de24b65d580bd3a9aaf2ca..79af5fce6a8e4819bab719f96afb01f4162d56fe 100644
--- a/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModelNew.C
+++ b/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModelNew.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRate.H
index c31e750de224bb4ecd866bbb8eabb41c8b07d774..ac8c922ac72525f74ac5101062af95dfd6f28f42 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRate.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRate.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::infiniteReactionRate
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRateI.H
index bfb09b32bf4d3f32aa0f663f0b5d7f3eed8dd62c..45f0fd02bd0e3c027082521971a6f37e67de50be 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRateI.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/htcConv/htcConvFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/htcConv/htcConvFvPatchScalarField.C
index b3b731a1d1c540a7700ce1cdcf82b1601ac5945c..dbc4def073dd9ca7601265ed6cb2c8760352fb45 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/htcConv/htcConvFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/htcConv/htcConvFvPatchScalarField.C
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/htcConv/htcConvFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/htcConv/htcConvFvPatchScalarField.H
index 05f569bfc19e5e0f05e7bdc319bed03e718b12a7..117c6300a4d68a391c0de2e0c5a02387a58ee081 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/htcConv/htcConvFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/htcConv/htcConvFvPatchScalarField.H
@@ -8,10 +8,10 @@
 License
     This file is part of OpenFOAM.
 
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
+    OpenFOAM is 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
@@ -19,8 +19,7 @@ License
     for more details.
 
     You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::compressible::RASModels::htcConvFvPatchScalarField
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/0.org/Ek.q b/tutorials/DNS/dnsFoam/boxTurb16/0.org/Ek.q
deleted file mode 100644
index 9c8af725a4b3f8f333c0a921884fca48cbdb6d90..0000000000000000000000000000000000000000
--- a/tutorials/DNS/dnsFoam/boxTurb16/0.org/Ek.q
+++ /dev/null
@@ -1,22 +0,0 @@
-"E(k)"
-"k"
-"E(k)"
-(0 0 0)
-(0 0 0)
-1
-(
-
-"E(k)"
-0
-8
-(
-(5.86431 0.000436377 0)
-(11.7286 3.48387e-06 0)
-(17.5929 6.63884e-14 0)
-(23.4572 4.68122e-28 0)
-(29.3215 6.81256e-37 0)
-(35.1858 4.37547e-35 0)
-(41.0501 1.40555e-36 0)
-(46.9145 1.95116e-34 0)
-)
-)
\ No newline at end of file
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/0.org/Ek.xy b/tutorials/DNS/dnsFoam/boxTurb16/0.org/Ek.xy
deleted file mode 100644
index e0d3febe1055dcf61862f42de988fe746b3c5b87..0000000000000000000000000000000000000000
--- a/tutorials/DNS/dnsFoam/boxTurb16/0.org/Ek.xy
+++ /dev/null
@@ -1,8 +0,0 @@
-1.02593 7.63421e-05
-0.00204766 6.08238e-10
-1.73423e-11 6.54427e-26
-6.87852e-26 1.3727e-54
-6.40659e-35 1.48851e-72
-2.85745e-33 3.55332e-69
-6.74385e-35 2.30909e-72
-7.16752e-33 2.98095e-68
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/0.org/U b/tutorials/DNS/dnsFoam/boxTurb16/0.org/U
deleted file mode 100644
index e4b7685980d418776e4eeab8d455fb140ed9f79e..0000000000000000000000000000000000000000
--- a/tutorials/DNS/dnsFoam/boxTurb16/0.org/U
+++ /dev/null
@@ -1,51 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volVectorField;
-    location    "1";
-    object      U;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [ 0 1 -1 0 0 0 0 ];
-
-internalField   uniform ( 0 0 0 );
-
-boundaryField
-{
-    patch0_half0
-    {
-        type            cyclic;
-    }
-    patch1_half0
-    {
-        type            cyclic;
-    }
-    patch2_half0
-    {
-        type            cyclic;
-    }
-    patch2_half1
-    {
-        type            cyclic;
-    }
-    patch1_half1
-    {
-        type            cyclic;
-    }
-    patch0_half1
-    {
-        type            cyclic;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/0.org/enstrophy b/tutorials/DNS/dnsFoam/boxTurb16/0.org/enstrophy
deleted file mode 100644
index 380467277085e99c8d011e9d12e61d6e2e11dc5f..0000000000000000000000000000000000000000
--- a/tutorials/DNS/dnsFoam/boxTurb16/0.org/enstrophy
+++ /dev/null
@@ -1,57 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "1";
-    object      enstrophy;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [ 0 0 -2 0 0 0 0 ];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    patch0_half0
-    {
-        type            cyclic;
-        value           uniform 0;
-    }
-    patch1_half0
-    {
-        type            cyclic;
-        value           uniform 0;
-    }
-    patch2_half0
-    {
-        type            cyclic;
-        value           uniform 0;
-    }
-    patch2_half1
-    {
-        type            cyclic;
-        value           uniform 0;
-    }
-    patch1_half1
-    {
-        type            cyclic;
-        value           uniform 0;
-    }
-    patch0_half1
-    {
-        type            cyclic;
-        value           uniform 0;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/0.org/p b/tutorials/DNS/dnsFoam/boxTurb16/0.org/p
deleted file mode 100644
index f498742efa10359860f29c4dfd5e04396a6458e7..0000000000000000000000000000000000000000
--- a/tutorials/DNS/dnsFoam/boxTurb16/0.org/p
+++ /dev/null
@@ -1,51 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "1";
-    object      p;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [ 0 2 -2 0 0 0 0 ];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    patch0_half0
-    {
-        type            cyclic;
-    }
-    patch1_half0
-    {
-        type            cyclic;
-    }
-    patch2_half0
-    {
-        type            cyclic;
-    }
-    patch2_half1
-    {
-        type            cyclic;
-    }
-    patch1_half1
-    {
-        type            cyclic;
-    }
-    patch0_half1
-    {
-        type            cyclic;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/0/Ek.q b/tutorials/DNS/dnsFoam/boxTurb16/0/Ek.q
deleted file mode 100644
index 9c8af725a4b3f8f333c0a921884fca48cbdb6d90..0000000000000000000000000000000000000000
--- a/tutorials/DNS/dnsFoam/boxTurb16/0/Ek.q
+++ /dev/null
@@ -1,22 +0,0 @@
-"E(k)"
-"k"
-"E(k)"
-(0 0 0)
-(0 0 0)
-1
-(
-
-"E(k)"
-0
-8
-(
-(5.86431 0.000436377 0)
-(11.7286 3.48387e-06 0)
-(17.5929 6.63884e-14 0)
-(23.4572 4.68122e-28 0)
-(29.3215 6.81256e-37 0)
-(35.1858 4.37547e-35 0)
-(41.0501 1.40555e-36 0)
-(46.9145 1.95116e-34 0)
-)
-)
\ No newline at end of file
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/0/Ek.xy b/tutorials/DNS/dnsFoam/boxTurb16/0/Ek.xy
deleted file mode 100644
index e0d3febe1055dcf61862f42de988fe746b3c5b87..0000000000000000000000000000000000000000
--- a/tutorials/DNS/dnsFoam/boxTurb16/0/Ek.xy
+++ /dev/null
@@ -1,8 +0,0 @@
-1.02593 7.63421e-05
-0.00204766 6.08238e-10
-1.73423e-11 6.54427e-26
-6.87852e-26 1.3727e-54
-6.40659e-35 1.48851e-72
-2.85745e-33 3.55332e-69
-6.74385e-35 2.30909e-72
-7.16752e-33 2.98095e-68
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/0/U b/tutorials/DNS/dnsFoam/boxTurb16/0/U
index e4b7685980d418776e4eeab8d455fb140ed9f79e..780a4ac52cfec9172b662116c99831f15abd4cd7 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/0/U
+++ b/tutorials/DNS/dnsFoam/boxTurb16/0/U
@@ -10,14 +10,4114 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "1";
+    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 1 -1 0 0 0 0 ];
+dimensions      [0 1 -1 0 0 0 0];
 
-internalField   uniform ( 0 0 0 );
+internalField   nonuniform List<vector> 
+4096
+(
+(-0.0376011 0.020584 -0.0051027)
+(-0.0262359 0.0149309 -0.0048244)
+(-0.0141003 0.00810973 -0.00427023)
+(-0.00304323 0.00116024 -0.00352459)
+(0.00525225 -0.00486054 -0.00270092)
+(0.00952492 -0.00903873 -0.00192446)
+(0.00912652 -0.0107411 -0.00131334)
+(0.00411911 -0.00970993 -0.000960557)
+(-0.00473519 -0.00610113 -0.000919911)
+(-0.0160901 -0.000461402 -0.00119772)
+(-0.0282192 0.00635355 -0.0017518)
+(-0.0392773 0.0133076 -0.00249781)
+(-0.0475807 0.019341 -0.00332211)
+(-0.0518636 0.0235325 -0.00409906)
+(-0.0514717 0.0252412 -0.00471027)
+(-0.0464633 0.0242055 -0.00506267)
+(-0.0306494 0.0204311 -0.00498325)
+(-0.0191731 0.0148706 -0.00454978)
+(-0.00690198 0.00817023 -0.0040222)
+(0.00429437 0.00135137 -0.0034808)
+(0.0127117 -0.00454891 -0.00300793)
+(0.0170701 -0.0086351 -0.0026754)
+(0.0167085 -0.010288 -0.00253376)
+(0.0116831 -0.00925717 -0.00260456)
+(0.0027589 -0.00569861 -0.00287714)
+(-0.00870727 -0.000151308 -0.00331014)
+(-0.020972 0.00654308 -0.00383774)
+(-0.0321694 0.0133667 -0.00437962)
+(-0.0405946 0.0192796 -0.00485317)
+(-0.0449632 0.023379 -0.00518616)
+(-0.0446079 0.0250378 -0.00532779)
+(-0.0395815 0.0240023 -0.0052565)
+(-0.0211407 0.0206491 -0.00543572)
+(-0.00955843 0.0153474 -0.00489191)
+(0.00277749 0.00893612 -0.00440037)
+(0.0139877 0.0023926 -0.00403592)
+(0.0223658 -0.00328806 -0.00385391)
+(0.026638 -0.00724378 -0.00388191)
+(0.0261561 -0.00887515 -0.00411557)
+(0.0209947 -0.00793502 -0.00451934)
+(0.0119395 -0.00456546 -0.00503187)
+(0.000367213 0.000723277 -0.00557528)
+(-0.0119625 0.00712884 -0.00606692)
+(-0.0231738 0.0136773 -0.00643194)
+(-0.0315598 0.0193706 -0.00661462)
+(-0.0358419 0.0233392 -0.00658703)
+(-0.0353662 0.0249763 -0.00635326)
+(-0.0302038 0.0240312 -0.00594893)
+(-0.0105233 0.0212049 -0.00638979)
+(0.00114355 0.0162888 -0.00579723)
+(0.0134638 0.0102909 -0.0053457)
+(0.0245604 0.00412547 -0.0051039)
+(0.0327443 -0.00126993 -0.00510853)
+(0.0367713 -0.00507663 -0.00535875)
+(0.0360303 -0.00671783 -0.00581639)
+(0.0306356 -0.00594485 -0.00641182)
+(0.0214082 -0.00287429 -0.00705452)
+(0.00975112 0.00202912 -0.00764678)
+(-0.00256299 0.00802162 -0.0080985)
+(-0.0136608 0.0141921 -0.00834087)
+(-0.0218524 0.0196 -0.00833686)
+(-0.0258892 0.0234194 -0.00808696)
+(-0.0251543 0.025066 -0.00762913)
+(-0.0197585 0.024288 -0.00703312)
+(-0.000413375 0.022014 -0.00769925)
+(0.0113038 0.0175516 -0.00712687)
+(0.0235302 0.0120283 -0.00671314)
+(0.034403 0.00628616 -0.00652101)
+(0.0422673 0.00119821 -0.00657962)
+(0.0459274 -0.00246361 -0.00687991)
+(0.0448282 -0.00414452 -0.00737614)
+(0.0391384 -0.00358973 -0.00799281)
+(0.0297238 -0.000882624 -0.00863615)
+(0.0180162 0.00356736 -0.00920833)
+(0.00579578 0.00908543 -0.00962229)
+(-0.00507821 0.0148326 -0.00981496)
+(-0.0129501 0.0199329 -0.00975688)
+(-0.0166198 0.0236072 -0.00945678)
+(-0.0155266 0.0252933 -0.00896032)
+(-0.00983553 0.0247334 -0.00834311)
+(0.00765102 0.0229531 -0.00916483)
+(0.0193767 0.0189434 -0.00867841)
+(0.0314452 0.0138838 -0.00829447)
+(0.0420182 0.00854566 -0.00807141)
+(0.049486 0.00374056 -0.00804307)
+(0.0527136 0.000197419 -0.00821371)
+(0.0512114 -0.001547 -0.0085573)
+(0.0452096 -0.00122822 -0.00902161)
+(0.0356215 0.0011063 -0.00953603)
+(0.0239053 0.0051038 -0.0100223)
+(0.0118426 0.0101583 -0.0104065)
+(0.00126852 0.0155015 -0.01063)
+(-0.00620681 0.0203187 -0.0106588)
+(-0.00944375 0.0238741 -0.0104882)
+(-0.00794747 0.0256236 -0.0101444)
+(-0.0019445 0.0252998 -0.00967964)
+(0.0124435 0.0238792 -0.0105645)
+(0.0241343 0.0202523 -0.0102167)
+(0.0360051 0.0155748 -0.00984996)
+(0.0462477 0.0105599 -0.00952005)
+(0.0533027 0.00597001 -0.00927712)
+(0.0560978 0.00250133 -0.0091581)
+(0.0542094 0.000679295 -0.00918111)
+(0.0479263 0.000780205 -0.0093427)
+(0.0382048 0.00278975 -0.00961833)
+(0.0265233 0.00640458 -0.00996609)
+(0.0146582 0.011077 -0.010333)
+(0.0044146 0.0160968 -0.0106633)
+(-0.00264775 0.0206986 -0.0109064)
+(-0.00545211 0.0241793 -0.0110255)
+(-0.00356953 0.0260064 -0.0110023)
+(0.00271465 0.0259007 -0.0108403)
+(0.0132351 0.024651 -0.0116866)
+(0.024853 0.0212788 -0.011509)
+(0.0365164 0.0168437 -0.0111443)
+(0.0464483 0.0120221 -0.0106479)
+(0.0531369 0.00754714 -0.0100954)
+(0.0555655 0.00409739 -0.00957088)
+(0.0533663 0.00219549 -0.00915417)
+(0.0468755 0.00212987 -0.00890875)
+(0.0370809 0.00391152 -0.00887204)
+(0.0254722 0.00727177 -0.00904964)
+(0.0138147 0.0117017 -0.0094145)
+(0.00388184 0.0165279 -0.00991106)
+(-0.00281398 0.0210147 -0.0104637)
+(-0.00525179 0.0244765 -0.0109882)
+(-0.00305847 0.0263835 -0.0114047)
+(0.00343334 0.0264445 -0.01165)
+(0.00990513 0.0251512 -0.0123612)
+(0.0214233 0.0218666 -0.0123596)
+(0.0329009 0.0174974 -0.0119815)
+(0.0425893 0.0127098 -0.0112845)
+(0.0490136 0.00823185 -0.0103746)
+(0.0511975 0.00474266 -0.00939037)
+(0.0488103 0.00277082 -0.00848171)
+(0.0422169 0.00261536 -0.00778692)
+(0.0324209 0.00430092 -0.00741181)
+(0.0209119 0.0075734 -0.00741347)
+(0.00944024 0.0119372 -0.00779164)
+(-0.00024901 0.0167292 -0.00848874)
+(-0.00668053 0.0212189 -0.00939862)
+(-0.00887362 0.0247202 -0.0103828)
+(-0.00649241 0.0266974 -0.0112914)
+(0.000101881 0.0268484 -0.0119861)
+(0.00295941 0.0253035 -0.0124857)
+(0.0143662 0.0219263 -0.0126391)
+(0.0257081 0.0174363 -0.0122342)
+(0.0352571 0.0125183 -0.0113329)
+(0.0415596 0.00791998 -0.0100722)
+(0.0436577 0.00433895 -0.00864417)
+(0.041234 0.00231773 -0.00726618)
+(0.0346587 0.0021628 -0.006148)
+(0.0249328 0.00389866 -0.00545987)
+(0.0135354 0.00726357 -0.00530652)
+(0.00219949 0.0117479 -0.0057113)
+(-0.00735032 0.0166702 -0.00661259)
+(-0.01366 0.0212801 -0.0078732)
+(-0.0157674 0.0248734 -0.00930122)
+(-0.0133498 0.0269003 -0.0106792)
+(-0.00677369 0.027051 -0.0117975)
+(-0.00654593 0.0250849 -0.0120399)
+(0.00475486 0.021449 -0.0123037)
+(0.0160319 0.01667 -0.011863)
+(0.0255669 0.0114768 -0.0107848)
+(0.0319086 0.00665904 -0.00923334)
+(0.0340929 0.00294775 -0.00744485)
+(0.0317895 0.000905185 -0.00569156)
+(0.0253503 0.000841031 -0.00424039)
+(0.0157555 0.00276593 -0.00331223)
+(0.00446421 0.00638937 -0.00304836)
+(-0.00680659 0.0111624 -0.00348897)
+(-0.0163424 0.0163597 -0.00456701)
+(-0.0226913 0.0211891 -0.00611839)
+(-0.0248852 0.0249129 -0.00790693)
+(-0.0225879 0.0269614 -0.00966035)
+(-0.016148 0.0270215 -0.0111117)
+(-0.0171645 0.0245289 -0.0110903)
+(-0.00594824 0.0205074 -0.0114032)
+(0.00534453 0.0153151 -0.0109227)
+(0.0149932 0.00974391 -0.00972211)
+(0.021529 0.00464103 -0.00798415)
+(0.0239585 0.000780812 -0.00597343)
+(0.021914 -0.00125183 -0.00399603)
+(0.015708 -0.0011488 -0.00235296)
+(0.00628531 0.00107509 -0.00129432)
+(-0.00492125 0.00508382 -0.000981269)
+(-0.0162077 0.0102699 -0.00146151)
+(-0.025857 0.0158451 -0.00266196)
+(-0.0324002 0.0209597 -0.00439991)
+(-0.0348394 0.0248327 -0.00641077)
+(-0.0328013 0.0268716 -0.00838838)
+(-0.0265946 0.0267646 -0.0100316)
+(-0.0272795 0.0237201 -0.00978042)
+(-0.0161134 0.0192449 -0.0100735)
+(-0.00472658 0.013578 -0.00955556)
+(0.00514596 0.00758353 -0.00830548)
+(0.0120014 0.00217315 -0.00651362)
+(0.0147977 -0.001832 -0.00445275)
+(0.0131112 -0.003825 -0.00243657)
+(0.00720021 -0.00350382 -0.000771953)
+(-0.00203562 -0.000916517 0.000287688)
+(-0.0131918 0.00354562 0.000581019)
+(-0.0245721 0.00920609 6.3328e-05)
+(-0.0344454 0.0152045 -0.00118663)
+(-0.0413083 0.0206269 -0.00297858)
+(-0.0441145 0.024645 -0.00503969)
+(-0.0424346 0.0266445 -0.00705614)
+(-0.0365229 0.0263194 -0.00872087)
+(-0.0353499 0.0227816 -0.00830985)
+(-0.024192 0.0178537 -0.00851714)
+(-0.0126472 0.0117231 -0.00796954)
+(-0.00247464 0.00532444 -0.00675047)
+(0.00477723 -0.000368955 -0.00504552)
+(0.00800603 -0.00449296 -0.00311422)
+(0.0067224 -0.0064226 -0.00125051)
+(0.00112317 -0.00586554 0.000261929)
+(-0.00793937 -0.0029057 0.00119286)
+(-0.0190872 0.00200892 0.0014005)
+(-0.0306254 0.00813301 0.000853161)
+(-0.0407987 0.0145356 -0.000365882)
+(-0.0480582 0.0202412 -0.00207105)
+(-0.0512971 0.0243784 -0.0040027)
+(-0.0500201 0.0263146 -0.00586668)
+(-0.0444201 0.0257536 -0.00737915)
+(-0.0401457 0.0218561 -0.00690353)
+(-0.0289528 0.0165454 -0.00697208)
+(-0.0172103 0.0100326 -0.00640715)
+(-0.00670725 0.00331048 -0.0052948)
+(0.000957507 -0.00259832 -0.00380436)
+(0.00461878 -0.00679697 -0.00216264)
+(0.00372137 -0.00864917 -0.000619504)
+(-0.00159665 -0.00787435 0.000590187)
+(-0.0105258 -0.00458958 0.00128224)
+(-0.0217085 0.000707745 0.00135122)
+(-0.0334444 0.00721405 0.000786536)
+(-0.0439483 0.0139402 -0.000325906)
+(-0.0516208 0.0198614 -0.00181672)
+(-0.0552923 0.0240734 -0.00345887)
+(-0.0544015 0.0259322 -0.00500225)
+(-0.0490827 0.0251532 -0.00621184)
+(-0.0409361 0.0210844 -0.00577699)
+(-0.0296705 0.0155191 -0.00567499)
+(-0.0177205 0.00876372 -0.00510774)
+(-0.00690684 0.00184821 -0.00416162)
+(0.00112439 -0.00417557 -0.00298063)
+(0.00515223 -0.00839325 -0.00174444)
+(0.00456568 -0.0101657 -0.000641162)
+(-0.000544519 -0.00922434 0.000161291)
+(-0.00940058 -0.00571169 0.000540699)
+(-0.020656 -0.000159741 0.000439188)
+(-0.0325993 0.00658917 -0.000127891)
+(-0.0434139 0.013509 -0.00107425)
+(-0.051453 0.0195453 -0.00225575)
+(-0.0554911 0.0237764 -0.00349242)
+(-0.0549112 0.0255552 -0.00459587)
+(-0.0498001 0.0246096 -0.00539809)
+(-0.0375986 0.0158166 0.00597748)
+(-0.0264975 0.0101809 0.00641667)
+(-0.0145793 0.00336288 0.00703301)
+(-0.00365998 -0.00359821 0.00773267)
+(0.00459836 -0.00964364 0.00840925)
+(0.00894018 -0.0138558 0.00895987)
+(0.00870672 -0.0155963 0.00930078)
+(0.003935 -0.0146015 0.00938007)
+(-0.00464872 -0.0110217 0.00918556)
+(-0.0157394 -0.00539931 0.00874675)
+(-0.0276508 0.00141269 0.00813035)
+(-0.038571 0.00837852 0.00743021)
+(-0.0468373 0.0144367 0.00675304)
+(-0.0511896 0.0186621 0.00620205)
+(-0.0509629 0.0204086 0.00586121)
+(-0.0461903 0.019409 0.00578239)
+(-0.0312309 0.0158481 0.00685463)
+(-0.0200208 0.0103009 0.00745374)
+(-0.00796279 0.00360333 0.00804411)
+(0.00310584 -0.00322371 0.0085359)
+(0.0115002 -0.00914192 0.00885437)
+(0.0159441 -0.0132531 0.00895117)
+(0.0157632 -0.0149341 0.00881164)
+(0.0109866 -0.0139304 0.00845698)
+(0.00234106 -0.0103936 0.00794107)
+(-0.00885877 -0.00485944 0.0073423)
+(-0.0209101 0.00183239 0.00675177)
+(-0.0319797 0.00866438 0.0062594)
+(-0.040382 0.0145953 0.00594028)
+(-0.0448363 0.0187196 0.00584314)
+(-0.044662 0.0204064 0.00598284)
+(-0.0398844 0.0193977 0.00633807)
+(-0.0222278 0.0161669 0.00713101)
+(-0.0109195 0.0108757 0.00784386)
+(0.00120235 0.00446727 0.00839766)
+(0.012291 -0.00208171 0.00870818)
+(0.0206584 -0.00777529 0.00872827)
+(0.0250325 -0.0117494 0.00845501)
+(0.0247495 -0.0134019 0.00793007)
+(0.019854 -0.0124823 0.00723331)
+(0.011091 -0.0091295 0.00647066)
+(-0.000207151 -0.00385122 0.00575808)
+(-0.0123225 0.00255178 0.00520401)
+(-0.0234122 0.00910588 0.00489285)
+(-0.0317875 0.0148122 0.00487212)
+(-0.0361717 0.0187992 0.0051451)
+(-0.0358953 0.0204571 0.0056703)
+(-0.0309987 0.0195323 0.00636771)
+(-0.0119606 0.0167243 0.00676594)
+(-0.000580072 0.0118179 0.00752905)
+(0.0115201 0.00582325 0.00804129)
+(0.0224964 -0.000346026 0.00822475)
+(0.0306779 -0.00575181 0.00805164)
+(0.0348209 -0.00957383 0.00754845)
+(0.0342968 -0.011233 0.00679181)
+(0.0291866 -0.0104777 0.00589685)
+(0.0202682 -0.007422 0.00499967)
+(0.00889767 -0.00252822 0.00423674)
+(-0.00319618 0.00346128 0.00372416)
+(-0.0141735 0.00963579 0.00354004)
+(-0.0223629 0.0150541 0.00371255)
+(-0.0265158 0.0188887 0.00421557)
+(-0.025998 0.0205531 0.00497255)
+(-0.0208868 0.0197926 0.00586817)
+(-0.00199212 0.0174356 0.00581593)
+(0.0094238 0.0129841 0.00655826)
+(0.0214199 0.00746484 0.00703033)
+(0.0321687 0.00171908 0.00716035)
+(0.0400338 -0.00337957 0.00692866)
+(0.0438196 -0.00705755 0.00637065)
+(0.0429519 -0.0087576 0.00557127)
+(0.037564 -0.00822199 0.00465215)
+(0.0284761 -0.00553111 0.00375307)
+(0.0170699 -0.00109194 0.00301082)
+(0.00507996 0.00442236 0.00253836)
+(-0.0056698 0.0101734 0.00240772)
+(-0.0135426 0.0152844 0.00263892)
+(-0.0173382 0.0189747 0.00319686)
+(-0.0164766 0.0206798 0.00399662)
+(-0.0110877 0.0201389 0.00491637)
+(0.00616118 0.0181924 0.00442556)
+(0.0175702 0.0141967 0.00507931)
+(0.0293958 0.00914203 0.00551877)
+(0.0398364 0.00379912 0.00567715)
+(0.0473027 -0.0010198 0.00553044)
+(0.0506596 -0.00458373 0.00510105)
+(0.0493982 -0.00635271 0.00445435)
+(0.0437119 -0.0060585 0.00368871)
+(0.034466 -0.00374475 0.00292058)
+(0.0230667 0.000238928 0.00226681)
+(0.0112471 0.00528868 0.00182695)
+(0.000805555 0.0106368 0.00166804)
+(-0.00666823 0.0154679 0.0018144)
+(-0.0100348 0.0190439 0.00224381)
+(-0.0087795 0.0208178 0.0028909)
+(-0.00309216 0.0205184 0.00365707)
+(0.0112593 0.0188794 0.00280547)
+(0.02262 0.0152708 0.00331634)
+(0.0342345 0.0105994 0.00373577)
+(0.0443332 0.00557734 0.00399999)
+(0.051379 0.000968187 0.00406887)
+(0.0543007 -0.002529 0.00393195)
+(0.0526556 -0.0043844 0.00361008)
+(0.0466955 -0.00431659 0.00315216)
+(0.0373275 -0.00233481 0.00262783)
+(0.0259763 0.00126184 0.00211686)
+(0.0143678 0.00592839 0.00169706)
+(0.00426818 0.0109555 0.00143243)
+(-0.00278493 0.0155766 0.00136334)
+(-0.00571612 0.0190858 0.00150035)
+(-0.00407708 0.020946 0.00182259)
+(0.00188396 0.0208732 0.00228092)
+(0.0125268 0.0193918 0.00120089)
+(0.0238053 0.0160429 0.00153633)
+(0.0352001 0.0116149 0.00195131)
+(0.0449754 0.00678297 0.00238274)
+(0.0516429 0.00228172 0.00276497)
+(0.0541892 -0.00120616 0.00303984)
+(0.0522287 -0.00315226 0.00316547)
+(0.0460613 -0.00326138 0.00312268)
+(0.0366255 -0.00151585 0.00291791)
+(0.0253565 0.00182115 0.00258232)
+(0.0139677 0.00624418 0.00216703)
+(0.00419162 0.011081 0.00173534)
+(-0.00248315 0.0155941 0.00135302)
+(-0.00503892 0.0190938 0.0010783)
+(-0.00308453 0.0210449 0.000952964)
+(0.00308378 0.0211492 0.000996031)
+(0.00977036 0.0196516 -0.000144834)
+(0.0209452 0.0163954 9.25628e-06)
+(0.0321454 0.012034 0.000435995)
+(0.0416647 0.00723249 0.00107046)
+(0.0480539 0.00272089 0.00181609)
+(0.0503418 -0.000816517 0.00255936)
+(0.0481823 -0.00284378 0.00318709)
+(0.0419055 -0.0030534 0.00360367)
+(0.0324666 -0.00141245 0.00374564)
+(0.0213013 0.00183179 0.00359139)
+(0.0101072 0.00618802 0.00316445)
+(0.000587176 0.0109942 0.00252985)
+(-0.00580922 0.0155175 0.00178423)
+(-0.00810664 0.0190669 0.00104111)
+(-0.0059533 0.0210994 0.000413588)
+(0.000324328 0.0213043 -2.8501e-06)
+(0.00340858 0.0196194 -0.00102676)
+(0.0144741 0.0162747 -0.00103241)
+(0.0255344 0.011793 -0.000579575)
+(0.0349042 0.00685754 0.000262824)
+(0.0411573 0.00221889 0.00136655)
+(0.0433433 -0.00141934 0.00256355)
+(0.0411313 -0.00350589 0.00367156)
+(0.0348596 -0.0037243 0.00452189)
+(0.0254828 -0.00204033 0.00498507)
+(0.0144268 0.00129217 0.00499059)
+(0.00337284 0.0057685 0.00453765)
+(-0.00599769 0.0107084 0.00369523)
+(-0.012258 0.0153587 0.00259158)
+(-0.0144535 0.0190091 0.0013947)
+(-0.0122479 0.0211011 0.000286789)
+(-0.00597547 0.0213151 -0.000563513)
+(-0.00559134 0.0193001 -0.00130959)
+(0.00537596 0.0156994 -0.00142909)
+(0.0163723 0.0109286 -0.000939817)
+(0.0257221 0.00571531 8.37363e-05)
+(0.0320021 0.000852222 0.00148574)
+(0.0342578 -0.00292283 0.00305273)
+(0.032148 -0.0050378 0.00454614)
+(0.0259952 -0.00517196 0.00573861)
+(0.016736 -0.00330396 0.0064486)
+(0.00577838 0.000284374 0.00656805)
+(-0.00521147 0.00504943 0.00607877)
+(-0.0145619 0.010267 0.00505526)
+(-0.0208492 0.0151419 0.00365333)
+(-0.0231147 0.0189293 0.00208639)
+(-0.0210113 0.02105 0.000592988)
+(-0.0148579 0.0211799 -0.000599523)
+(-0.0158599 0.0187426 -0.00094886)
+(-0.00496478 0.0147571 -0.00111896)
+(0.00605328 0.00957266 -0.000588436)
+(0.0155154 0.00397974 0.000561939)
+(0.0219813 -0.00117105 0.00215701)
+(0.0244681 -0.00509812 0.00395395)
+(0.0225994 -0.00720636 0.00567919)
+(0.0166611 -0.0071761 0.00707009)
+(0.00755711 -0.00501105 0.00791492)
+(-0.00332811 -0.00103826 0.00808506)
+(-0.0143396 0.00414022 0.0075546)
+(-0.0238023 0.0097373 0.00640429)
+(-0.0302756 0.0149 0.00480923)
+(-0.0327723 0.0188397 0.00301225)
+(-0.0309102 0.0209539 0.00128695)
+(-0.0249713 0.0209195 -0.000104016)
+(-0.0258336 0.0180317 1.44434e-06)
+(-0.0149736 0.0135914 -0.000148239)
+(-0.00385133 0.00793147 0.000422155)
+(0.00583848 0.00191502 0.00162576)
+(0.0126208 -0.00354295 0.00327934)
+(0.0154647 -0.00761412 0.00513117)
+(0.0139394 -0.00968149 0.00689935)
+(0.00827858 -0.00943168 0.00831472)
+(-0.000656043 -0.00690182 0.00916181)
+(-0.0115059 -0.00247444 0.00931163)
+(-0.0226214 0.00317923 0.00874135)
+(-0.0323118 0.00919981 0.00753776)
+(-0.0391017 0.0146698 0.0058841)
+(-0.0419557 0.0187539 0.00403213)
+(-0.0404371 0.0208275 0.00226384)
+(-0.0347757 0.0205736 0.000848446)
+(-0.0339928 0.0172755 0.00139659)
+(-0.0231256 0.0123795 0.00133532)
+(-0.0118326 0.00625485 0.00193818)
+(-0.00183458 -0.000164582 0.00311337)
+(0.0053466 -0.00590244 0.00468199)
+(0.0086193 -0.0100878 0.00640529)
+(0.0074875 -0.0120865 0.00802094)
+(0.002125 -0.0115954 0.00928302)
+(-0.00665195 -0.00868843 0.00999937)
+(-0.0175088 -0.00380555 0.0100609)
+(-0.028795 0.00231274 0.00945813)
+(-0.0387936 0.00873637 0.00828287)
+(-0.0459825 0.0144865 0.00671403)
+(-0.0492655 0.018685 0.0049905)
+(-0.0481405 0.02069 0.00337473)
+(-0.0427774 0.0201947 0.00211272)
+(-0.0390941 0.0165891 0.00302314)
+(-0.0281786 0.0113058 0.00310485)
+(-0.0166744 0.00479792 0.00372787)
+(-0.0063344 -0.00194257 0.00479734)
+(0.00126736 -0.00789038 0.00615047)
+(0.00497531 -0.0121427 0.00758135)
+(0.00422719 -0.0140551 0.0088722)
+(-0.000861607 -0.0133377 0.00982653)
+(-0.00951651 -0.0100988 0.010299)
+(-0.0204216 -0.0048289 0.0102176)
+(-0.0319189 0.0016727 0.00959466)
+(-0.0422596 0.00841752 0.008525)
+(-0.0498692 0.0143778 0.00717151)
+(-0.0535876 0.0186434 0.00574031)
+(-0.0528463 0.0205621 0.00444937)
+(-0.0477568 0.0198404 0.00349524)
+(-0.0403602 0.0160768 0.00463206)
+(-0.0293625 0.0105338 0.00488954)
+(-0.0176388 0.00378239 0.00551732)
+(-0.00697531 -0.00314831 0.00641982)
+(0.00100471 -0.00920413 0.00745972)
+(0.00508809 -0.0134659 0.00847881)
+(0.00465543 -0.0152876 0.00932202)
+(-0.000225904 -0.0143933 0.00986098)
+(-0.00881295 -0.0109182 0.0100136)
+(-0.0198001 -0.00538858 0.00975647)
+(-0.031517 0.00135663 0.00912871)
+(-0.0421813 0.00829184 0.00822588)
+(-0.0501692 0.0143603 0.00718549)
+(-0.0542631 0.0186353 0.00616603)
+(-0.0538373 0.0204633 0.0053228)
+(-0.0489552 0.0195645 0.00478417)
+(-0.0380068 0.0104677 0.0162241)
+(-0.0270586 0.00490159 0.0167754)
+(-0.0152373 -0.00183599 0.0173824)
+(-0.00434406 -0.00871805 0.0179525)
+(0.00396285 -0.0146979 0.0183992)
+(0.00842057 -0.0188681 0.0186546)
+(0.00835278 -0.0205965 0.0186798)
+(0.0037713 -0.0196212 0.0184709)
+(-0.00462655 -0.0160898 0.0180597)
+(-0.0155641 -0.0105369 0.0175086)
+(-0.0273784 -0.00380517 0.0169015)
+(-0.0382724 0.00308191 0.0163308)
+(-0.0465875 0.00907473 0.0158836)
+(-0.0510559 0.0132581 0.015628)
+(-0.0509951 0.0149923 0.015603)
+(-0.0464128 0.0140121 0.0158123)
+(-0.0321154 0.0106456 0.0177792)
+(-0.0210574 0.00515834 0.0184936)
+(-0.00908852 -0.00146566 0.0190738)
+(0.00196763 -0.0082167 0.0194314)
+(0.010428 -0.0140681 0.0195123)
+(0.0150065 -0.018132 0.0193041)
+(0.0150082 -0.0197923 0.0188387)
+(0.0104344 -0.0187976 0.0181868)
+(0.00198127 -0.0152982 0.0174475)
+(-0.00906611 -0.00982397 0.0167334)
+(-0.0210281 -0.00320552 0.0161529)
+(-0.0320852 0.00355076 0.0157946)
+(-0.0405538 0.00941516 0.0157132)
+(-0.0451428 0.0134921 0.0159212)
+(-0.0451514 0.015158 0.0163869)
+(-0.0405767 0.014158 0.0170394)
+(-0.023493 0.0109507 0.0187763)
+(-0.0123421 0.00571157 0.019607)
+(-0.000306749 -0.000628638 0.0201477)
+(0.0107794 -0.00710356 0.0203162)
+(0.0192289 -0.0127286 0.0200869)
+(0.0237569 -0.0166502 0.0194949)
+(0.0236765 -0.0182742 0.0186303)
+(0.0190014 -0.0173544 0.0176247)
+(0.010443 -0.0140296 0.0166311)
+(-0.000697396 -0.00880336 0.0158005)
+(-0.0127261 -0.00246841 0.0152594)
+(-0.0238133 0.00401192 0.0150903)
+(-0.0322708 0.00964988 0.015319)
+(-0.0368093 0.0135844 0.0159108)
+(-0.0367356 0.0152136 0.0167758)
+(-0.0320594 0.0142883 0.017782)
+(-0.013453 0.0113365 0.0190649)
+(-0.00224024 0.00647716 0.0199475)
+(0.00977047 0.000547714 0.0204421)
+(0.0207492 -0.00554805 0.0204735)
+(0.0290249 -0.0108833 0.020037)
+(0.0333392 -0.0146485 0.0191993)
+(0.0330376 -0.0162733 0.0180879)
+(0.0281674 -0.0155113 0.0168718)
+(0.0194699 -0.0124774 0.0157361)
+(0.00826737 -0.00763059 0.0148535)
+(-0.00373682 -0.00170614 0.0143585)
+(-0.0147166 0.00439512 0.0143264)
+(-0.0230002 0.00974315 0.0147623)
+(-0.0273247 0.013521 0.0156)
+(-0.0270296 0.0151507 0.0167119)
+(-0.0221585 0.0143832 0.0179286)
+(-0.00352347 0.0117444 0.018602)
+(0.00771068 0.00733855 0.0194642)
+(0.0196093 0.00188429 0.0199132)
+(0.0303595 -0.00378701 0.0198806)
+(0.038325 -0.00881315 0.0193715)
+(0.0422947 -0.0124317 0.0184636)
+(0.0416664 -0.0140944 0.0172951)
+(0.0365373 -0.0135491 0.0160437)
+(0.0276879 -0.0108778 0.0148998)
+(0.0164638 -0.0064843 0.0140375)
+(0.00457156 -0.00103484 0.013588)
+(-0.00617968 0.00464199 0.01362)
+(-0.0141529 0.00968074 0.0141286)
+(-0.0181327 0.0133116 0.0150366)
+(-0.0175108 0.0149791 0.0162057)
+(-0.0123807 0.0144283 0.0174577)
+(0.00478496 0.0121121 0.0174581)
+(0.0159968 0.00816451 0.0182309)
+(0.0277129 0.00317752 0.0186416)
+(0.0381482 -0.00208864 0.0186278)
+(0.0457144 -0.00683344 0.0181917)
+(0.0492611 -0.0103372 0.0173999)
+(0.0482506 -0.0120692 0.0163727)
+(0.042838 -0.0117666 0.0152665)
+(0.0338472 -0.0094745 0.0142495)
+(0.0226452 -0.00553902 0.0134765)
+(0.0109354 -0.000556719 0.0130653)
+(0.000499072 0.00471491 0.0130785)
+(-0.00707473 0.00947212 0.0135143)
+(-0.0106313 0.012988 0.0143063)
+(-0.00962706 0.0147246 0.015334)
+(-0.00421352 0.0144166 0.0164408)
+(0.0102087 0.0123835 0.0158062)
+(0.0213577 0.00882914 0.0164342)
+(0.0328487 0.00423039 0.01682)
+(0.0429307 -0.000711609 0.016905)
+(0.0500692 -0.00524563 0.0166765)
+(0.053179 -0.00868405 0.0161691)
+(0.0517888 -0.010506 0.0154602)
+(0.0461114 -0.0104351 0.0146575)
+(0.0370112 -0.00848104 0.0138831)
+(0.0258719 -0.00493861 0.0132549)
+(0.0143872 -0.000344536 0.0128686)
+(0.00430426 0.00460278 0.0127831)
+(-0.00284175 0.00914902 0.0130115)
+(-0.00596126 0.0125994 0.0135191)
+(-0.00457725 0.014426 0.0142285)
+(0.00110095 0.0143498 0.0150317)
+(0.0119226 0.0125173 0.0138966)
+(0.0229781 0.00923118 0.0143463)
+(0.0342354 0.00488253 0.0147243)
+(0.0439795 0.000134414 0.0149731)
+(0.0507271 -0.00429142 0.0150549)
+(0.0534525 -0.0077238 0.0149572)
+(0.0517429 -0.00964276 0.014695)
+(0.0458599 -0.00975719 0.0143079)
+(0.036699 -0.00804855 0.013855)
+(0.0256533 -0.00477437 0.013405)
+(0.0144022 -0.000430513 0.0130266)
+(0.00465724 0.00432274 0.0127775)
+(-0.00209775 0.00876063 0.0126957)
+(-0.00483282 0.0122049 0.0127936)
+(-0.00312948 0.0141287 0.0130562)
+(0.0027543 0.014238 0.0134436)
+(0.00966551 0.012493 0.012019)
+(0.0206107 0.00930941 0.0122841)
+(0.0316617 0.00503469 0.0126724)
+(0.0411347 0.000320666 0.0131249)
+(0.0475876 -0.00411605 0.0135727)
+(0.0500397 -0.00760259 0.0139476)
+(0.0481197 -0.00961078 0.0141925)
+(0.0421213 -0.00983596 0.01427)
+(0.0329577 -0.00824278 0.0141683)
+(0.0220222 -0.00507121 0.0139029)
+(0.0109775 -0.000801487 0.0135143)
+(0.00150387 0.00391745 0.0130616)
+(-0.0049564 0.00836611 0.0126139)
+(-0.00741818 0.0118646 0.0122393)
+(-0.00550457 0.0138778 0.0119947)
+(0.000494481 0.0140981 0.0119174)
+(0.00377987 0.0123144 0.0104593)
+(0.0146151 0.00905202 0.0105615)
+(0.0255183 0.00466379 0.0109767)
+(0.0348282 -0.000181115 0.0116418)
+(0.0411276 -0.00474611 0.0124554)
+(0.043459 -0.0083388 0.0132937)
+(0.0414696 -0.0104149 0.0140291)
+(0.0354638 -0.0106594 0.0145495)
+(0.0263556 -0.00903413 0.0147756)
+(0.0155302 -0.00578393 0.0146731)
+(0.00463349 -0.00140096 0.0142577)
+(-0.00467704 0.00344865 0.0135925)
+(-0.0109838 0.00802556 0.012779)
+(-0.013325 0.0116304 0.0119409)
+(-0.0113421 0.0137117 0.0112058)
+(-0.00533565 0.0139516 0.0106855)
+(-0.00483953 0.0120088 0.00945589)
+(0.00590272 0.00849833 0.0094417)
+(0.0167394 0.00382642 0.00989624)
+(0.0260192 -0.00129444 0.0107504)
+(0.0323295 -0.00608563 0.011874)
+(0.0347113 -0.00982032 0.0130961)
+(0.032804 -0.0119326 0.0142306)
+(0.0268996 -0.0121022 0.0151047)
+(0.0178968 -0.0103022 0.0155853)
+(0.00716447 -0.00680406 0.0155993)
+(-0.00366551 -0.0021377 0.0151447)
+(-0.0129459 0.0029877 0.0142905)
+(-0.0192636 0.00779086 0.013167)
+(-0.0216554 0.0115379 0.011945)
+(-0.0197548 0.0136558 0.0108107)
+(-0.0138498 0.0138208 0.00993664)
+(-0.0148811 0.011623 0.009163)
+(-0.00420063 0.00773274 0.00909658)
+(0.00666074 0.00265014 0.00959692)
+(0.016048 -0.00284978 0.0105879)
+(0.0225321 -0.00793067 0.0119186)
+(0.0251276 -0.0118216 0.0133864)
+(0.0234415 -0.0139331 0.0147679)
+(0.017732 -0.0139448 0.0158527)
+(0.00886819 -0.011854 0.0164757)
+(-0.00180212 -0.00797641 0.016542)
+(-0.0126567 -0.00289963 0.0160416)
+(-0.0220445 0.00260473 0.0150507)
+(-0.0285361 0.00769772 0.0137201)
+(-0.0311418 0.0116014 0.0122523)
+(-0.0294625 0.0137186 0.0108709)
+(-0.0237525 0.0137258 0.00978606)
+(-0.0248158 0.0112155 0.00962611)
+(-0.0141565 0.0068718 0.00957968)
+(-0.00318286 0.00131402 0.0101254)
+(0.00643302 -0.00461038 0.0111801)
+(0.0132273 -0.0100004 0.0125834)
+(0.0161673 -0.0140382 0.0141214)
+(0.0148077 -0.0161117 0.0155602)
+(0.009357 -0.0159067 0.0166807)
+(0.000644839 -0.0134534 0.0173122)
+(-0.0100041 -0.00912259 0.0173586)
+(-0.0209708 -0.00357083 0.0168129)
+(-0.0305872 0.00235799 0.0157582)
+(-0.0373892 0.0077603 0.0143549)
+(-0.0403396 0.011811 0.0128168)
+(-0.0389869 0.0138906 0.011378)
+(-0.0335357 0.0136811 0.0102576)
+(-0.03313 0.0108485 0.0107747)
+(-0.0224481 0.00604648 0.0108175)
+(-0.0112918 2.13571e-05 0.0114013)
+(-0.00136093 -0.00630831 0.0124371)
+(0.00583271 -0.0119799 0.0137674)
+(0.00919566 -0.0161325 0.0151895)
+(0.00821823 -0.018137 0.0164871)
+(0.00305074 -0.0176894 0.0174626)
+(-0.00552022 -0.014857 0.0179674)
+(-0.0161915 -0.0100681 0.0179247)
+(-0.0273408 -0.00404913 0.0173409)
+(-0.0372723 0.00228502 0.0163049)
+(-0.0444738 0.00796903 0.0149745)
+(-0.0478473 0.0121349 0.0135522)
+(-0.0468769 0.0141455 0.0122547)
+(-0.0417088 0.0136934 0.0112793)
+(-0.0385567 0.0105775 0.0124328)
+(-0.027812 0.0053823 0.0126206)
+(-0.0164304 -0.00103116 0.0132294)
+(-0.00614617 -0.00768516 0.0141666)
+(0.00147516 -0.0135677 0.0152894)
+(0.00527506 -0.0177859 0.0164271)
+(0.00467732 -0.0197005 0.0174065)
+(-0.000225502 -0.0190214 0.0180784)
+(-0.00868715 -0.0158509 0.0183405)
+(-0.0194212 -0.010669 0.0181529)
+(-0.0307957 -0.00426167 0.0175441)
+(-0.0410806 0.00239694 0.0166067)
+(-0.0487099 0.00829212 0.0154835)
+(-0.0525205 0.0125236 0.0143456)
+(-0.0519298 0.0144444 0.0133663)
+(-0.0470263 0.0137607 0.0126946)
+(-0.0402691 0.0104438 0.0143467)
+(-0.0294309 0.00498027 0.0147131)
+(-0.0178158 -0.00168338 0.0153301)
+(-0.0071936 -0.00853136 0.0161037)
+(0.000818661 -0.0145222 0.0169163)
+(0.00500299 -0.0187465 0.0176443)
+(0.00472469 -0.0205642 0.0181768)
+(2.76481e-05 -0.0196998 0.0184328)
+(-0.00837321 -0.0162839 0.0183733)
+(-0.0192007 -0.0108337 0.0180071)
+(-0.0308087 -0.00417603 0.01739)
+(-0.0414316 0.00267675 0.016616)
+(-0.049452 0.00868038 0.015803)
+(-0.0536471 0.0129181 0.0150748)
+(-0.0533758 0.0147418 0.0145424)
+(-0.048678 0.0138726 0.0142867)
+(-0.0387636 0.00535258 0.0240765)
+(-0.0278339 -0.000102427 0.0246742)
+(-0.0159741 -0.00669456 0.0252016)
+(-0.00499149 -0.013419 0.0255784)
+(0.00344228 -0.0192532 0.0257475)
+(0.00804504 -0.0233117 0.0256831)
+(0.00811844 -0.0249797 0.0253952)
+(0.00365283 -0.0240044 0.0249274)
+(-0.00467212 -0.0205331 0.0243508)
+(-0.0155909 -0.0150915 0.0237532)
+(-0.0274435 -0.00850507 0.0232256)
+(-0.0384271 -0.00177528 0.0228482)
+(-0.0468692 0.00407213 0.0226787)
+(-0.051483 0.00814408 0.022743)
+(-0.0515635 0.00981774 0.0230312)
+(-0.047097 0.00883709 0.0234995)
+(-0.0331682 0.0056164 0.0261266)
+(-0.0221253 0.000226581 0.0268884)
+(-0.0101079 -0.00626424 0.0273869)
+(0.00105288 -0.0128667 0.0275463)
+(0.00965822 -0.0185769 0.0273425)
+(0.0143998 -0.0225283 0.0268066)
+(0.0145582 -0.0241222 0.0260202)
+(0.0101107 -0.0231173 0.0251029)
+(0.00173429 -0.0196651 0.0241943)
+(-0.00929771 -0.0142885 0.0234326)
+(-0.0213081 -0.00780312 0.0229337)
+(-0.0324699 -0.00119508 0.0227737)
+(-0.0410837 0.00452836 0.022977)
+(-0.0458362 0.00849299 0.0235128)
+(-0.0460015 0.0100924 0.0242996)
+(-0.041553 0.00908182 0.0252175)
+(-0.0247436 0.00579542 0.0277264)
+(-0.0136098 0.000641847 0.0286059)
+(-0.00152016 -0.00557505 0.0290602)
+(0.00968314 -0.0119077 0.0290201)
+(0.0182948 -0.0173933 0.0284919)
+(0.0230055 -0.0211994 0.0275563)
+(0.0231005 -0.0227496 0.0263555)
+(0.0185668 -0.0218089 0.0250723)
+(0.0100943 -0.0185193 0.0239019)
+(-0.00102885 -0.0133787 0.0230224)
+(-0.0131116 -0.00716694 0.0225677)
+(-0.024316 -0.000828568 0.0226071)
+(-0.032936 0.00467021 0.0231348)
+(-0.0376575 0.00848938 0.0240705)
+(-0.0377593 0.0100447 0.0252717)
+(-0.0332245 0.00909827 0.0265556)
+(-0.0147732 0.00586247 0.0286339)
+(-0.00358426 0.00108024 0.0295667)
+(0.00848118 -0.00473187 0.029968)
+(0.0195849 -0.010688 0.0297768)
+(0.0280366 -0.0158825 0.0290223)
+(0.0325515 -0.0195276 0.0278194)
+(0.0324444 -0.0210709 0.0263514)
+(0.0277331 -0.0202787 0.0248415)
+(0.0191347 -0.0172703 0.0235195)
+(0.00795627 -0.0125007 0.0225865)
+(-0.00410252 -0.00669349 0.0221847)
+(-0.0152073 -0.000731582 0.0223753)
+(-0.0236673 0.00447608 0.0231294)
+(-0.0281926 0.00813384 0.0243323)
+(-0.0280922 0.00968207 0.0258009)
+(-0.0233798 0.00888403 0.0273115)
+(-0.00477427 0.00580736 0.0287116)
+(0.00642527 0.00147501 0.0296255)
+(0.0183738 -0.00386308 0.0299733)
+(0.0292509 -0.0093932 0.0297023)
+(0.0374009 -0.0142747 0.0288539)
+(0.0415847 -0.0177673 0.0275572)
+(0.0411676 -0.0193418 0.0260097)
+(0.0362146 -0.0187597 0.0244468)
+(0.0274794 -0.0161083 0.0231063)
+(0.0162902 -0.0117883 0.0221923)
+(0.00434812 -0.00645491 0.0218438)
+(-0.00653008 -0.000918945 0.0221142)
+(-0.0146881 0.0039755 0.0229623)
+(-0.0188822 0.00748048 0.0242592)
+(-0.0184717 0.0090597 0.0258073)
+(-0.0135175 0.00847174 0.0273708)
+(0.00373192 0.00563839 0.0279479)
+(0.014896 0.00176595 0.0287733)
+(0.0266527 -0.00310104 0.0290754)
+(0.0372108 -0.00822065 0.0288082)
+(0.0449631 -0.0128147 0.0280126)
+(0.048731 -0.0161866 0.0268097)
+(0.0479433 -0.0178256 0.0253826)
+(0.0427211 -0.0174832 0.0239483)
+(0.0338593 -0.0152102 0.0227253)
+(0.0227053 -0.01135 0.0218995)
+(0.010955 -0.00648755 0.0215968)
+(0.000395895 -0.00136216 0.0218634)
+(-0.00736426 0.00324463 0.0226589)
+(-0.0111424 0.00662872 0.0238621)
+(-0.010361 0.00827227 0.0252898)
+(-0.00513778 0.00792407 0.0267246)
+(0.00945162 0.00538114 0.0264579)
+(0.0205396 0.00190866 0.027139)
+(0.0320587 -0.00256188 0.02741)
+(0.0422537 -0.00734891 0.0272297)
+(0.0495729 -0.0117249 0.0266256)
+(0.0529036 -0.0150262 0.0256897)
+(0.0517409 -0.0167531 0.0245645)
+(0.0462632 -0.0166434 0.023421)
+(0.0373042 -0.0147128 0.0224333)
+(0.0262262 -0.0112524 0.0217517)
+(0.0147136 -0.00678639 0.0214802)
+(0.00451754 -0.00199373 0.0216601)
+(-0.00280938 0.00239474 0.0222641)
+(-0.00615006 0.00570819 0.0232003)
+(-0.00499374 0.00743956 0.0243262)
+(0.000484909 0.00732429 0.0254701)
+(0.0115147 0.0050747 0.0244671)
+(0.0224974 0.00188131 0.02497)
+(0.0337691 -0.00232776 0.0252293)
+(0.0436125 -0.00691072 0.0252056)
+(0.0505291 -0.011171 0.0249026)
+(0.0534676 -0.0144628 0.0243664)
+(0.0519828 -0.0162874 0.0236785)
+(0.0463022 -0.0163682 0.0229436)
+(0.0372903 -0.0146916 0.0222734)
+(0.0263176 -0.0115103 0.0217701)
+(0.0150522 -0.00730584 0.0215102)
+(0.005208 -0.00271745 0.0215336)
+(-0.00171625 0.00155521 0.0218367)
+(-0.00466472 0.00485898 0.0223734)
+(-0.00318635 0.00668829 0.0230618)
+(0.00249516 0.00676362 0.023797)
+(0.00960661 0.0047657 0.0222777)
+(0.020471 0.00168807 0.0225955)
+(0.0315234 -0.00243429 0.0228642)
+(0.04108 -0.00697274 0.023043)
+(0.0476858 -0.0112375 0.0231047)
+(0.050337 -0.0145819 0.0230399)
+(0.048632 -0.0164994 0.0228584)
+(0.0428318 -0.0166992 0.0225877)
+(0.0338193 -0.0151498 0.0222689)
+(0.022965 -0.0120842 0.0219507)
+(0.011919 -0.00796676 0.0216816)
+(0.0023617 -0.00342308 0.0215026)
+(-0.00425175 0.000853903 0.0214411)
+(-0.00691289 0.00421041 0.0215063)
+(-0.00521441 0.00613283 0.0216882)
+(0.000586528 0.00632742 0.0219591)
+(0.0040168 0.00450127 0.0202231)
+(0.0147678 0.00135846 0.0203769)
+(0.0256624 -0.00286514 0.0206746)
+(0.0350407 -0.00752543 0.0210709)
+(0.0414749 -0.011914 0.0215055)
+(0.0439873 -0.0153654 0.0219122)
+(0.0421974 -0.0173568 0.022229)
+(0.0363793 -0.0175862 0.0224075)
+(0.0274185 -0.0160175 0.0224206)
+(0.0166776 -0.012887 0.0222664)
+(0.00578966 -0.00866849 0.0219683)
+(-0.00358927 -0.00400319 0.0215719)
+(-0.0100311 0.000397606 0.0211376)
+(-0.0125536 0.00386126 0.0207313)
+(-0.0107704 0.0058578 0.0204149)
+(-0.00495158 0.00608216 0.0202364)
+(-0.00440496 0.00432181 0.018617)
+(0.00625491 0.000942792 0.018653)
+(0.0170772 -0.00355463 0.0189949)
+(0.0264129 -0.00848457 0.0195906)
+(0.0328408 -0.0130976 0.0203494)
+(0.035384 -0.016694 0.0211558)
+(0.0336576 -0.018729 0.0218869)
+(0.0279258 -0.018894 0.0224314)
+(0.0190612 -0.0171628 0.0227064)
+(0.00841153 -0.0137963 0.02267)
+(-0.00240398 -0.00930426 0.0223279)
+(-0.0117403 -0.00436946 0.0217322)
+(-0.0181759 0.000255805 0.0209736)
+(-0.0207293 0.00386473 0.0201675)
+(-0.0190097 0.00590516 0.0194366)
+(-0.0132773 0.0060653 0.0188921)
+(-0.0143772 0.00425473 0.0177052)
+(-0.00377221 0.000504429 0.0176876)
+(0.00707433 -0.0043977 0.0180821)
+(0.0165097 -0.00970411 0.0188287)
+(0.0230975 -0.014608 0.0198138)
+(0.0258365 -0.0183654 0.0208873)
+(0.0243121 -0.0204072 0.0218858)
+(0.0187577 -0.0204237 0.0226572)
+(0.010019 -0.0184113 0.0230841)
+(-0.000575534 -0.0146738 0.0231016)
+(-0.0114151 -0.00977736 0.0227069)
+(-0.020851 -0.0044662 0.0219603)
+(-0.0274466 0.000450078 0.0209754)
+(-0.0301961 0.00422032 0.0199021)
+(-0.0286787 0.00626777 0.0189037)
+(-0.0231237 0.0062795 0.0181323)
+(-0.0243812 0.00431025 0.0176277)
+(-0.0137867 0.000110105 0.0176286)
+(-0.00282308 -0.00526604 0.0180763)
+(0.00683894 -0.0109984 0.0189024)
+(0.0137286 -0.0162154 0.0199814)
+(0.0167986 -0.0201254 0.0211488)
+(0.015584 -0.022136 0.0222269)
+(0.0102712 -0.0219425 0.0230517)
+(0.00166896 -0.0195732 0.0234974)
+(-0.00891493 -0.0153861 0.0234964)
+(-0.0198714 -0.0100158 0.0230486)
+(-0.0295341 -0.00427872 0.0222224)
+(-0.0364316 0.000950816 0.0211436)
+(-0.0395123 0.00487389 0.0199762)
+(-0.0383048 0.00689043 0.0188982)
+(-0.0329915 0.00669215 0.0180735)
+(-0.032893 0.00447983 0.018396)
+(-0.0222628 -0.000180244 0.0184851)
+(-0.0111072 -0.00602754 0.0189784)
+(-0.00112597 -0.0121706 0.0198007)
+(0.00616139 -0.0176751 0.0208268)
+(0.00964723 -0.021706 0.0219006)
+(0.00880321 -0.0236524 0.0228585)
+(0.00375938 -0.0232192 0.0235548)
+(-0.00471652 -0.0204715 0.0238833)
+(-0.0153359 -0.0158247 0.0237941)
+(-0.0264843 -0.00998342 0.0233008)
+(-0.0364662 -0.0038356 0.0224784)
+(-0.0437617 0.00168175 0.0214522)
+(-0.0472583 0.0057259 0.0203784)
+(-0.0464215 0.00767828 0.0194206)
+(-0.041377 0.00724035 0.0187244)
+(-0.0386155 0.00473752 0.0198922)
+(-0.0279091 -0.000322544 0.0201258)
+(-0.0165157 -0.0065664 0.0206503)
+(-0.0061714 -0.0130422 0.0213858)
+(0.00154909 -0.0187651 0.0222205)
+(0.00547222 -0.0228666 0.0230273)
+(0.0050031 -0.0247253 0.0236834)
+(0.000214714 -0.0240595 0.0240889)
+(-0.00816411 -0.0209695 0.024182)
+(-0.0188596 -0.0159228 0.0239484)
+(-0.0302457 -0.00968499 0.0234239)
+(-0.0405907 -0.00320427 0.0226881)
+(-0.0483195 0.0025316 0.0218532)
+(-0.0522536 0.00664657 0.0210463)
+(-0.0517917 0.00851128 0.0203903)
+(-0.0470026 0.00784053 0.0199851)
+(-0.0406768 0.00504399 0.0218873)
+(-0.0298652 -0.000295221 0.0222994)
+(-0.0182246 -0.00680063 0.0228359)
+(-0.00752867 -0.0134806 0.0234151)
+(0.000594386 -0.0193192 0.0239488)
+(0.00490973 -0.0234305 0.024356)
+(0.00476277 -0.0251915 0.0245745)
+(0.000177431 -0.0243353 0.0245712)
+(-0.00814838 -0.0209912 0.0243465)
+(-0.018949 -0.0156654 0.0239344)
+(-0.0305824 -0.00916589 0.0233978)
+(-0.0412791 -0.00248081 0.0228182)
+(-0.0494106 0.00337097 0.0222842)
+(-0.0537369 0.00749572 0.0218769)
+(-0.0535971 0.00926256 0.0216585)
+(-0.049011 0.00840124 0.0216622)
+(-0.0397538 0.00124991 0.0283387)
+(-0.0287054 -0.00406932 0.0289099)
+(-0.0166779 -0.0104731 0.0292997)
+(-0.00550381 -0.0169853 0.0294488)
+(0.00311583 -0.0226157 0.0293347)
+(0.00787069 -0.0265102 0.0289748)
+(0.00803933 -0.0280786 0.0284239)
+(0.0035976 -0.0270836 0.0277658)
+(-0.0047785 -0.0236753 0.0271005)
+(-0.0158157 -0.0183697 0.0265294)
+(-0.0278361 -0.0119715 0.0261393)
+(-0.0390112 -0.00545365 0.0259897)
+(-0.0476396 0.000190404 0.0261035)
+(-0.0524057 0.00409844 0.0264634)
+(-0.0525815 0.00567253 0.0270146)
+(-0.0481387 0.00467183 0.0276732)
+(-0.0342291 0.00152598 0.0306255)
+(-0.0230619 -0.00374361 0.0313595)
+(-0.0108659 -0.0100619 0.0317174)
+(0.000500777 -0.0164658 0.0316446)
+(0.00930788 -0.0219817 0.0311524)
+(0.0142165 -0.0257727 0.0303158)
+(0.0144817 -0.0272647 0.0292622)
+(0.0100648 -0.0262317 0.0281518)
+(0.00163773 -0.0228296 0.0271537)
+(-0.00951829 -0.0175735 0.0264196)
+(-0.0217073 -0.0112606 0.0260613)
+(-0.0330752 -0.00485079 0.0261336)
+(-0.041891 0.00067875 0.0266254)
+(-0.0468107 0.00448326 0.027462)
+(-0.047083 0.00598062 0.028516)
+(-0.0426648 0.00494171 0.0296269)
+(-0.0257894 0.00148572 0.0326185)
+(-0.0145295 -0.00356175 0.0334702)
+(-0.00225321 -0.00961902 0.0337777)
+(0.00916894 -0.0157628 0.0334943)
+(0.0179983 -0.0210591 0.0326633)
+(0.0228927 -0.0247045 0.0314112)
+(0.0231092 -0.026147 0.0299288)
+(0.0186164 -0.0251679 0.0284414)
+(0.010098 -0.0219152 0.0271755)
+(-0.00115098 -0.0168809 0.0263237)
+(-0.0134204 -0.0108287 0.0260157)
+(-0.0248438 -0.00467884 0.0262985)
+(-0.0336818 0.000631058 0.0271291)
+(-0.0385871 0.00428969 0.0283813)
+(-0.0388104 0.0057372 0.0298643)
+(-0.0343164 0.00475212 0.0313522)
+(-0.0157202 0.00113537 0.0340156)
+(-0.00440753 -0.00355135 0.0349218)
+(0.00784848 -0.00921186 0.0351683)
+(0.0191805 -0.0149833 0.0347177)
+(0.0278637 -0.0199885 0.0336388)
+(0.0325778 -0.0234682 0.0320958)
+(0.0326076 -0.0248956 0.0303236)
+(0.02795 -0.0240543 0.028592)
+(0.0193138 -0.0210712 0.0271643)
+(0.00801183 -0.0163974 0.0262579)
+(-0.00423749 -0.0107417 0.0260108)
+(-0.0155708 -0.00496406 0.0264608)
+(-0.0242625 5.45703e-05 0.0275394)
+(-0.0289874 0.00354723 0.0290826)
+(-0.0290239 0.0049794 0.0308554)
+(-0.024365 0.004132 0.0325877)
+(-0.00555408 0.000528266 0.0346053)
+(0.00576326 -0.00371399 0.0354946)
+(0.0179016 -0.00890242 0.0356787)
+(0.0290117 -0.0142461 0.0351298)
+(0.0374023 -0.0189329 0.0339316)
+(0.0417978 -0.0222521 0.0322664)
+(0.0415315 -0.0237012 0.0303878)
+(0.0366451 -0.0230606 0.0285816)
+(0.0278824 -0.0204264 0.0271226)
+(0.0165756 -0.0161968 0.026233)
+(0.0044438 -0.0110129 0.0260482)
+(-0.00666753 -0.00566306 0.0265965)
+(-0.0150665 -0.000962976 0.0277946)
+(-0.0194726 0.0023689 0.0294601)
+(-0.0192127 0.00382259 0.0313393)
+(-0.0143251 0.00317577 0.0331461)
+(0.00316241 -0.000243247 0.0342975)
+(0.0144356 -0.00402501 0.0351012)
+(0.0263768 -0.0087379 0.0352312)
+(0.0371668 -0.0136635 0.034668)
+(0.0451631 -0.0180531 0.0334972)
+(0.0491501 -0.0212415 0.0318973)
+(0.0485231 -0.0227457 0.0301116)
+(0.043379 -0.0223379 0.0284119)
+(0.0345006 -0.0200788 0.0270569)
+(0.0232378 -0.0163095 0.0262528)
+(0.0113031 -0.0116011 0.0261221)
+(0.000511878 -0.00666944 0.0266849)
+(-0.0074926 -0.00226669 0.0278555)
+(-0.01149 0.000934062 0.0294559)
+(-0.0108695 0.00244283 0.0312422)
+(-0.00572417 0.00202895 0.0329424)
+(0.00910344 -0.00106183 0.0331382)
+(0.0202902 -0.00443716 0.0338007)
+(0.0319848 -0.00874345 0.0338931)
+(0.0424052 -0.0133241 0.0334016)
+(0.0499655 -0.0174831 0.032401)
+(0.0535163 -0.02059 0.0310437)
+(0.0525193 -0.0221746 0.0295362)
+(0.0471276 -0.0219964 0.0281079)
+(0.0381619 -0.0200815 0.0269761)
+(0.0269854 -0.0167184 0.0263131)
+(0.0152973 -0.0124166 0.0262201)
+(0.0048757 -0.00782997 0.0267112)
+(-0.0026926 -0.00365809 0.0277118)
+(-0.00625365 -0.00053889 0.0290696)
+(-0.00526308 0.00105011 0.0305777)
+(0.000129698 0.000866029 0.0320065)
+(0.0113651 -0.00180294 0.0313025)
+(0.0224365 -0.00488779 0.0317896)
+(0.0338723 -0.00891829 0.0318666)
+(0.0439301 -0.0132798 0.031522)
+(0.051079 -0.0173097 0.0308083)
+(0.0542323 -0.020397 0.0298341)
+(0.0529121 -0.0220746 0.0287476)
+(0.0473208 -0.0220879 0.0277141)
+(0.0383095 -0.0204337 0.0268909)
+(0.0272484 -0.0173611 0.0264034)
+(0.015819 -0.0133352 0.0263258)
+(0.00576017 -0.00896789 0.0266701)
+(-0.00139663 -0.00492534 0.027384)
+(-0.00456009 -0.00182573 0.0283587)
+(-0.0032464 -0.000143599 0.0294458)
+(0.00234585 -0.000136032 0.0304795)
+(0.00960262 -0.00235376 0.029069)
+(0.0205471 -0.00530827 0.0293731)
+(0.0317516 -0.00923576 0.0294592)
+(0.0415089 -0.0135373 0.0293143)
+(0.0483336 -0.0175591 0.0289604)
+(0.0511886 -0.0206917 0.0284515)
+(0.0496413 -0.0224609 0.0278649)
+(0.0439288 -0.0225983 0.0272897)
+(0.0349205 -0.0210818 0.0268135)
+(0.0239862 -0.0181396 0.0265089)
+(0.0127883 -0.0142169 0.0264224)
+(0.00303018 -0.00990992 0.0265671)
+(-0.00380244 -0.00587547 0.0269212)
+(-0.00666761 -0.00273054 0.0274307)
+(-0.00512693 -0.000956575 0.0280178)
+(0.00058649 -0.000824688 0.0285931)
+(0.00408329 -0.00263036 0.0267777)
+(0.0149089 -0.00563452 0.0269191)
+(0.0259447 -0.00964745 0.0270373)
+(0.0355091 -0.0140571 0.0271143)
+(0.0421464 -0.0181933 0.0271386)
+(0.0448476 -0.0214291 0.0271063)
+(0.0432039 -0.0232746 0.0270222)
+(0.0374668 -0.0234499 0.026899)
+(0.0285097 -0.0219271 0.0267556)
+(0.0176945 -0.0189355 0.0266137)
+(0.00666541 -0.0149276 0.0264952)
+(-0.0028999 -0.0105126 0.0264181)
+(-0.00954503 -0.00636383 0.0263942)
+(-0.0122566 -0.00311554 0.026427)
+(-0.0106196 -0.001265 0.0265114)
+(-0.00488171 -0.00109503 0.0266346)
+(-0.00435385 -0.00259051 0.0247785)
+(0.00637883 -0.00581675 0.0248021)
+(0.0173343 -0.0100906 0.0249704)
+(0.0268433 -0.0147602 0.025258)
+(0.0334582 -0.0191158 0.025621)
+(0.0361737 -0.0224971 0.026004)
+(0.0345788 -0.0243919 0.0263488)
+(0.0289176 -0.0245131 0.0266026)
+(0.0200519 -0.022841 0.026727)
+(0.00932974 -0.0196275 0.026703)
+(-0.00161887 -0.0153591 0.0265343)
+(-0.0111286 -0.0106843 0.0262468)
+(-0.0177514 -0.00631605 0.0258841)
+(-0.0204775 -0.00292208 0.0255015)
+(-0.0188894 -0.00102184 0.025157)
+(-0.0132275 -0.000905806 0.0249031)
+(-0.0144248 -0.0022402 0.023377)
+(-0.00374482 -0.00582713 0.0233457)
+(0.00723098 -0.0104976 0.0235748)
+(0.0168301 -0.0155395 0.0240293)
+(0.0235912 -0.0201861 0.0246401)
+(0.0264869 -0.023733 0.0253141)
+(0.0250786 -0.0256428 0.0259487)
+(0.0195821 -0.0256262 0.0264471)
+(0.0108342 -0.0236845 0.0267336)
+(0.000164905 -0.0201106 0.0267645)
+(-0.0108039 -0.0154457 0.0265352)
+(-0.0204037 -0.0103989 0.0260807)
+(-0.0271729 -0.00573943 0.0254702)
+(-0.0300793 -0.00217958 0.0247965)
+(-0.028678 -0.000264069 0.0241622)
+(-0.0231808 -0.000285738 0.0236637)
+(-0.0245961 -0.00163274 0.0227875)
+(-0.0139205 -0.00566409 0.0227728)
+(-0.00282689 -0.0108067 0.0230639)
+(0.00699431 -0.0162763 0.0236165)
+(0.0140481 -0.0212413 0.0243465)
+(0.0172623 -0.0249488 0.0251428)
+(0.01615 -0.026837 0.0258839)
+(0.0108821 -0.0266198 0.0264572)
+(0.00226036 -0.0243293 0.0267753)
+(-0.00840433 -0.0203112 0.0267898)
+(-0.0194908 -0.0151744 0.0264986)
+(-0.0293127 -0.00969979 0.025946)
+(-0.0363747 -0.00472179 0.0252162)
+(-0.0395998 -0.0010011 0.0244201)
+(-0.0384947 0.000892966 0.0236791)
+(-0.033226 0.000670782 0.0231058)
+(-0.033318 -0.000860687 0.0230998)
+(-0.022598 -0.00535254 0.0231705)
+(-0.011307 -0.0109707 0.0235156)
+(-0.00116562 -0.0168586 0.0240825)
+(0.00628246 -0.0221209 0.024785)
+(0.00990514 -0.0259594 0.0255161)
+(0.0091533 -0.0277926 0.0261645)
+(0.00414297 -0.0273427 0.0266315)
+(-0.00436325 -0.0246771 0.0268459)
+(-0.0150722 -0.0201988 0.0267751)
+(-0.0263559 -0.0145866 0.0264299)
+(-0.0364981 -0.00869356 0.0258629)
+(-0.0439546 -0.00341807 0.0251604)
+(-0.0475884 0.000433924 0.0244294)
+(-0.0468438 0.00227307 0.0237811)
+(-0.0418326 0.00181807 0.0233143)
+(-0.0392616 -4.17049e-05 0.0242654)
+(-0.0284551 -0.00494002 0.0244774)
+(-0.0169174 -0.0109649 0.0248603)
+(-0.00640639 -0.0171978 0.0253556)
+(0.00147776 -0.022691 0.025888)
+(0.00553667 -0.0266111 0.0263765)
+(0.00515483 -0.0283642 0.0267468)
+(0.000391953 -0.0276848 0.0269423)
+(-0.00802705 -0.0246751 0.0269334)
+(-0.0188223 -0.0197904 0.0267213)
+(-0.0303528 -0.0137715 0.0263384)
+(-0.0408647 -0.00753331 0.0258429)
+(-0.0487574 -0.00202675 0.0253104)
+(-0.0528275 0.00190698 0.0248219)
+(-0.0524529 0.00366605 0.0244518)
+(-0.0476892 0.00298136 0.0242564)
+(-0.0415214 0.000699441 0.0261054)
+(-0.0305996 -0.00448942 0.0264932)
+(-0.0188032 -0.0107902 0.0268917)
+(-0.00792964 -0.0172423 0.0272403)
+(0.000365912 -0.0228648 0.027486)
+(0.00482239 -0.0268045 0.0275915)
+(0.00476379 -0.0284647 0.0275406)
+(0.000200587 -0.0275938 0.027341)
+(-0.00817272 -0.0243233 0.0270232)
+(-0.0190832 -0.0191482 0.0266354)
+(-0.0308724 -0.0128532 0.0262367)
+(-0.041747 -0.00639563 0.0258877)
+(-0.0500512 -0.000759636 0.0256418)
+(-0.0545189 0.00319378 0.0255364)
+(-0.0544676 0.00485978 0.0255875)
+(-0.0499034 0.00398347 0.0257873)
+(-0.0408268 -0.00121655 0.0283621)
+(-0.0295405 -0.00639599 0.0288378)
+(-0.0172413 -0.0125972 0.0290528)
+(-0.005803 -0.0188748 0.0289745)
+(0.00303322 -0.0242744 0.0286147)
+(0.00792411 -0.0279771 0.0280284)
+(0.00812753 -0.0294221 0.0273047)
+(0.00361407 -0.0283906 0.0265539)
+(-0.00492944 -0.0250385 0.02589)
+(-0.0162043 -0.019873 0.0254143)
+(-0.0284964 -0.0136774 0.025199)
+(-0.039936 -0.0073939 0.025277)
+(-0.0487813 -0.00198025 0.0256366)
+(-0.0536836 0.00173631 0.0262229)
+(-0.0538941 0.00318695 0.0269469)
+(-0.0493793 0.00214959 0.027698)
+(-0.0351365 -0.0010038 0.0305911)
+(-0.0237247 -0.00614869 0.0312264)
+(-0.011247 -0.0122813 0.0314059)
+(0.000395418 -0.0184668 0.0311023)
+(0.00943041 -0.023765 0.0303618)
+(0.0144844 -0.0273721 0.0292973)
+(0.0147905 -0.0287421 0.0280709)
+(0.0103036 -0.0276675 0.0268691)
+(0.00170637 -0.0243106 0.0258748)
+(-0.00969418 -0.0191795 0.0252393)
+(-0.0221649 -0.0130522 0.0250595)
+(-0.0338087 -0.00686056 0.0253627)
+(-0.0428527 -0.0015484 0.0261029)
+(-0.0479181 0.00207246 0.0271674)
+(-0.0482311 0.00344782 0.0283943)
+(-0.0437427 0.00236711 0.0295965)
+(-0.026471 -0.00132321 0.0327076)
+(-0.0149612 -0.00626017 0.0334592)
+(-0.00239424 -0.0121457 0.033582)
+(0.00931515 -0.0180828 0.0330575)
+(0.0183847 -0.0231689 0.0319657)
+(0.0234355 -0.0266326 0.0304727)
+(0.0237012 -0.0279497 0.028806)
+(0.0191426 -0.0269207 0.027219)
+(0.0104536 -0.0237009 0.0259534)
+(-0.00104512 -0.0187774 0.0252016)
+(-0.0136052 -0.0128969 0.0250783)
+(-0.0253161 -0.00695354 0.0256023)
+(-0.0343946 -0.0018535 0.0266939)
+(-0.0394566 0.00162375 0.028187)
+(-0.039729 0.00294592 0.0298543)
+(-0.0351689 0.0019106 0.0314417)
+(-0.0161499 -0.00212608 0.0343909)
+(-0.00458468 -0.0067134 0.0351976)
+(0.00796873 -0.0122111 0.0352513)
+(0.0195978 -0.0177811 0.034544)
+(0.0285324 -0.0225769 0.0331836)
+(0.0334142 -0.0258713 0.0313771)
+(0.0335024 -0.0271657 0.0293996)
+(0.0287851 -0.026264 0.0275519)
+(0.0199799 -0.0233022 0.0261153)
+(0.00842565 -0.0187281 0.0253084)
+(-0.00412112 -0.0132352 0.0252541)
+(-0.0157517 -0.00765876 0.0259608)
+(-0.0246951 -0.00284911 0.0273211)
+(-0.0295878 0.000458519 0.0291278)
+(-0.0296827 0.00175771 0.0311059)
+(-0.0249638 0.000849637 0.0329541)
+(-0.00574414 -0.00329015 0.0353856)
+(0.00582547 -0.00743936 0.0361779)
+(0.0182646 -0.0124674 0.0361606)
+(0.0296782 -0.0176078 0.0353366)
+(0.038329 -0.0220793 0.0338313)
+(0.0429017 -0.0252042 0.031874)
+(0.0427025 -0.0265096 0.0297625)
+(0.0377633 -0.0257976 0.0278182)
+(0.0288356 -0.0231754 0.026337)
+(0.0172767 -0.0190391 0.0255443)
+(0.00484407 -0.0140157 0.0255609)
+(-0.00657103 -0.00886889 0.0263845)
+(-0.0152304 -0.00438368 0.0278897)
+(-0.0198138 -0.00124584 0.0298474)
+(-0.0196212 6.41156e-05 0.0319595)
+(-0.0146805 -0.000654238 0.0339043)
+(0.00316316 -0.00463827 0.0355402)
+(0.0146855 -0.0083276 0.036251)
+(0.026927 -0.0128757 0.0361718)
+(0.0380228 -0.0175892 0.0353147)
+(0.046284 -0.0217518 0.0338104)
+(0.0504545 -0.0247328 0.0318878)
+(0.0499019 -0.0260812 0.0298396)
+(0.0447116 -0.0255924 0.0279774)
+(0.0356736 -0.0233398 0.0265846)
+(0.0241618 -0.0196631 0.0258733)
+(0.0119267 -0.0151195 0.025952)
+(0.000829402 -0.0103997 0.0268086)
+(-0.00744018 -0.00622358 0.028313)
+(-0.0116213 -0.00322987 0.030236)
+(-0.0110751 -0.00187707 0.0322849)
+(-0.00588339 -0.00237212 0.0341475)
+(0.00921711 -0.00596529 0.0348303)
+(0.0206475 -0.009243 0.0354048)
+(0.0326382 -0.0133739 0.0352821)
+(0.0433622 -0.0177283 0.0344808)
+(0.0511873 -0.0216444 0.0331231)
+(0.0549239 -0.024529 0.0314156)
+(0.0540055 -0.0259457 0.0296181)
+(0.0485732 -0.0256797 0.0280042)
+(0.0394538 -0.0237702 0.0268195)
+(0.0280339 -0.0205051 0.0262443)
+(0.0160496 -0.0163786 0.0263665)
+(0.00532422 -0.0120181 0.0271674)
+(-0.00250919 -0.0080887 0.0285253)
+(-0.00625625 -0.00519153 0.0302334)
+(-0.00534424 -0.00377037 0.0320315)
+(8.93878e-05 -0.00404255 0.0336457)
+(0.0114966 -0.00706927 0.0333624)
+(0.0228045 -0.0100463 0.0337667)
+(0.0345291 -0.0138863 0.0336256)
+(0.0448839 -0.0180039 0.0329604)
+(0.052293 -0.0217733 0.0318726)
+(0.0556299 -0.0246237 0.0305278)
+(0.0543891 -0.0261237 0.0291304)
+(0.0487607 -0.0260459 0.0278931)
+(0.0396015 -0.0244011 0.0270043)
+(0.0283039 -0.0214366 0.0265993)
+(0.0165858 -0.0176011 0.0267399)
+(0.0062297 -0.0134776 0.0274049)
+(-0.00118753 -0.00969505 0.028493)
+(-0.00453488 -0.00683221 0.0298385)
+(-0.0033005 -0.0053276 0.0312364)
+(0.0023291 -0.0054113 0.0324738)
+(0.00965411 -0.00778216 0.0313591)
+(0.0208276 -0.0106151 0.0315851)
+(0.0323115 -0.0143348 0.0314533)
+(0.042356 -0.018374 0.0309838)
+(0.0494322 -0.0221189 0.0302481)
+(0.0524646 -0.0250023 0.0293582)
+(0.0509938 -0.0265879 0.0284494)
+(0.0452452 -0.0266354 0.0276599)
+(0.0360936 -0.0251362 0.0271099)
+(0.0249305 -0.0223158 0.0268832)
+(0.0134532 -0.0186009 0.0270146)
+(0.00340752 -0.014556 0.027484)
+(-0.00367688 -0.0107981 0.0282201)
+(-0.00671971 -0.00790212 0.0291106)
+(-0.00525548 -0.0063117 0.0300199)
+(0.000494332 -0.00627002 0.0308095)
+(0.00396913 -0.00799536 0.0291254)
+(0.0150168 -0.0108628 0.029192)
+(0.026322 -0.0146511 0.0290958)
+(0.0361623 -0.0187822 0.0288517)
+(0.0430397 -0.0226285 0.0284968)
+(0.045909 -0.0256073 0.0280849)
+(0.0443357 -0.0272677 0.0276787)
+(0.0385607 -0.0273582 0.0273399)
+(0.029463 -0.0258637 0.0271202)
+(0.0184259 -0.0230089 0.0270531)
+(0.00712738 -0.0192258 0.0271488)
+(-0.00271392 -0.0150891 0.027393)
+(-0.00959951 -0.0112299 0.0277485)
+(-0.0124794 -0.00823836 0.0281609)
+(-0.0109128 -0.00657283 0.0285674)
+(-0.00513673 -0.00648792 0.0289061)
+(-0.00469402 -0.00767632 0.0270024)
+(0.00625556 -0.0107517 0.0269527)
+(0.0174715 -0.0147869 0.0269131)
+(0.0272447 -0.0191663 0.0268897)
+(0.0340875 -0.0232245 0.026886)
+(0.03696 -0.0263464 0.0269026)
+(0.0354272 -0.0280596 0.0269367)
+(0.0297239 -0.0281044 0.0269831)
+(0.0207182 -0.0264728 0.0270348)
+(0.00977927 -0.0234104 0.027084)
+(-0.00142975 -0.0193807 0.0271234)
+(-0.0112039 -0.0149958 0.0271469)
+(-0.018055 -0.0109246 0.027151)
+(-0.0209382 -0.00778973 0.027135)
+(-0.0194123 -0.00607116 0.0271011)
+(-0.013708 -0.00603175 0.0270546)
+(-0.015017 -0.00687354 0.0253147)
+(-0.00412271 -0.0102985 0.0252096)
+(0.00710677 -0.0147215 0.0252388)
+(0.0169604 -0.0194678 0.0253979)
+(0.0239381 -0.0238162 0.0256627)
+(0.0269796 -0.0271074 0.0259927)
+(0.0256241 -0.0288432 0.0263377)
+(0.0200796 -0.0287606 0.0266451)
+(0.0111898 -0.0268711 0.0268681)
+(0.00030643 -0.0234594 0.0269728)
+(-0.010916 -0.0190421 0.0269435)
+(-0.0207706 -0.0142904 0.0267845)
+(-0.0277567 -0.00992896 0.0265201)
+(-0.0308091 -0.00662451 0.0261905)
+(-0.0294607 -0.00488303 0.0258456)
+(-0.0239151 -0.00497088 0.0255381)
+(-0.0254278 -0.0057092 0.0243202)
+(-0.0145377 -0.00957223 0.024229)
+(-0.00319375 -0.0144648 0.0243289)
+(0.00687541 -0.0196409 0.0246046)
+(0.0141371 -0.0243135 0.0250141)
+(0.0174876 -0.0277743 0.0254951)
+(0.0164193 -0.0294992 0.0259742)
+(0.0110964 -0.0292269 0.0263786)
+(0.00232898 -0.0269978 0.0266465)
+(-0.00855002 -0.0231484 0.0267374)
+(-0.0198868 -0.0182616 0.0266375)
+(-0.0299569 -0.0130803 0.0263619)
+(-0.0372271 -0.00839438 0.0259526)
+(-0.0405888 -0.00492008 0.0254719)
+(-0.0395276 -0.0031893 0.0249929)
+(-0.0342037 -0.0034668 0.0245885)
+(-0.0343403 -0.00436063 0.0241702)
+(-0.0234027 -0.00868353 0.0241604)
+(-0.011861 -0.0140561 0.0243221)
+(-0.00147387 -0.0196592 0.0246307)
+(0.00617747 -0.0246409 0.0250393)
+(0.0099301 -0.0282457 0.0254856)
+(0.00921516 -0.0299278 0.0259017)
+(0.00414307 -0.0294324 0.0262241)
+(-0.00451422 -0.0268339 0.0264038)
+(-0.0154406 -0.0225248 0.0264135)
+(-0.0269751 -0.0171581 0.0262517)
+(-0.0373632 -0.0115497 0.0259431)
+(-0.0450232 -0.00655455 0.0255347)
+(-0.0487871 -0.00293596 0.0250885)
+(-0.0480795 -0.00124786 0.0246726)
+(-0.0430063 -0.00174854 0.0243501)
+(-0.0403967 -0.00303324 0.0248866)
+(-0.029367 -0.0077678 0.0250131)
+(-0.0175743 -0.0135577 0.0252184)
+(-0.00681537 -0.01952 0.0254714)
+(0.00127203 -0.0247484 0.0257334)
+(0.00545858 -0.0284498 0.0259648)
+(0.00510941 -0.0300637 0.0261301)
+(0.000279238 -0.0293458 0.0262042)
+(-0.00829683 -0.026404 0.0261758)
+(-0.0193151 -0.0216834 0.0260492)
+(-0.0311006 -0.0158995 0.0258438)
+(-0.0418606 -0.00993166 0.0255908)
+(-0.0499569 -0.00468954 0.0253288)
+(-0.0541548 -0.000974215 0.0250975)
+(-0.0538129 0.00064568 0.0249323)
+(-0.0489816 -7.77698e-05 0.0248583)
+(-0.0426743 -0.00192918 0.026359)
+(-0.0315222 -0.00696452 0.026656)
+(-0.0194635 -0.0130453 0.02688)
+(-0.00833543 -0.0192446 0.0269971)
+(0.000168041 -0.0246198 0.0269894)
+(0.0047543 -0.0283555 0.0268581)
+(0.00472762 -0.0298862 0.0266232)
+(9.36199e-05 -0.02898 0.0263204)
+(-0.00844249 -0.0257736 0.0259957)
+(-0.0195831 -0.0207522 0.0256987)
+(-0.0316346 -0.0146773 0.0254745)
+(-0.0427639 -0.00847233 0.0253572)
+(-0.0512763 -0.00308327 0.0253648)
+(-0.055874 0.00066647 0.0254962)
+(-0.0558546 0.00220298 0.0257312)
+(-0.0512193 0.00129108 0.0260342)
+(-0.0418189 -0.00167248 0.0241435)
+(-0.0302119 -0.00672936 0.0244695)
+(-0.0175784 -0.0127445 0.0244991)
+(-0.00584334 -0.0188009 0.024228)
+(0.00320719 -0.0239778 0.0236974)
+(0.00819728 -0.0274902 0.0229882)
+(0.00836974 -0.0288064 0.0222083)
+(0.00369982 -0.0277274 0.0214764)
+(-0.00510188 -0.024416 0.0209039)
+(-0.0166974 -0.0193734 0.020578)
+(-0.0293239 -0.013364 0.0205481)
+(-0.0410606 -0.00730158 0.0208191)
+(-0.0501204 -0.00211034 0.0213495)
+(-0.055122 0.00141628 0.0220588)
+(-0.0553014 0.0027383 0.0228388)
+(-0.0506299 0.00165322 0.0235709)
+(-0.0357523 -0.00158897 0.0260292)
+(-0.0240125 -0.00662366 0.0265099)
+(-0.011193 -0.0125857 0.0265005)
+(0.000752984 -0.0185663 0.0260024)
+(0.0100073 -0.0236563 0.0250915)
+(0.015163 -0.0270838 0.0239066)
+(0.0154376 -0.0283302 0.022628)
+(0.0107909 -0.0272069 0.0214503)
+(0.00192981 -0.0238834 0.0205527)
+(-0.00979857 -0.0188628 0.0200719)
+(-0.0226112 -0.0129062 0.0200811)
+(-0.0345589 -0.00691938 0.0205789)
+(-0.0438225 -0.00181505 0.0214896)
+(-0.0489895 0.00162655 0.0226746)
+(-0.049271 0.00287843 0.0239535)
+(-0.0446226 0.00174881 0.0251315)
+(-0.0266845 -0.00220493 0.027981)
+(-0.0148391 -0.00704377 0.0285753)
+(-0.00192168 -0.0127717 0.0285035)
+(0.0100996 -0.0185156 0.0277768)
+(0.0193951 -0.0234023 0.0265058)
+(0.0245516 -0.0266911 0.024884)
+(0.0247865 -0.0278842 0.0231583)
+(0.0200655 -0.0268012 0.0215914)
+(0.0111069 -0.0236054 0.0204218)
+(-0.000727362 -0.0187804 0.0198273)
+(-0.0136381 -0.0130576 0.0198987)
+(-0.0256612 -0.0073073 0.020625)
+(-0.0349658 -0.00240622 0.0218959)
+(-0.0401335 0.00089636 0.0235178)
+(-0.0403751 0.00209467 0.0252439)
+(-0.0356523 0.00100515 0.0268111)
+(-0.0159967 -0.0034265 0.0297031)
+(-0.00408866 -0.00792566 0.0303524)
+(0.00882371 -0.0132741 0.0302047)
+(0.0207732 -0.0186564 0.0292825)
+(0.029941 -0.0232547 0.0277264)
+(0.0349334 -0.0263719 0.0257732)
+(0.0349926 -0.0275365 0.0237202)
+(0.0301112 -0.0265722 0.02188)
+(0.0210318 -0.0236244 0.0205325)
+(0.00913473 -0.0191387 0.019883)
+(-0.00377114 -0.0137953 0.0200302)
+(-0.0157224 -0.00840637 0.020952)
+(-0.0248993 -0.00379389 0.0225081)
+(-0.0299026 -0.000663118 0.0244615)
+(-0.0299684 0.000506389 0.0265149)
+(-0.0250852 -0.000464483 0.0283556)
+(-0.00531551 -0.00506768 0.0309345)
+(0.00660244 -0.00913504 0.031572)
+(0.0194076 -0.0140163 0.0313462)
+(0.0311491 -0.0189673 0.0302916)
+(0.0400398 -0.0232358 0.0285687)
+(0.0447281 -0.0261749 0.02644)
+(0.0445026 -0.0273401 0.0242293)
+(0.039399 -0.0265549 0.0222732)
+(0.0301939 -0.0239376 0.0208693)
+(0.0182867 -0.0198834 0.0202313)
+(0.00548795 -0.0150069 0.0204566)
+(-0.00625535 -0.0100493 0.0215109)
+(-0.0151549 -0.00576679 0.0232337)
+(-0.019854 -0.00281445 0.0253628)
+(-0.0196349 -0.00164458 0.0275741)
+(-0.0145295 -0.00243631 0.0295306)
+(0.00373402 -0.00687863 0.0314875)
+(0.0156077 -0.0104878 0.0320483)
+(0.0282197 -0.0148855 0.0317544)
+(0.0396487 -0.0194011 0.0306505)
+(0.0481551 -0.0233486 0.0289048)
+(0.0524457 -0.0261301 0.026783)
+(0.0518697 -0.0273248 0.0246081)
+(0.046516 -0.0267519 0.0227111)
+(0.0371995 -0.0244973 0.0213806)
+(0.0253365 -0.0209011 0.0208193)
+(0.0127307 -0.016508 0.0211127)
+(0.00130003 -0.0119859 0.0222163)
+(-0.00721507 -0.00802454 0.0239621)
+(-0.0115163 -0.0052301 0.0260843)
+(-0.0109466 -0.00403078 0.0282598)
+(-0.00559126 -0.00461016 0.0301571)
+(0.00977529 -0.00858374 0.0312769)
+(0.0215571 -0.0117782 0.0317078)
+(0.0339194 -0.0157494 0.031366)
+(0.0449789 -0.0198917 0.0303036)
+(0.0530522 -0.023576 0.0286824)
+(0.0569121 -0.0262442 0.0267492)
+(0.0559732 -0.027493 0.0247981)
+(0.0503798 -0.0271332 0.0231261)
+(0.0409831 -0.0252182 0.0219876)
+(0.0292119 -0.0220366 0.0215561)
+(0.0168558 -0.01807 0.0218974)
+(0.00579471 -0.0139212 0.0229597)
+(-0.00228718 -0.0102234 0.0245811)
+(-0.00615757 -0.00754232 0.0265149)
+(-0.00522496 -0.00628897 0.0284666)
+(0.000370042 -0.00665515 0.0301388)
+(0.0118891 -0.0099235 0.0303334)
+(0.0235454 -0.0128097 0.0306009)
+(0.0356395 -0.0164764 0.0302388)
+(0.0463287 -0.0203645 0.0293023)
+(0.0539862 -0.0238832 0.0279339)
+(0.0574478 -0.0264999 0.026342)
+(0.0561889 -0.0278189 0.0247686)
+(0.0504026 -0.0276404 0.0234534)
+(0.0409693 -0.0259904 0.0225964)
+(0.0293235 -0.023117 0.0223282)
+(0.0172357 -0.0194549 0.0226899)
+(0.00654497 -0.0155607 0.0236264)
+(-0.00112092 -0.0120286 0.0249952)
+(-0.00459304 -0.0093991 0.0265877)
+(-0.00334051 -0.00807541 0.0281615)
+(0.00244735 -0.00826002 0.0294768)
+(0.00975316 -0.010694 0.0287996)
+(0.0212696 -0.0134254 0.0288951)
+(0.0331177 -0.016956 0.0285433)
+(0.0434923 -0.0207474 0.0277977)
+(0.0508144 -0.0242236 0.0267721)
+(0.0539709 -0.0268581 0.0256222)
+(0.0524837 -0.0282529 0.0245231)
+(0.0465805 -0.0281965 0.0236421)
+(0.0371597 -0.0266962 0.0231131)
+(0.0256538 -0.0239777 0.023017)
+(0.0138122 -0.020452 0.0233685)
+(0.00343612 -0.0166547 0.0241141)
+(-0.00389434 -0.0131652 0.0251403)
+(-0.00706139 -0.0105178 0.0262908)
+(-0.0055806 -0.00911815 0.0273902)
+(0.000323991 -0.00918047 0.0282712)
+(0.00369166 -0.0107778 0.0269091)
+(0.0150751 -0.0135314 0.02685)
+(0.026737 -0.0171151 0.0265374)
+(0.0369006 -0.0209822 0.0260189)
+(0.0440188 -0.0245451 0.0253735)
+(0.0470097 -0.0272644 0.0246993)
+(0.0454205 -0.0287288 0.0240988)
+(0.0394943 -0.0287166 0.0236633)
+(0.0301332 -0.0272284 0.0234593)
+(0.0187604 -0.0244878 0.0235178)
+(0.00710511 -0.0209093 0.0238301)
+(-0.00305977 -0.0170366 0.0243488)
+(-0.0101864 -0.0134604 0.0249947)
+(-0.013188 -0.0107281 0.0256695)
+(-0.0116054 -0.00925845 0.0262703)
+(-0.0056779 -0.00927635 0.0267056)
+(-0.00537374 -0.0101622 0.0249507)
+(0.00590384 -0.0131116 0.0247779)
+(0.0174677 -0.0169294 0.0245275)
+(0.0275559 -0.021033 0.0242376)
+(0.0346329 -0.0247989 0.0239523)
+(0.0376231 -0.0276568 0.0237148)
+(0.0360737 -0.0291743 0.0235613)
+(0.0302219 -0.0291217 0.023515)
+(0.0209584 -0.0275058 0.0235832)
+(0.00969159 -0.0245697 0.0237554)
+(-0.00186553 -0.0207575 0.0240057)
+(-0.011955 -0.0166483 0.0242959)
+(-0.0190405 -0.0128691 0.0245818)
+(-0.0220415 -0.00999796 0.0248197)
+(-0.0204988 -0.00847491 0.0249734)
+(-0.0146458 -0.00853302 0.0250194)
+(-0.0160634 -0.00894082 0.023224)
+(-0.00484833 -0.0122299 0.0229959)
+(0.00672064 -0.016427 0.0228211)
+(0.0168807 -0.020892 0.0227264)
+(0.0240854 -0.0249464 0.0227261)
+(0.0272397 -0.0279756 0.0228201)
+(0.0258657 -0.0295217 0.022994)
+(0.0201743 -0.0293503 0.0232213)
+(0.0110315 -0.0274865 0.0234675)
+(-0.000172567 -0.024211 0.0236952)
+(-0.0117346 -0.0200196 0.0238699)
+(-0.0218959 -0.0155492 0.0239649)
+(-0.0291092 -0.0114814 0.0239657)
+(-0.0322745 -0.00843856 0.0238722)
+(-0.0309075 -0.00688677 0.0236984)
+(-0.0252148 -0.00706355 0.0234707)
+(-0.0267496 -0.0072995 0.0219929)
+(-0.0155441 -0.0110203 0.0217762)
+(-0.00386777 -0.0156845 0.0216792)
+(0.00650041 -0.0205809 0.0217167)
+(0.0139822 -0.0249651 0.0218829)
+(0.0174405 -0.0281725 0.0221525)
+(0.0163512 -0.0297181 0.0224844)
+(0.0108817 -0.0293676 0.0228279)
+(0.00186435 -0.0271733 0.023131)
+(-0.00932986 -0.0234664 0.0233474)
+(-0.0209992 -0.0188081 0.0234444)
+(-0.0313686 -0.0139064 0.0234071)
+(-0.0388592 -0.00950862 0.0232413)
+(-0.0423287 -0.00628727 0.022972)
+(-0.0412464 -0.00473578 0.0226402)
+(-0.0357757 -0.00509163 0.0222964)
+(-0.0358042 -0.00548819 0.0214448)
+(-0.0245542 -0.00966713 0.0213045)
+(-0.0126845 -0.0148151 0.0212755)
+(-0.00200369 -0.0201469 0.0213622)
+(0.00586248 -0.0248522 0.0215513)
+(0.00971838 -0.0282175 0.021814)
+(0.00897945 -0.0297336 0.0221102)
+(0.00375973 -0.029171 0.0223949)
+(-0.00514641 -0.0266141 0.0226247)
+(-0.016385 -0.0224493 0.0227647)
+(-0.0282476 -0.0173074 0.0227937)
+(-0.0389297 -0.0119701 0.0227073)
+(-0.0468049 -0.00725102 0.0225184)
+(-0.0506722 -0.0038716 0.0222559)
+(-0.0499404 -0.00234941 0.0219597)
+(-0.0447193 -0.00291749 0.0216749)
+(-0.0418478 -0.00378271 0.0216619)
+(-0.0305059 -0.00837646 0.0216517)
+(-0.0183864 -0.013951 0.0216707)
+(-0.00733595 -0.0196562 0.021716)
+(0.000963332 -0.0246249 0.0217807)
+(0.00524997 -0.0281037 0.021855)
+(0.00487386 -0.0295659 0.0219274)
+(-0.000106195 -0.0287903 0.021987)
+(-0.00893233 -0.0258938 0.0220247)
+(-0.0202628 -0.0213143 0.0220348)
+(-0.0323752 -0.0157459 0.0220158)
+(-0.043427 -0.010035 0.0219706)
+(-0.0517354 -0.00505228 0.021906)
+(-0.0560335 -0.00155932 0.0218319)
+(-0.0556645 -9.09992e-05 0.0217595)
+(-0.0506831 -0.000872179 0.0216998)
+(-0.0439598 -0.0024428 0.02261)
+(-0.0324924 -0.00734484 0.0227635)
+(-0.0201047 -0.0132239 0.0228031)
+(-0.00868413 -0.0191836 0.0227228)
+(3.10433e-05 -0.0243179 0.0225348)
+(0.00471596 -0.0278483 0.0222677)
+(0.00465989 -0.0292403 0.0219623)
+(-0.00012709 -0.0282834 0.0216649)
+(-0.00891654 -0.025122 0.0214208)
+(-0.0203723 -0.0202342 0.0212673)
+(-0.0327529 -0.0143612 0.0212276)
+(-0.0441751 -0.00839566 0.0213078)
+(-0.0528994 -0.00324711 0.0214958)
+(-0.0575959 0.000297544 0.0217629)
+(-0.0575469 0.00169558 0.0220685)
+(-0.0527584 0.000732853 0.0223659)
+(-0.0425791 -4.92525e-05 0.0163261)
+(-0.0306172 -0.00501952 0.0164706)
+(-0.0176379 -0.0108935 0.0163325)
+(-0.00561851 -0.0167756 0.0159328)
+(0.00361141 -0.0217717 0.0153322)
+(0.00864879 -0.0251242 0.0146224)
+(0.00872921 -0.0263261 0.0139113)
+(0.00384189 -0.0251955 0.0133071)
+(-0.00526952 -0.0219033 0.012902)
+(-0.0172199 -0.0169475 0.0127574)
+(-0.0301925 -0.0110795 0.0128955)
+(-0.0422137 -0.00519134 0.0132952)
+(-0.0514531 -0.000180725 0.0138957)
+(-0.0565019 0.00318636 0.0146056)
+(-0.0565891 0.00439415 0.0153167)
+(-0.0516999 0.0032575 0.0159209)
+(-0.0359824 -0.000141229 0.0176351)
+(-0.0238815 -0.00509703 0.0179288)
+(-0.0107121 -0.0109296 0.0177486)
+(0.00151919 -0.0167498 0.0171221)
+(0.0109508 -0.0216729 0.0161445)
+(0.0161489 -0.0249525 0.0149649)
+(0.0163246 -0.0260925 0.0137628)
+(0.0114526 -0.0249206 0.0127211)
+(0.00227407 -0.0216137 0.0119984)
+(-0.00981557 -0.0166723 0.0117047)
+(-0.0229783 -0.0108454 0.0118847)
+(-0.0352116 -0.00501887 0.0125111)
+(-0.0446526 -8.12051e-05 0.0134885)
+(-0.0498621 0.00321276 0.0146682)
+(-0.0500444 0.00435845 0.0158705)
+(-0.0451703 0.0031802 0.0169124)
+(-0.0263975 -0.00102594 0.0191589)
+(-0.0141816 -0.00579401 0.0195626)
+(-0.000907361 -0.0114023 0.019316)
+(0.0114031 -0.016996 0.0184567)
+(0.0208759 -0.0217247 0.0171154)
+(0.026071 -0.0248718 0.0154965)
+(0.0262 -0.0259612 0.0138464)
+(0.0212445 -0.0248282 0.0124162)
+(0.0119586 -0.0216439 0.0114236)
+(-0.000246122 -0.0168899 0.0110197)
+(-0.0135139 -0.0112869 0.011266)
+(-0.0258264 -0.00568682 0.0121252)
+(-0.0353086 -0.000943537 0.0134663)
+(-0.0405149 0.00221764 0.0150853)
+(-0.0406503 0.0033124 0.0167357)
+(-0.0356928 0.00217291 0.0181662)
+(-0.015284 -0.00256862 0.0206667)
+(-0.00299495 -0.00700428 0.0211249)
+(0.0102833 -0.0122397 0.0207977)
+(0.0225279 -0.0174766 0.019735)
+(0.0318752 -0.0219193 0.0180986)
+(0.0369041 -0.0248945 0.0161378)
+(0.0368514 -0.0259522 0.0141509)
+(0.0317265 -0.0249325 0.0124404)
+(0.0223091 -0.0219893 0.0112666)
+(0.010031 -0.0175674 0.0108083)
+(-0.00324093 -0.0123371 0.0111352)
+(-0.0154876 -0.00709356 0.0121976)
+(-0.0248441 -0.00263646 0.0138339)
+(-0.0298839 0.000352503 0.0157949)
+(-0.0298375 0.00141531 0.0177821)
+(-0.0247106 0.000389041 0.0194929)
+(-0.00433346 -0.00453436 0.0219303)
+(0.00797592 -0.00854355 0.0223789)
+(0.0211565 -0.013314 0.0219691)
+(0.0332004 -0.0181185 0.0207636)
+(0.0422745 -0.022227 0.0189458)
+(0.0469992 -0.0250171 0.0167924)
+(0.0466576 -0.0260669 0.0146313)
+(0.0413031 -0.0252177 0.0127913)
+(0.0317503 -0.0225974 0.0115526)
+(0.0194517 -0.0186017 0.0111036)
+(0.00627727 -0.0138361 0.0115129)
+(-0.00576867 -0.00902494 0.0127183)
+(-0.0148518 -0.00490223 0.0145362)
+(-0.0195873 -0.00209866 0.0166898)
+(-0.0192518 -0.00104397 0.0188514)
+(-0.0138953 -0.00189977 0.0206916)
+(0.00478803 -0.00662389 0.022757)
+(0.0170617 -0.0101775 0.0231336)
+(0.030058 -0.014462 0.0226521)
+(0.0417968 -0.018824 0.021386)
+(0.0504915 -0.022601 0.0195279)
+(0.0548204 -0.025221 0.0173608)
+(0.0541268 -0.0262879 0.0152144)
+(0.0485174 -0.0256404 0.0134155)
+(0.038846 -0.0233756 0.0122378)
+(0.0265829 -0.0198352 0.0118607)
+(0.0135928 -0.0155555 0.0123417)
+(0.00185195 -0.0111869 0.0136077)
+(-0.0068517 -0.00739586 0.015466)
+(-0.0111912 -0.00476265 0.0176335)
+(-0.0105036 -0.00369099 0.0197804)
+(-0.00489232 -0.00434507 0.0215795)
+(0.0106929 -0.00851917 0.0230199)
+(0.0228803 -0.0116574 0.0232732)
+(0.0356334 -0.0155087 0.0227417)
+(0.0470092 -0.0194858 0.0215065)
+(0.0552763 -0.0229844 0.0197556)
+(0.059178 -0.0254751 0.0177554)
+(0.0581227 -0.0265814 0.0158105)
+(0.0522722 -0.026136 0.0142167)
+(0.0425169 -0.0242053 0.0132168)
+(0.03034 -0.0210802 0.012963)
+(0.017593 -0.0172336 0.013494)
+(0.00621534 -0.0132502 0.0147292)
+(-0.00206055 -0.00973767 0.0164805)
+(-0.0059728 -0.00723389 0.0184812)
+(-0.00492353 -0.00612281 0.0204265)
+(0.000928836 -0.00657463 0.0220203)
+(0.0124827 -0.00993173 0.0226776)
+(0.0245463 -0.0127581 0.0227749)
+(0.0370344 -0.016295 0.0222226)
+(0.0480445 -0.0200029 0.0211051)
+(0.0559008 -0.0233188 0.0195924)
+(0.0594091 -0.0257407 0.0179146)
+(0.0580375 -0.0269027 0.0163271)
+(0.0519963 -0.0266291 0.0150715)
+(0.0422047 -0.0249601 0.014339)
+(0.0301516 -0.0221468 0.0142411)
+(0.0176696 -0.0186147 0.0147929)
+(0.00665778 -0.0149006 0.0159105)
+(-0.00120714 -0.0115711 0.0174238)
+(-0.00472589 -0.00913616 0.0191021)
+(-0.0033605 -0.00796925 0.02069)
+(0.00268251 -0.00824909 0.0219455)
+(0.00988463 -0.0106466 0.0217811)
+(0.0218058 -0.0133119 0.0217134)
+(0.0340475 -0.0167011 0.0211728)
+(0.0447449 -0.0202969 0.0202418)
+(0.0522696 -0.0235532 0.019062)
+(0.055478 -0.0259773 0.0178129)
+(0.0538839 -0.0272028 0.0166845)
+(0.0477313 -0.0270445 0.0158486)
+(0.0379566 -0.0255249 0.0154324)
+(0.026046 -0.0228727 0.0154995)
+(0.0138105 -0.0194887 0.0160397)
+(0.00311145 -0.0158869 0.016971)
+(-0.00442188 -0.0126171 0.0181514)
+(-0.00764078 -0.0101799 0.0194011)
+(-0.00605292 -0.00894925 0.0205298)
+(0.000101308 -0.00911357 0.0213655)
+(0.00329308 -0.0105549 0.0204669)
+(0.0150748 -0.0132347 0.0202503)
+(0.0271264 -0.0166651 0.019752)
+(0.0376116 -0.0203228 0.0190479)
+(0.0449346 -0.0236519 0.0182451)
+(0.0479823 -0.0261488 0.0174656)
+(0.0462931 -0.027436 0.0168281)
+(0.0401255 -0.0273189 0.0164295)
+(0.0304181 -0.025814 0.0163307)
+(0.018647 -0.0231474 0.0165467)
+(0.00660185 -0.0197223 0.0170448)
+(-0.00388494 -0.016059 0.0177493)
+(-0.0112165 -0.0127164 0.0185528)
+(-0.0142749 -0.0102062 0.0193328)
+(-0.0125921 -0.00891363 0.0199705)
+(-0.00642291 -0.00903649 0.0203687)
+(-0.00628952 -0.00967053 0.0189363)
+(0.00537724 -0.0125381 0.0186095)
+(0.0173237 -0.0161926 0.0181775)
+(0.0277298 -0.0200767 0.0177061)
+(0.0350115 -0.0236 0.0172669)
+(0.0380622 -0.0262292 0.0169267)
+(0.0364198 -0.0275669 0.0167371)
+(0.0303357 -0.0274108 0.0167271)
+(0.0207359 -0.0257832 0.0168982)
+(0.00907994 -0.0229293 0.0172245)
+(-0.00285997 -0.0192803 0.0176564)
+(-0.0132675 -0.0153908 0.0181283)
+(-0.0205579 -0.0118539 0.0185681)
+(-0.0236195 -0.0092112 0.0189088)
+(-0.0219836 -0.00786781 0.0190985)
+(-0.015898 -0.00802953 0.0191081)
+(-0.0174048 -0.00812809 0.0174238)
+(-0.00581114 -0.011328 0.0170423)
+(0.00613145 -0.0153554 0.0166906)
+(0.0166034 -0.019596 0.0164222)
+(0.0240106 -0.0234053 0.016278)
+(0.0272275 -0.0262063 0.0162797)
+(0.0257667 -0.0275757 0.016427)
+(0.0198519 -0.0273061 0.0166975)
+(0.0103834 -0.0254376 0.0170501)
+(-0.00119921 -0.0222515 0.0174312)
+(-0.0131351 -0.01823 0.017783)
+(-0.0236084 -0.013984 0.0180518)
+(-0.0310245 -0.0101611 0.0181966)
+(-0.0342524 -0.00734622 0.0181953)
+(-0.0327983 -0.00597094 0.0180479)
+(-0.0268821 -0.00624591 0.017777)
+(-0.0283602 -0.00616233 0.0161606)
+(-0.0167866 -0.00978865 0.0157883)
+(-0.00474619 -0.014281 0.0155187)
+(0.00592655 -0.018954 0.015393)
+(0.0136071 -0.0230975 0.0154302)
+(0.0171281 -0.0260837 0.0156245)
+(0.0159559 -0.027461 0.0159462)
+(0.0102706 -0.0270211 0.0163465)
+(0.000937242 -0.0248297 0.0167644)
+(-0.0106251 -0.0212175 0.0171365)
+(-0.0226587 -0.0167313 0.0174061)
+(-0.0333329 -0.0120529 0.0175322)
+(-0.0410224 -0.00789552 0.0174956)
+(-0.0445546 -0.00489522 0.0173016)
+(-0.0433894 -0.00351177 0.0169797)
+(-0.0377025 -0.00395713 0.016579)
+(-0.0374868 -0.00407252 0.015339)
+(-0.0258772 -0.00815443 0.0150384)
+(-0.0136522 -0.0131328 0.0148404)
+(-0.00267425 -0.0182484 0.0147752)
+(0.00538563 -0.0227235 0.0148526)
+(0.00930238 -0.02588 0.0150608)
+(0.00848217 -0.0272404 0.015368)
+(0.00305139 -0.0265989 0.0157274)
+(-0.00616352 -0.024052 0.0160845)
+(-0.0177617 -0.0199844 0.016385)
+(-0.0299798 -0.0150123 0.016583)
+(-0.0409593 -0.00989129 0.0166486)
+(-0.0490283 -0.00540211 0.0165715)
+(-0.0529564 -0.00223128 0.0163635)
+(-0.0521431 -0.000864646 0.0160562)
+(-0.0467108 -0.00151162 0.0156964)
+(-0.043394 -0.00217688 0.0150829)
+(-0.0316981 -0.00667419 0.0149058)
+(-0.0192297 -0.0120858 0.014758)
+(-0.00788868 -0.0175866 0.0146619)
+(0.000598861 -0.0223402 0.0146323)
+(0.00494275 -0.0256262 0.0146735)
+(0.00448417 -0.0269473 0.0147793)
+(-0.000705562 -0.0261038 0.0149335)
+(-0.00983672 -0.0232229 0.0151128)
+(-0.0215212 -0.0187401 0.0152899)
+(-0.0339825 -0.0133347 0.0154378)
+(-0.0453252 -0.0078283 0.015534)
+(-0.0538221 -0.00306041 0.0155639)
+(-0.0581774 0.000240024 0.0155227)
+(-0.0577258 0.0015674 0.0154169)
+(-0.0525344 0.000718266 0.0152624)
+(-0.045182 -0.000764075 0.0154299)
+(-0.0333624 -0.00557334 0.0154091)
+(-0.0206292 -0.0112995 0.0152823)
+(-0.00892244 -0.0170694 0.0150688)
+(-2.40392e-05 -0.022006 0.0148012)
+(0.00471337 -0.0253608 0.01452)
+(0.00457105 -0.0266262 0.0142682)
+(-0.000427837 -0.025611 0.0140841)
+(-0.00952264 -0.0224684 0.0139956)
+(-0.0213308 -0.0176737 0.0140164)
+(-0.0340571 -0.0119537 0.0141433)
+(-0.0457656 -0.0061779 0.0143568)
+(-0.0546734 -0.0012269 0.0146246)
+(-0.0594223 0.00214246 0.0149057)
+(-0.0592869 0.00341406 0.0151575)
+(-0.0542862 0.00239298 0.0153415)
+(-0.0429915 0.00340601 0.00610029)
+(-0.0306946 -0.00152678 0.00605951)
+(-0.0174104 -0.00732598 0.0057968)
+(-0.00516265 -0.0131074 0.00535213)
+(0.00418445 -0.0179921 0.00479319)
+(0.00920997 -0.0212396 0.00420507)
+(0.00915126 -0.0223587 0.00367732)
+(0.00401869 -0.0211805 0.00329033)
+(-0.00540682 -0.0178829 0.00310301)
+(-0.0176924 -0.0129648 0.00314389)
+(-0.03097 -0.00717176 0.00340672)
+(-0.0432198 -0.00138441 0.00385146)
+(-0.0525764 0.00351491 0.00441038)
+(-0.0576133 0.00677716 0.00499841)
+(-0.0575611 0.00790249 0.00552603)
+(-0.0524265 0.00671824 0.00591296)
+(-0.035792 0.00311912 0.00668722)
+(-0.0233514 -0.00180114 0.00678989)
+(-0.00987739 -0.00756506 0.00648317)
+(0.00257747 -0.0132939 0.00581377)
+(0.0121175 -0.0181168 0.00488359)
+(0.0172923 -0.0213026 0.00383427)
+(0.0173165 -0.0223697 0.00282558)
+(0.0121879 -0.0211567 0.00201107)
+(0.00268672 -0.017847 0.00151475)
+(-0.00974262 -0.0129413 0.00141215)
+(-0.0232103 -0.00718325 0.00171887)
+(-0.0356673 -0.00144824 0.00238823)
+(-0.0452168 0.00338931 0.00331833)
+(-0.0504028 0.00658975 0.00436758)
+(-0.0504334 0.00766268 0.00537626)
+(-0.0453026 0.00644348 0.00619082)
+(-0.0256536 0.00203442 0.0075848)
+(-0.013089 -0.00270103 0.00779389)
+(0.000494347 -0.00824605 0.00741881)
+(0.0130271 -0.0137553 0.00651669)
+(0.0226017 -0.0183913 0.0052249)
+(0.0277626 -0.0214516 0.00374012)
+(0.0277264 -0.0224733 0.00228838)
+(0.0225001 -0.021302 0.00109069)
+(0.0128788 -0.0181148 0.000329356)
+(0.000325264 -0.0133936 0.000120259)
+(-0.0132518 -0.0078542 0.00049524)
+(-0.0257868 -0.00233859 0.00139723)
+(-0.0353708 0.00231208 0.00268894)
+(-0.0405427 0.00538664 0.00417374)
+(-0.0405128 0.0064139 0.00562557)
+(-0.0352843 0.00523627 0.00682338)
+(-0.0141203 0.000317146 0.00865793)
+(-0.00147004 -0.00408938 0.00892022)
+(0.0121253 -0.00926522 0.00846285)
+(0.0245948 -0.0144213 0.0073555)
+(0.0340405 -0.0187739 0.00576678)
+(0.0390263 -0.0216637 0.00393857)
+(0.0387957 -0.0226538 0.00214917)
+(0.0333849 -0.0215944 0.000670953)
+(0.0236174 -0.0186456 -0.000271063)
+(0.010978 -0.0142531 -0.000533472)
+(-0.00261132 -0.00908252 -7.62997e-05)
+(-0.015083 -0.00391998 0.0010309)
+(-0.024538 0.000447195 0.00261959)
+(-0.0295347 0.003351 0.00444792)
+(-0.0293101 0.00434632 0.00623752)
+(-0.0238971 0.00328047 0.00771589)
+(-0.00294753 -0.0017712 0.00974427)
+(0.00973678 -0.00575477 0.00999852)
+(0.0232452 -0.0104674 0.00945753)
+(0.0355199 -0.0151904 0.00820372)
+(0.0446927 -0.0192064 0.00642799)
+(0.0493691 -0.0219068 0.00440068)
+(0.0488394 -0.0228837 0.00243035)
+(0.0431856 -0.0219894 0.000816929)
+(0.0332679 -0.0193586 -0.000193991)
+(0.0205942 -0.0153888 -0.000448489)
+(0.00709174 -0.0106812 9.22354e-05)
+(-0.00518524 -0.00595164 0.00134592)
+(-0.0143671 -0.0019214 0.00312173)
+(-0.0190542 0.000792796 0.00514929)
+(-0.0185304 0.00177476 0.00711988)
+(-0.0128743 0.000873909 0.00873343)
+(0.0061647 -0.00391267 0.0106783)
+(0.0188263 -0.00744365 0.0108646)
+(0.032162 -0.0116695 0.0102515)
+(0.0441401 -0.0159457 0.00893233)
+(0.0529376 -0.0196228 0.00710801)
+(0.0572172 -0.0221439 0.0050562)
+(0.0563295 -0.0231282 0.00308921)
+(0.050411 -0.0224269 0.00150641)
+(0.0403622 -0.0201453 0.000548766)
+(0.0277111 -0.0166278 0.00036212)
+(0.0143813 -0.0124069 0.000974964)
+(0.00240098 -0.00812419 0.00229406)
+(-0.00640553 -0.00443304 0.00411861)
+(-0.0106956 -0.00189845 0.00617078)
+(-0.00981375 -0.000909219 0.00813807)
+(-0.00389305 -0.00161701 0.00972092)
+(0.0118303 -0.00578129 0.0113168)
+(0.0244159 -0.00889895 0.0113855)
+(0.0375191 -0.0126886 0.0107227)
+(0.0491439 -0.0165721 0.00942934)
+(0.057521 -0.0199597 0.00770224)
+(0.0613768 -0.0223387 0.00580428)
+(0.0601267 -0.0233498 0.00402431)
+(0.0539623 -0.02284 0.00263327)
+(0.0438215 -0.0208857 0.00184293)
+(0.0312462 -0.0177813 0.0017737)
+(0.0181488 -0.0139967 0.00243621)
+(0.00652193 -0.0101068 0.00372968)
+(-0.00186394 -0.0067053 0.00545717)
+(-0.00573017 -0.00431301 0.00735559)
+(-0.00448593 -0.00329703 0.00913584)
+(0.00168063 -0.0038131 0.0105268)
+(0.0131872 -0.00709266 0.0115609)
+(0.0256549 -0.00989918 0.0114804)
+(0.0385016 -0.0133695 0.010798)
+(0.0497701 -0.0169743 0.00961749)
+(0.0577454 -0.0201659 0.00811859)
+(0.0612152 -0.0224616 0.00652937)
+(0.0596534 -0.0235147 0.00509166)
+(0.0532992 -0.0231659 0.0040243)
+(0.0431195 -0.021467 0.00348983)
+(0.0306621 -0.0186737 0.00356972)
+(0.0178213 -0.0152084 0.00425193)
+(0.00655083 -0.0115976 0.00543265)
+(-0.00143318 -0.00839222 0.00693207)
+(-0.00491331 -0.00608329 0.00852182)
+(-0.00335749 -0.00502519 0.00995976)
+(0.00299871 -0.0053801 0.0110269)
+(0.0100285 -0.00764721 0.0113724)
+(0.0223545 -0.0102921 0.0111337)
+(0.0349595 -0.0136088 0.0104646)
+(0.045923 -0.017091 0.00946691)
+(0.0535764 -0.02021 0.00829242)
+(0.0567565 -0.0224939 0.00711983)
+(0.0549813 -0.0235978 0.00612753)
+(0.0485224 -0.0233548 0.00546657)
+(0.0383627 -0.0218007 0.00523764)
+(0.0260471 -0.0191691 0.00547573)
+(0.0134482 -0.0158577 0.00614471)
+(0.00248284 -0.0123696 0.00714277)
+(-0.00517928 -0.00923702 0.00831789)
+(-0.00836976 -0.00693985 0.00949103)
+(-0.0066006 -0.00583068 0.0104835)
+(-0.00013985 -0.00607952 0.0111441)
+(0.00283408 -0.00736053 0.0107801)
+(0.0150162 -0.010018 0.0103982)
+(0.0274311 -0.0133699 0.00977328)
+(0.0381873 -0.0169046 0.00900039)
+(0.0456478 -0.0200852 0.00819714)
+(0.0486786 -0.0224306 0.00748565)
+(0.0468206 -0.0235864 0.00697415)
+(0.0403581 -0.0233781 0.00674049)
+(0.0302744 -0.021836 0.00682034)
+(0.0181028 -0.019192 0.00720171)
+(0.00569413 -0.0158457 0.00782663)
+(-0.00506391 -0.0123053 0.00859999)
+(-0.0125331 -0.00911116 0.00940393)
+(-0.0155745 -0.00675233 0.0101159)
+(-0.0137227 -0.00559091 0.0106275)
+(-0.00725833 -0.00580491 0.0108607)
+(-0.00730189 -0.00627623 0.0098754)
+(0.004756 -0.00911848 0.00938702)
+(0.0170615 -0.0126891 0.00883032)
+(0.0277398 -0.0164433 0.00829003)
+(0.0351657 -0.0198106 0.0078483)
+(0.0382104 -0.0222814 0.00757222)
+(0.0364129 -0.0234825 0.00750373)
+(0.0300481 -0.0232322 0.00765326)
+(0.0200846 -0.0215676 0.00799819)
+(0.00803742 -0.0187391 0.00848613)
+(-0.00426171 -0.0151743 0.00904291)
+(-0.0149418 -0.0114147 0.00958374)
+(-0.0223764 -0.00803384 0.0100262)
+(-0.0254319 -0.00554932 0.0103027)
+(-0.0236407 -0.00434238 0.0103711)
+(-0.0172742 -0.00459805 0.010221)
+(-0.0188368 -0.00455929 0.00879751)
+(-0.00686447 -0.00773041 0.00825559)
+(0.00542902 -0.0116701 0.00778087)
+(0.0161706 -0.0157774 0.00744558)
+(0.0237254 -0.019428 0.00730065)
+(0.0269452 -0.0220691 0.00736799)
+(0.0253421 -0.0233018 0.0076373)
+(0.0191616 -0.0229396 0.00806759)
+(0.00934426 -0.0210366 0.0085935)
+(-0.00261721 -0.0178795 0.00913509)
+(-0.0149042 -0.0139459 0.00960998)
+(-0.0256475 -0.00983338 0.00994584)
+(-0.0332112 -0.0061691 0.0100914)
+(-0.0364418 -0.00351392 0.0100244)
+(-0.0348452 -0.00227511 0.00975492)
+(-0.0286631 -0.0026426 0.00932405)
+(-0.0300143 -0.00247102 0.00771157)
+(-0.0180758 -0.00606506 0.00717731)
+(-0.00569515 -0.010468 0.00678588)
+(0.00524131 -0.0150082 0.00659683)
+(0.013069 -0.0189956 0.00663881)
+(0.0165981 -0.0218261 0.00690532)
+(0.0152939 -0.0230719 0.00735575)
+(0.00935627 -0.0225448 0.00792156)
+(-0.000311172 -0.0203239 0.00851675)
+(-0.0122386 -0.0167441 0.00905081)
+(-0.0246126 -0.0123475 0.00944247)
+(-0.0355508 -0.00780205 0.00963207)
+(-0.0433875 -0.0038008 0.00959062)
+(-0.0469277 -0.000955969 0.00932431)
+(-0.0456302 0.000296249 0.00887364)
+(-0.0396908 -0.00023617 0.00830728)
+(-0.0391316 -0.000329336 0.00678283)
+(-0.0271702 -0.00437596 0.00631633)
+(-0.0146165 -0.00926576 0.0059969)
+(-0.00338332 -0.0142529 0.0058731)
+(0.00481964 -0.0185793 0.00596368)
+(0.00874554 -0.0215893 0.00625477)
+(0.00779913 -0.0228279 0.00670202)
+(0.00212596 -0.0221079 0.00723742)
+(-0.00741067 -0.0195378 0.00777956)
+(-0.0193609 -0.0155057 0.00824597)
+(-0.0319078 -0.0106224 0.00856567)
+(-0.0431428 -0.0056299 0.00868994)
+(-0.0513549 -0.00128943 0.00859975)
+(-0.0552921 0.00173517 0.00830874)
+(-0.0543524 0.00298027 0.00786121)
+(-0.0486775 0.0022549 0.00732535)
+(-0.0447996 0.00153967 0.00615152)
+(-0.032762 -0.00292031 0.00580262)
+(-0.0199759 -0.00824641 0.00553296)
+(-0.00838927 -0.0136264 0.00538352)
+(0.000234232 -0.0182424 0.00537698)
+(0.00458382 -0.0213947 0.00551428)
+(0.00399977 -0.0226067 0.00577454)
+(-0.00142755 -0.0216953 0.00611817)
+(-0.0108723 -0.0187979 0.00649294)
+(-0.0228986 -0.0143526 0.00684185)
+(-0.035678 -0.00903304 0.00711178)
+(-0.0472664 -0.00364755 0.00726157)
+(-0.0558993 0.000982745 0.00726834)
+(-0.0602602 0.00414982 0.00713102)
+(-0.0596829 0.00536832 0.00687051)
+(-0.0542537 0.00445134 0.00652653)
+(-0.0461549 0.00285137 0.0059122)
+(-0.0339995 -0.00191979 0.00571283)
+(-0.0209568 -0.00756524 0.0054631)
+(-0.00901398 -0.0132241 0.00520101)
+(1.12972e-05 -0.0180362 0.0049664)
+(0.00474702 -0.0212719 0.00479497)
+(0.0044747 -0.022442 0.00471283)
+(-0.000762779 -0.0213696 0.00473254)
+(-0.0101685 -0.0182168 0.00485115)
+(-0.0223125 -0.0134604 0.00505061)
+(-0.0353485 -0.00782134 0.00530054)
+(-0.0472933 -0.00215672 0.00556284)
+(-0.056328 0.00266982 0.00579755)
+(-0.0610752 0.00592035 0.0059689)
+(-0.0608095 0.0070968 0.00605082)
+(-0.05557 0.00601868 0.0060309)
+(-0.0429934 0.00816811 -0.00497719)
+(-0.0304324 0.00321791 -0.00517899)
+(-0.0169307 -0.00258434 -0.00550408)
+(-0.00454519 -0.00835391 -0.00590302)
+(0.00483903 -0.0132137 -0.00631511)
+(0.00979535 -0.016427 -0.00667761)
+(0.00957161 -0.0175078 -0.00693528)
+(0.00420325 -0.016293 -0.00704883)
+(-0.00549293 -0.0129662 -0.00700094)
+(-0.0180428 -0.00803081 -0.00679892)
+(-0.0315382 -0.00223497 -0.00647356)
+(-0.0439259 0.00354037 -0.00607446)
+(-0.0533195 0.0084147 -0.00566241)
+(-0.058287 0.0116428 -0.00530013)
+(-0.0580695 0.01273 -0.00504274)
+(-0.052699 0.0115094 -0.00492935)
+(-0.0352099 0.0076966 -0.00514792)
+(-0.0225032 0.00276312 -0.00521104)
+(-0.00881595 -0.00300345 -0.00558076)
+(0.00376665 -0.00872386 -0.00620082)
+(0.0133295 -0.0135285 -0.00697683)
+(0.0184189 -0.0166892 -0.00779064)
+(0.0182623 -0.0177278 -0.0085183)
+(0.0128849 -0.0164876 -0.009049)
+(0.00310487 -0.013156 -0.00930193)
+(-0.0095909 -0.00823718 -0.00923862)
+(-0.023272 -0.00247673 -0.00886874)
+(-0.0358569 0.00324969 -0.00824864)
+(-0.0454292 0.00806897 -0.00747273)
+(-0.0505295 0.0112443 -0.00665912)
+(-0.050379 0.012289 -0.00593162)
+(-0.0449993 0.0110428 -0.00540096)
+(-0.024566 0.00651118 -0.0049792)
+(-0.0117274 0.00176521 -0.00493931)
+(0.00207 -0.00378246 -0.00537688)
+(0.0147243 -0.00928598 -0.00622532)
+(0.0243096 -0.0139088 -0.00735545)
+(0.0293686 -0.0169504 -0.00859519)
+(0.0291334 -0.0179507 -0.00975578)
+(0.0236412 -0.0167588 -0.0106605)
+(0.0137276 -0.0135547 -0.0111717)
+(0.000899738 -0.00882314 -0.0112114)
+(-0.0128917 -0.00328128 -0.0107738)
+(-0.0255484 0.00222843 -0.00992542)
+(-0.035143 0.00686585 -0.00879541)
+(-0.0402128 0.0099218 -0.00755578)
+(-0.0399836 0.0109279 -0.00639525)
+(-0.034489 0.00972981 -0.00549047)
+(-0.0126827 0.00479241 -0.00449512)
+(0.000253883 0.000376188 -0.00440354)
+(0.0140693 -0.00480271 -0.00492185)
+(0.0266592 -0.00995465 -0.00597114)
+(0.0361071 -0.0142967 -0.00739164)
+(0.0409769 -0.0171708 -0.00896708)
+(0.0405295 -0.0181427 -0.0104576)
+(0.0348341 -0.0170654 -0.0116363)
+(0.0247574 -0.0141017 -0.0123238)
+(0.0118314 -0.0096996 -0.0124154)
+(-0.00197823 -0.00452622 -0.0118971)
+(-0.0145704 0.000632036 -0.0108479)
+(-0.0240276 0.00498849 -0.00942747)
+(-0.028908 0.00787678 -0.00785203)
+(-0.0284664 0.00885414 -0.00636145)
+(-0.0227686 0.00777057 -0.00518265)
+(-0.00136873 0.00280205 -0.00376832)
+(0.0116169 -0.0011924 -0.00368419)
+(0.0253556 -0.00590881 -0.00428375)
+(0.0377544 -0.010628 -0.00547573)
+(0.0469264 -0.014633 -0.00707862)
+(0.051477 -0.017317 -0.00884843)
+(0.0507158 -0.0182745 -0.0105157)
+(0.0447599 -0.0173609 -0.0118267)
+(0.0345155 -0.0147138 -0.0125819)
+(0.0215403 -0.0107331 -0.0126661)
+(0.0078073 -0.00602201 -0.0120667)
+(-0.00459392 -0.00129645 -0.0108747)
+(-0.0137749 0.00272275 -0.00927179)
+(-0.018336 0.00542061 -0.00750186)
+(-0.0175805 0.00638339 -0.00583443)
+(-0.0116222 0.00546339 -0.00452339)
+(0.00765442 0.000843135 -0.00290956)
+(0.0206328 -0.00270171 -0.00289078)
+(0.0342114 -0.00693235 -0.00355969)
+(0.0463219 -0.0112036 -0.00481442)
+(0.055121 -0.0148665 -0.00646395)
+(0.0592711 -0.0173666 -0.00825721)
+(0.0581426 -0.0183261 -0.00992124)
+(0.0519085 -0.0176 -0.0112027)
+(0.0415174 -0.0152976 -0.0119066)
+(0.0285493 -0.0117663 -0.0119256)
+(0.0149763 -0.00754086 -0.0112569)
+(0.0028635 -0.00326333 -0.0100021)
+(-0.00594452 0.000413652 -0.00835236)
+(-0.0101049 0.00292727 -0.00655886)
+(-0.008982 0.0038919 -0.00489469)
+(-0.00274559 0.00315957 -0.00361322)
+(0.0130142 -0.000786131 -0.00205078)
+(0.0259299 -0.00392202 -0.00214527)
+(0.0392896 -0.00771753 -0.00286101)
+(0.0510582 -0.0115937 -0.00408899)
+(0.0594445 -0.0149618 -0.0056423)
+(0.0631737 -0.017312 -0.00728454)
+(0.0616802 -0.0182894 -0.00876577)
+(0.0551927 -0.0177464 -0.00986051)
+(0.0446982 -0.0157642 -0.0104021)
+(0.0317927 -0.0126418 -0.0103079)
+(0.0184386 -0.00885141 -0.00959233)
+(0.00666779 -0.0049691 -0.0083642)
+(-0.00172729 -0.00158721 -0.00681053)
+(-0.00546666 0.000776395 -0.00516794)
+(-0.0039788 0.00175897 -0.00368657)
+(0.00251098 0.00120982 -0.00259198)
+(0.0138952 -0.00183781 -0.00132431)
+(0.0267024 -0.00466763 -0.00156277)
+(0.0398176 -0.00814487 -0.00229571)
+(0.0512428 -0.011739 -0.00341154)
+(0.0592392 -0.0149042 -0.00474043)
+(0.0625911 -0.0171614 -0.00608019)
+(0.0607906 -0.01817 -0.00722694)
+(0.054113 -0.0177776 -0.00800612)
+(0.0435743 -0.0160425 -0.00829904)
+(0.0307773 -0.013226 -0.00806099)
+(0.0176677 -0.00975407 -0.00732813)
+(0.0062404 -0.006154 -0.00621201)
+(-0.00176463 -0.00297521 -0.00488261)
+(-0.00512676 -0.000704599 -0.00354244)
+(-0.00333193 0.000309264 -0.0023956)
+(0.00334785 -8.91163e-05 -0.00161672)
+(0.0101629 -0.00215187 -0.000841802)
+(0.0228324 -0.0048251 -0.00123308)
+(0.0357147 -0.00814939 -0.00195106)
+(0.0468473 -0.0116174 -0.00288645)
+(0.0545359 -0.0147025 -0.00389692)
+(0.0576118 -0.0169379 -0.00482879)
+(0.0556089 -0.0179861 -0.00554028)
+(0.0488334 -0.0176888 -0.00592306)
+(0.0383164 -0.01609 -0.00591878)
+(0.0256571 -0.0134302 -0.00552794)
+(0.0127806 -0.0101114 -0.00480996)
+(0.00164599 -0.00663767 -0.00387413)
+(-0.00605123 -0.00353909 -0.00286304)
+(-0.00913732 -0.00129031 -0.00193073)
+(-0.00714023 -0.000236606 -0.00121924)
+(-0.000362729 -0.000539578 -0.000836897)
+(0.00238462 -0.00168055 -0.000676618)
+(0.0149081 -0.0043705 -0.00120637)
+(0.0276046 -0.00773041 -0.00187957)
+(0.03854 -0.0112475 -0.00259375)
+(0.0460499 -0.0143876 -0.0032403)
+(0.0489928 -0.0166754 -0.00372095)
+(0.0469229 -0.0177657 -0.00396261)
+(0.0401567 -0.0174937 -0.00392846)
+(0.0297239 -0.0158996 -0.00362358)
+(0.0172108 -0.0132233 -0.00309423)
+(0.00452018 -0.00986912 -0.00242093)
+(-0.00641715 -0.00634657 -0.00170619)
+(-0.0139357 -0.00319307 -0.00105895)
+(-0.0168889 -0.000891641 -0.000577891)
+(-0.0148251 0.000204411 -0.000336343)
+(-0.00805693 -7.30315e-05 -0.000371054)
+(-0.00825668 -0.000495556 -0.000852699)
+(0.00413477 -0.00337298 -0.00148555)
+(0.016721 -0.0069517 -0.00209099)
+(0.0275846 -0.0106856 -0.00257689)
+(0.0350721 -0.0140073 -0.00286943)
+(0.0380454 -0.016414 -0.0029242)
+(0.0360541 -0.0175424 -0.00273296)
+(0.0294029 -0.017222 -0.00232475)
+(0.0191037 -0.0155004 -0.0017616)
+(0.0067228 -0.0126368 -0.00112908)
+(-0.00585733 -0.00906419 -0.000523425)
+(-0.0167228 -0.00532509 -3.68788e-05)
+(-0.024219 -0.0019899 0.000256344)
+(-0.0272028 0.000430689 0.000311454)
+(-0.0252177 0.00156518 0.000119988)
+(-0.0185646 0.00123952 -0.000288857)
+(-0.0201415 0.0012228 -0.00134164)
+(-0.0078479 -0.00198433 -0.0020265)
+(0.00472035 -0.00593174 -0.00255151)
+(0.0156485 -0.0100171 -0.0028368)
+(0.0232732 -0.0136195 -0.00283908)
+(0.0264356 -0.0161935 -0.00255816)
+(0.0246566 -0.0173504 -0.00203683)
+(0.0182084 -0.0169152 -0.00135441)
+(0.00807223 -0.0149533 -0.000614638)
+(-0.00421064 -0.0117603 6.99995e-05)
+(-0.0167726 -0.00781926 0.000595321)
+(-0.0277026 -0.0037288 0.000881282)
+(-0.0353361 -0.000112763 0.000884201)
+(-0.0385093 0.00247539 0.000603498)
+(-0.0367366 0.00363858 8.18575e-05)
+(-0.0302865 0.00319834 -0.000601236)
+(-0.0314601 0.003213 -0.00206796)
+(-0.0192154 -0.00041588 -0.00274575)
+(-0.00657014 -0.00482575 -0.00318982)
+(0.00454908 -0.00934381 -0.00333265)
+(0.0124499 -0.0132833 -0.00315262)
+(0.0159313 -0.0160476 -0.00267727)
+(0.0144659 -0.0172188 -0.00197897)
+(0.00827795 -0.0166201 -0.00116397)
+(-0.00169079 -0.0143416 -0.00035618)
+(-0.0139246 -0.0107271 0.000321519)
+(-0.0265635 -0.00632385 0.000765979)
+(-0.0376845 -0.0018007 0.000909449)
+(-0.0455943 0.00215262 0.000729949)
+(-0.0490867 0.00493126 0.000254691)
+(-0.0476277 0.00610907 -0.000443991)
+(-0.0414379 0.00550531 -0.00125965)
+(-0.0404884 0.0051721 -0.00292117)
+(-0.0282361 0.00109362 -0.00353382)
+(-0.0154306 -0.00380208 -0.00390871)
+(-0.00402292 -0.00876822 -0.00398886)
+(0.00425071 -0.0130499 -0.0037622)
+(0.00813266 -0.0159982 -0.00326331)
+(0.00703434 -0.0171676 -0.00256813)
+(0.00112436 -0.0163815 -0.00178242)
+(-0.00869796 -0.0137583 -0.00102566)
+(-0.0209392 -0.00969451 -0.000412988)
+(-0.0337382 -0.00480554 -3.76761e-05)
+(-0.0451478 0.000165764 4.3044e-05)
+(-0.0534306 0.00446143 -0.00018324)
+(-0.0573236 0.00742446 -0.00068216)
+(-0.0562318 0.00860057 -0.00137775)
+(-0.0503199 0.00780925 -0.00216403)
+(-0.0458508 0.00680179 -0.0037726)
+(-0.0335357 0.00231433 -0.00427188)
+(-0.0205112 -0.0030166 -0.00459985)
+(-0.00876152 -0.00837796 -0.00470664)
+(-7.50382e-05 -0.0129547 -0.00457611)
+(0.00422782 -0.0160531 -0.00422818)
+(0.0034944 -0.0172046 -0.00371577)
+(-0.00216224 -0.0162356 -0.00311683)
+(-0.0118813 -0.0132922 -0.00252242)
+(-0.0241853 -0.00881955 -0.002023)
+(-0.0372033 -0.00349536 -0.00169463)
+(-0.048955 0.0018713 -0.00158738)
+(-0.0576508 0.00646225 -0.00171769)
+(-0.0619648 0.00957546 -0.00206576)
+(-0.0612378 0.0107338 -0.00257857)
+(-0.0555792 0.00975939 -0.00317797)
+(-0.0467303 0.00785388 -0.0044942)
+(-0.0343068 0.00306031 -0.0048492)
+(-0.0210379 -0.00258897 -0.00515965)
+(-0.00894482 -0.00823246 -0.00537837)
+(0.000131653 -0.0130122 -0.00547213)
+(0.00481178 -0.0162036 -0.00542667)
+(0.00438548 -0.0173241 -0.00524887)
+(-0.00108095 -0.0162045 -0.00496572)
+(-0.0107558 -0.013014 -0.00462026)
+(-0.0231681 -0.00823535 -0.00426507)
+(-0.0364306 -0.00259269 -0.00395426)
+(-0.0485258 0.00305631 -0.00373523)
+(-0.0576116 0.00785046 -0.0036414)
+(-0.0623029 0.0110568 -0.00368706)
+(-0.061883 0.0121839 -0.00386521)
+(-0.0564145 0.0110587 -0.00414867)
+(-0.0425846 0.0135132 -0.0152205)
+(-0.0298706 0.00849339 -0.0155345)
+(-0.016272 0.0026107 -0.0158502)
+(-0.00386029 -0.00323784 -0.0161197)
+(0.00547534 -0.00816302 -0.0163019)
+(0.0103157 -0.0114181 -0.0163692)
+(0.00992613 -0.0125108 -0.0163112)
+(0.00436737 -0.0112762 -0.0161366)
+(-0.00551483 -0.00790098 -0.015872)
+(-0.018218 -0.00289595 -0.0155577)
+(-0.0318105 0.00298014 -0.0152415)
+(-0.0442244 0.00883415 -0.0149719)
+(-0.0535693 0.0137737 -0.0147897)
+(-0.0584205 0.0170436 -0.0147228)
+(-0.058037 0.0181429 -0.0147812)
+(-0.0524761 0.0169028 -0.014956)
+(-0.034325 0.0128955 -0.0160691)
+(-0.0214659 0.00790204 -0.0162475)
+(-0.00768954 0.0020619 -0.0166071)
+(0.00490556 -0.00373443 -0.017093)
+(0.0144024 -0.00860573 -0.0176315)
+(0.0193571 -0.0118135 -0.0181404)
+(0.0190178 -0.0128726 -0.0185422)
+(0.0134373 -0.0116231 -0.0187757)
+(0.00346479 -0.00825408 -0.0188053)
+(-0.00938355 -0.00327523 -0.0186265)
+(-0.023154 0.0025586 -0.0182666)
+(-0.0357514 0.00836064 -0.0177806)
+(-0.0452574 0.0132463 -0.0172423)
+(-0.0502229 0.0164688 -0.0167338)
+(-0.0498895 0.0175342 -0.0163322)
+(-0.0443067 0.016279 -0.0160989)
+(-0.0233005 0.011724 -0.016621)
+(-0.0103044 0.00692592 -0.016699)
+(0.0035796 0.00131002 -0.0171235)
+(0.0162364 -0.00426746 -0.01783)
+(0.0257396 -0.00895868 -0.0187108)
+(0.0306445 -0.0120526 -0.0196318)
+(0.0302066 -0.0130812 -0.0204528)
+(0.0244939 -0.0118893 -0.0210488)
+(0.0143754 -0.00865702 -0.0213289)
+(0.00138982 -0.00387336 -0.0212506)
+(-0.0124884 0.00173654 -0.0208259)
+(-0.0251475 0.00731992 -0.0201195)
+(-0.0346599 0.0120255 -0.0192389)
+(-0.0395753 0.0151338 -0.0183181)
+(-0.0391432 0.0161684 -0.0174973)
+(-0.0334281 0.0149706 -0.0169013)
+(-0.0111902 0.010177 -0.0167906)
+(0.00191429 0.00571373 -0.0168185)
+(0.0158193 0.000469612 -0.0173192)
+(0.0284066 -0.00475574 -0.0182165)
+(0.0377605 -0.00916813 -0.0193737)
+(0.0424589 -0.0120989 -0.0206147)
+(0.0417887 -0.0131049 -0.0217505)
+(0.0358532 -0.0120342 -0.0226081)
+(0.0255555 -0.00904857 -0.023057)
+(0.0124613 -0.00459939 -0.0230289)
+(-0.00143802 0.000639022 -0.0225281)
+(-0.0140278 0.00587041 -0.0216309)
+(-0.0233907 0.010297 -0.0204738)
+(-0.0280994 0.0132419 -0.0192329)
+(-0.0274349 0.0142536 -0.0180973)
+(-0.021497 0.0131769 -0.0172396)
+(0.000162554 0.00849026 -0.0165509)
+(0.0133301 0.00445011 -0.0165867)
+(0.0271664 -0.000331311 -0.0171632)
+(0.0395637 -0.00512489 -0.0181926)
+(0.0486353 -0.00920216 -0.0195182)
+(0.0530019 -0.0119454 -0.0209382)
+(0.0520011 -0.0129401 -0.0222364)
+(0.0457863 -0.0120359 -0.0232151)
+(0.0353032 -0.00936913 -0.0237254)
+(0.0221458 -0.00534279 -0.0236896)
+(0.00831508 -0.000566841 -0.0231131)
+(-0.00408468 0.00423281 -0.0220837)
+(-0.0131651 0.00832414 -0.0207581)
+(-0.017542 0.0110812 -0.0193381)
+(-0.0165466 0.0120814 -0.01804)
+(-0.0103294 0.0111711 -0.0170612)
+(0.00903044 0.00692056 -0.0159386)
+(0.0222061 0.00332747 -0.016039)
+(0.0358943 -0.00097078 -0.0166792)
+(0.04801 -0.00531866 -0.0177618)
+(0.0567092 -0.00905555 -0.0191221)
+(0.0606695 -0.0116155 -0.0205529)
+(0.05929 -0.0126118 -0.0218364)
+(0.0527819 -0.0118939 -0.0227774)
+(0.0421357 -0.00956981 -0.0232324)
+(0.0289701 -0.00599029 -0.0231321)
+(0.0152873 -0.00169738 -0.0224919)
+(0.0031692 0.00265651 -0.0214092)
+(-0.00553876 0.00640725 -0.0200488)
+(-0.00950902 0.00898081 -0.0186179)
+(-0.00813495 0.00998246 -0.0173343)
+(-0.00162459 0.00925854 -0.0163935)
+(0.0140645 0.00570684 -0.0150482)
+(0.027192 0.00251668 -0.0152598)
+(0.0406754 -0.00135147 -0.015942)
+(0.0524606 -0.00530757 -0.0169909)
+(0.0607541 -0.0087506 -0.0182468)
+(0.0642951 -0.0111594 -0.0195186)
+(0.0625467 -0.01217 -0.0206128)
+(0.0557762 -0.0116299 -0.0213628)
+(0.0450139 -0.00961994 -0.0216543)
+(0.0318963 -0.00644319 -0.0214429)
+(0.0184184 -0.00258038 -0.0207607)
+(0.00663084 0.00138158 -0.0197116)
+(-0.00167131 0.00483824 -0.0184554)
+(-0.00522225 0.00726041 -0.0171834)
+(-0.00347924 0.00827641 -0.0160892)
+(0.00329355 0.00773043 -0.0153394)
+(0.014499 0.00503378 -0.0140168)
+(0.0275294 0.00214109 -0.0143695)
+(0.0407822 -0.0014155 -0.0150655)
+(0.0522385 -0.00509334 -0.0159988)
+(0.0601548 -0.00833374 -0.0170273)
+(0.0633276 -0.0106463 -0.0179946)
+(0.0612761 -0.0116818 -0.0187535)
+(0.0543138 -0.0112839 -0.0191884)
+(0.0435002 -0.0095118 -0.0192331)
+(0.0304797 -0.00663246 -0.0188806)
+(0.0172324 -0.00308132 -0.0181846)
+(0.00577389 0.000602165 -0.017251)
+(-0.00215088 0.003856 -0.016222)
+(-0.00533361 0.00618191 -0.0152544)
+(-0.0032876 0.00722289 -0.0144956)
+(0.00367686 0.00681929 -0.014061)
+(0.0102675 0.00500373 -0.0130025)
+(0.0231667 0.00225777 -0.0135048)
+(0.0361984 -0.0011532 -0.0141844)
+(0.0473773 -0.00470864 -0.0149379)
+(0.0550021 -0.00786846 -0.0156506)
+(0.0579138 -0.0101545 -0.0162141)
+(0.0556712 -0.0112216 -0.0165428)
+(0.0486171 -0.0109085 -0.0165866)
+(0.0378248 -0.00926182 -0.0163386)
+(0.0249355 -0.00652927 -0.0158366)
+(0.0119095 -0.00312397 -0.0151568)
+(0.000728468 0.000436881 -0.0144029)
+(-0.00690484 0.00361 -0.0136896)
+(-0.00982649 0.00590943 -0.0131258)
+(-0.00758953 0.00698219 -0.0127972)
+(-0.000533302 0.00666374 -0.0127539)
+(0.00201317 0.00562124 -0.0121596)
+(0.0147671 0.00284892 -0.0127972)
+(0.0276207 -0.000604533 -0.0134329)
+(0.0386161 -0.00421208 -0.0139698)
+(0.0460797 -0.00742564 -0.0143263)
+(0.048877 -0.00975883 -0.0144483)
+(0.0465845 -0.0108594 -0.0143173)
+(0.0395523 -0.0105611 -0.0139532)
+(0.0288506 -0.00890815 -0.0134113)
+(0.0161068 -0.00614942 -0.0127739)
+(0.00325886 -0.00270191 -0.012138)
+(-0.0077385 0.000910808 -0.0116006)
+(-0.0152106 0.00413761 -0.0112434)
+(-0.0180181 0.00648438 -0.0111211)
+(-0.0157312 0.00759089 -0.0112523)
+(-0.00869705 0.0072874 -0.011617)
+(-0.00900847 0.00679232 -0.0116152)
+(0.00360816 0.0038246 -0.0123534)
+(0.0163542 0.000146995 -0.0129241)
+(0.0272878 -0.00367926 -0.0132407)
+(0.0347449 -0.00707271 -0.0132549)
+(0.0375921 -0.00951964 -0.0129648)
+(0.0353981 -0.0106505 -0.0124147)
+(0.0284983 -0.0102945 -0.0116881)
+(0.0179427 -0.00850476 -0.0108956)
+(0.0053363 -0.00555086 -0.0101576)
+(-0.00740378 -0.00187951 -0.00958648)
+(-0.0183393 0.0019517 -0.00926926)
+(-0.025805 0.00535845 -0.00925437)
+(-0.0286625 0.0078192 -0.00954422)
+(-0.0264745 0.00895633 -0.0100947)
+(-0.0195727 0.00859536 -0.010822)
+(-0.0211201 0.00833881 -0.0114505)
+(-0.00861171 0.00503636 -0.0122391)
+(0.00411331 0.000987047 -0.012734)
+(0.0151164 -0.00319123 -0.0128599)
+(0.0227228 -0.00686342 -0.0125978)
+(0.0257764 -0.00947336 -0.0119878)
+(0.0238147 -0.0106268 -0.0111228)
+(0.0171375 -0.0101495 -0.0101343)
+(0.00676107 -0.00811315 -0.00917268)
+(-0.00573685 -0.00482481 -0.00838421)
+(-0.0184558 -0.000782054 -0.00788891)
+(-0.0294607 0.00340106 -0.00776228)
+(-0.0370759 0.00708665 -0.00802374)
+(-0.04014 0.00971071 -0.00863363)
+(-0.0381843 0.0108707 -0.00949912)
+(-0.0315053 0.0103886 -0.0104883)
+(-0.0324775 0.0100254 -0.0116896)
+(-0.0200319 0.00629981 -0.0124707)
+(-0.007238 0.00178781 -0.0128901)
+(0.00395517 -0.00282225 -0.0128841)
+(0.0118439 -0.00682957 -0.0124538)
+(0.0152292 -0.00962703 -0.0116647)
+(0.0135979 -0.0107918 -0.0106371)
+(0.00719978 -0.0101482 -0.00952716)
+(-0.00299158 -0.00779295 -0.00850381)
+(-0.0154265 -0.0040818 -0.0077227)
+(-0.0282142 0.000423403 -0.00730278)
+(-0.0394093 0.00503826 -0.00730807)
+(-0.0473069 0.00905917 -0.00773793)
+(-0.0507028 0.011871 -0.00852701)
+(-0.0490778 0.0130426 -0.00955519)
+(-0.0426777 0.0123942 -0.0106658)
+(-0.0413507 0.0115952 -0.0122962)
+(-0.0289129 0.00742264 -0.013013)
+(-0.0159707 0.00242741 -0.0133688)
+(-0.00449578 -0.00262845 -0.0133097)
+(0.00376536 -0.00697629 -0.0128447)
+(0.00755698 -0.00995719 -0.0120447)
+(0.00630416 -0.0111205 -0.0110315)
+(0.000199008 -0.0102906 -0.00995917)
+(-0.00982945 -0.00759284 -0.00899088)
+(-0.0222564 -0.00343488 -0.00827396)
+(-0.0351923 0.00155343 -0.00791758)
+(-0.0466692 0.00661415 -0.00797611)
+(-0.0549394 0.0109758 -0.00844077)
+(-0.0587418 0.0139713 -0.00924091)
+(-0.0574952 0.0151416 -0.0102547)
+(-0.0513881 0.0143068 -0.0113276)
+(-0.0463876 0.0128094 -0.0131791)
+(-0.0339015 0.00823387 -0.0137845)
+(-0.0207543 0.00280845 -0.0140983)
+(-0.00894888 -0.00263934 -0.0140728)
+(-0.000281994 -0.00728122 -0.0137121)
+(0.00392883 -0.0104135 -0.013071)
+(0.0030449 -0.0115626 -0.0122471)
+(-0.00279786 -0.0105551 -0.0113658)
+(-0.0127104 -0.00754316 -0.0105611)
+(-0.0251855 -0.0029824 -0.00995539)
+(-0.0383265 0.00243609 -0.00964107)
+(-0.0501339 0.00788889 -0.00966606)
+(-0.0588099 0.0125448 -0.0100267)
+(-0.0630317 0.0156919 -0.010668)
+(-0.062154 0.0168479 -0.0114924)
+(-0.0563092 0.0158354 -0.0123742)
+(-0.0468208 0.013483 -0.0142056)
+(-0.0342377 0.0086099 -0.0146696)
+(-0.02086 0.00287284 -0.0149692)
+(-0.00872563 -0.00285331 -0.0150591)
+(0.000318561 -0.00769793 -0.0149256)
+(0.00489765 -0.0109265 -0.0145891)
+(0.00431686 -0.0120509 -0.0141007)
+(-0.00133402 -0.0109012 -0.0135346)
+(-0.0111952 -0.00765137 -0.012977)
+(-0.0237673 -0.00279315 -0.0125127)
+(-0.0371388 0.00293709 -0.0122126)
+(-0.0492753 0.00866846 -0.0121223)
+(-0.0583287 0.0135273 -0.0122558)
+(-0.0629187 0.0167708 -0.0125927)
+(-0.0623441 0.0179019 -0.0130816)
+(-0.0566911 0.016747 -0.013648)
+(-0.0418275 0.0186284 -0.0230709)
+(-0.0290949 0.0134973 -0.0234311)
+(-0.0155346 0.00746907 -0.0236671)
+(-0.00321239 0.0014628 -0.0237431)
+(0.00599634 -0.00360816 -0.0236476)
+(0.0106915 -0.00697486 -0.023395)
+(0.0101607 -0.00812792 -0.0230237)
+(0.00448597 -0.00689326 -0.0225901)
+(-0.00546923 -0.00345773 -0.0221603)
+(-0.0181913 0.00165868 -0.0217996)
+(-0.0317456 0.00768022 -0.0215631)
+(-0.04407 0.0136916 -0.0214869)
+(-0.0532877 0.0187766 -0.0215826)
+(-0.0579935 0.022158 -0.0218357)
+(-0.0574686 0.0233178 -0.0222075)
+(-0.0517917 0.022078 -0.0226412)
+(-0.033272 0.0179252 -0.0244144)
+(-0.0203978 0.0128341 -0.0246401)
+(-0.0066698 0.00686062 -0.0249178)
+(0.00582066 0.00091562 -0.0252054)
+(0.0151725 -0.00409702 -0.025459)
+(0.019964 -0.00741722 -0.02564)
+(0.0194679 -0.00854265 -0.0257207)
+(0.013761 -0.00730337 -0.0256888)
+(0.00371166 -0.00388689 -0.0255491)
+(-0.00915215 0.00118971 -0.0253229)
+(-0.0228743 0.00715671 -0.0250448)
+(-0.035367 0.0131071 -0.0247572)
+(-0.0447278 0.0181338 -0.0245038)
+(-0.0495297 0.0214685 -0.0243233)
+(-0.0490394 0.0226004 -0.0242429)
+(-0.0433303 0.0213557 -0.0242749)
+(-0.0220498 0.0168799 -0.025569)
+(-0.00903658 0.0119962 -0.0256956)
+(0.00479323 0.00625686 -0.0260335)
+(0.0173329 0.000537006 -0.0265312)
+(0.0266739 -0.00429377 -0.027113)
+(0.031396 -0.00750308 -0.0276902)
+(0.0307826 -0.00860543 -0.0281749)
+(0.0249283 -0.00743431 -0.0284932)
+(0.0147239 -0.00416682 -0.0285967)
+(0.00172093 0.000702649 -0.0284696)
+(-0.0121032 0.00643585 -0.0281315)
+(-0.0246452 0.0121613 -0.0276338)
+(-0.033995 0.0170061 -0.0270523)
+(-0.0387275 0.0202297 -0.0264755)
+(-0.0381197 0.0213381 -0.0259911)
+(-0.0322632 0.0201614 -0.0256727)
+(-0.00987008 0.0156519 -0.0263573)
+(0.00325836 0.0111114 -0.0264354)
+(0.0171087 0.00574978 -0.0268426)
+(0.0295711 0.000384655 -0.0275171)
+(0.0387488 -0.00416846 -0.0283561)
+(0.0432466 -0.00721942 -0.0292318)
+(0.0423818 -0.00830676 -0.0300109)
+(0.0362872 -0.00726622 -0.0305746)
+(0.0258903 -0.00425497 -0.0308373)
+(0.012772 0.000271572 -0.0307589)
+(-0.00107284 0.00562731 -0.0303515)
+(-0.0135376 0.0109981 -0.0296771)
+(-0.0227241 0.0155652 -0.0288384)
+(-0.0272319 0.0186301 -0.0279629)
+(-0.0263726 0.0197233 -0.027184)
+(-0.0202758 0.0186771 -0.0266202)
+(0.00141322 0.0144281 -0.0266582)
+(0.0146155 0.0103144 -0.0267455)
+(0.0284019 0.00541668 -0.0272208)
+(0.0406723 0.000481826 -0.0280116)
+(0.0495594 -0.00374012 -0.0289976)
+(0.0537118 -0.00660938 -0.0300287)
+(0.0524997 -0.00769211 -0.0309478)
+(0.0461087 -0.0068247 -0.031615)
+(0.0355113 -0.00413794 -0.0319288)
+(0.0223189 -3.78979e-05 -0.0318413)
+(0.0085379 0.0048542 -0.0313659)
+(-0.0037349 0.0097948 -0.0305751)
+(-0.0126306 0.0140305 -0.0295892)
+(-0.0167929 0.0169135 -0.0285583)
+(-0.0155862 0.0180018 -0.0276393)
+(-0.00919285 0.0171286 -0.0269721)
+(0.0100833 0.013395 -0.0264261)
+(0.0233067 0.00972665 -0.026579)
+(0.0369544 0.00530829 -0.0271104)
+(0.0489475 0.000813761 -0.0279394)
+(0.0574605 -0.00307391 -0.02894)
+(0.0611994 -0.0057658 -0.0299596)
+(0.059597 -0.006855 -0.0308431)
+(0.0528985 -0.00617689 -0.031456)
+(0.0421231 -0.00383347 -0.031705)
+(0.0289094 -0.000178564 -0.031552)
+(0.015267 0.00423432 -0.0310206)
+(0.00327171 0.00873454 -0.0301914)
+(-0.00524987 0.0126357 -0.0291909)
+(-0.00899853 0.0153411 -0.0281713)
+(-0.00740145 0.0164358 -0.0272878)
+(-0.000700629 0.015752 -0.026675)
+(0.0148214 0.0127098 -0.0256975)
+(0.0280101 0.00943756 -0.0259622)
+(0.0414654 0.00544108 -0.0265294)
+(0.0531377 0.00132991 -0.0273127)
+(0.0612505 -0.00227125 -0.028193)
+(0.0645705 -0.00481705 -0.0290362)
+(0.0625944 -0.00592279 -0.0297139)
+(0.0556241 -0.00542133 -0.0301231)
+(0.0447204 -0.0033878 -0.0302013)
+(0.0315414 -0.000128895 -0.0299366)
+(0.0180914 0.00386212 -0.0293693)
+(0.00641689 0.00797884 -0.0285858)
+(-0.00170432 0.0115933 -0.0277054)
+(-0.00503401 0.0141524 -0.0268621)
+(-0.00306318 0.0152636 -0.0261845)
+(0.00390928 0.0147566 -0.0257755)
+(0.0149068 0.0124766 -0.0245849)
+(0.0280101 0.00949104 -0.0249908)
+(0.0412486 0.00579475 -0.025568)
+(0.0526057 0.00195165 -0.0262286)
+(0.0603528 -0.00145434 -0.0268721)
+(0.0633124 -0.00390754 -0.0274007)
+(0.061036 -0.00503734 -0.0277339)
+(0.0538712 -0.00467295 -0.0278209)
+(0.0429085 -0.00286868 -0.0276484)
+(0.0298149 0.000103633 -0.0272427)
+(0.0165817 0.00379434 -0.0266654)
+(0.00522253 0.00764279 -0.0260044)
+(-0.00253296 0.0110619 -0.0253606)
+(-0.00550222 0.0135284 -0.0248318)
+(-0.00323111 0.0146637 -0.0244988)
+(0.00393575 0.014294 -0.0244121)
+(0.0103264 0.0127309 -0.023259)
+(0.0233065 0.00987884 -0.0238139)
+(0.0363368 0.00631537 -0.0243737)
+(0.0474322 0.00258425 -0.0248534)
+(0.054904 -0.000747606 -0.0251798)
+(0.0576165 -0.00317577 -0.0253035)
+(0.0551589 -0.00433346 -0.0252057)
+(0.0479064 -0.00404568 -0.0249011)
+(0.0369628 -0.00235513 -0.0244362)
+(0.0239923 0.000483618 -0.0238814)
+(0.0109675 0.00404129 -0.0233213)
+(-0.000129877 0.00777751 -0.0228412)
+(-0.00760998 0.0111224 -0.0225143)
+(-0.0103322 0.0135638 -0.0223904)
+(-0.00787999 0.0147273 -0.0224885)
+(-0.000625512 0.0144344 -0.0227935)
+(0.00177633 0.0134339 -0.0219212)
+(0.0146146 0.0105419 -0.0226104)
+(0.0274769 0.00692365 -0.0231284)
+(0.038404 0.00313137 -0.0233964)
+(0.0457327 -0.000258669 -0.0233737)
+(0.048349 -0.00273318 -0.0230639)
+(0.0458568 -0.00391835 -0.0225143)
+(0.0386367 -0.00363508 -0.0218083)
+(0.0277875 -0.00192543 -0.0210534)
+(0.0149591 0.000953131 -0.0203643)
+(0.00210233 0.00456528 -0.019846)
+(-0.00882666 0.00836241 -0.0195774)
+(-0.0161636 0.0117654 -0.0195996)
+(-0.0187898 0.0142534 -0.0199092)
+(-0.0163032 0.0154446 -0.0204592)
+(-0.00908117 0.0151565 -0.0211658)
+(-0.00944282 0.0144786 -0.0207742)
+(0.0032563 0.0113793 -0.0215626)
+(0.0160167 0.00752702 -0.0220205)
+(0.0268945 0.00350974 -0.0220784)
+(0.034234 -6.19873e-05 -0.0217277)
+(0.0369196 -0.00264721 -0.0210217)
+(0.0345448 -0.00385531 -0.0200681)
+(0.0274722 -0.00350377 -0.0190119)
+(0.0167782 -0.00164509 -0.0180137)
+(0.0040891 0.00144057 -0.0172255)
+(-0.00866554 0.00528643 -0.0167671)
+(-0.0195452 0.00930837 -0.0167085)
+(-0.026893 0.0128931 -0.0170587)
+(-0.0295887 0.015492 -0.0177646)
+(-0.0272196 0.0167065 -0.0187186)
+(-0.0201452 0.0163503 -0.0197755)
+(-0.0216237 0.0157062 -0.0199908)
+(-0.00903969 0.0122636 -0.0208281)
+(0.00370024 0.0080337 -0.0212169)
+(0.0146553 0.00366179 -0.0210983)
+(0.022158 -0.000187487 -0.0204905)
+(0.025068 -0.00293096 -0.0194861)
+(0.0229444 -0.00415399 -0.0182379)
+(0.016112 -0.00367183 -0.016936)
+(0.00561039 -0.0015569 -0.0157783)
+(-0.00696345 0.00187165 -0.0149411)
+(-0.0196975 0.0060949 -0.0145517)
+(-0.0306543 0.0104713 -0.0146696)
+(-0.0381655 0.0143337 -0.0152769)
+(-0.0410857 0.0170912 -0.0162814)
+(-0.0389681 0.0183209 -0.01753)
+(-0.0321338 0.0178342 -0.0188327)
+(-0.0329117 0.0169297 -0.0196893)
+(-0.0204012 0.0130604 -0.0205177)
+(-0.00759718 0.00836665 -0.0208389)
+(0.00354987 0.00356445 -0.0206041)
+(0.0113433 -0.000616022 -0.0198493)
+(0.0145985 -0.00354122 -0.0186894)
+(0.0128221 -0.0047689 -0.0173011)
+(0.00628584 -0.00411366 -0.0158954)
+(-0.00401551 -0.00167428 -0.0146863)
+(-0.0165156 0.00218074 -0.0138578)
+(-0.0293136 0.00686761 -0.013536)
+(-0.0404625 0.0116743 -0.0137701)
+(-0.0482645 0.015868 -0.0145245)
+(-0.05153 0.0188075 -0.0156845)
+(-0.0497597 0.0200421 -0.0170735)
+(-0.0432216 0.0193824 -0.0184798)
+(-0.0415872 0.0179631 -0.0199157)
+(-0.0290977 0.0136484 -0.0206787)
+(-0.0161547 0.0084752 -0.0209438)
+(-0.00473008 0.00323258 -0.0206709)
+(0.00343732 -0.00128231 -0.0199016)
+(0.00710597 -0.00438504 -0.0187531)
+(0.00571964 -0.00560639 -0.0174002)
+(-0.000509292 -0.00476195 -0.0160486)
+(-0.0106329 -0.00197929 -0.0149041)
+(-0.0231119 0.00232087 -0.0141408)
+(-0.0360488 0.00748702 -0.013875)
+(-0.0474753 0.0127342 -0.0141473)
+(-0.0556514 0.0172626 -0.0149164)
+(-0.0593306 0.0203798 -0.0160652)
+(-0.0579504 0.0216082 -0.0174188)
+(-0.0517196 0.0207592 -0.0187709)
+(-0.0463284 0.0186488 -0.0206367)
+(-0.0338039 0.013938 -0.0212878)
+(-0.0206685 0.00834281 -0.0215171)
+(-0.00892301 0.00271668 -0.0212898)
+(-0.000355311 -0.0020849 -0.0206407)
+(0.00373221 -0.0053339 -0.0196685)
+(0.00271956 -0.00653886 -0.0185213)
+(-0.00323776 -0.00551788 -0.0173735)
+(-0.0132332 -0.00242538 -0.0163998)
+(-0.025747 0.00227081 -0.0157483)
+(-0.0388764 0.00785892 -0.0155184)
+(-0.0506238 0.0134897 -0.0157452)
+(-0.0592003 0.018305 -0.0163942)
+(-0.0632985 0.0215687 -0.0173668)
+(-0.0622919 0.0227807 -0.0185146)
+(-0.0563327 0.021755 -0.0196629)
+(-0.0464127 0.0188825 -0.0217443)
+(-0.0338029 0.013885 -0.0222539)
+(-0.0204506 0.00798953 -0.0224729)
+(-0.00838999 0.00209524 -0.0223681)
+(0.000543378 -0.00290162 -0.0219556)
+(0.00499138 -0.00624331 -0.0212981)
+(0.00427916 -0.00742431 -0.0204956)
+(-0.00148355 -0.0062663 -0.0196702)
+(-0.0114199 -0.00294454 -0.0189474)
+(-0.024019 0.00203828 -0.0184374)
+(-0.0373652 0.00792677 -0.0182178)
+(-0.0494278 0.013826 -0.0183222)
+(-0.0583702 0.0188367 -0.0187348)
+(-0.0628288 0.0221931 -0.0193928)
+(-0.0621227 0.0233811 -0.0201958)
+(-0.0563579 0.0222182 -0.0210216)
+(-0.0408374 0.0227349 -0.0273336)
+(-0.0282235 0.017468 -0.0276671)
+(-0.0148311 0.0112512 -0.0277653)
+(-0.00270023 0.00503245 -0.0276133)
+(0.00632262 -0.000242476 -0.0272343)
+(0.0108657 -0.00377352 -0.0266859)
+(0.0102396 -0.00502623 -0.0260515)
+(0.00454098 -0.00381138 -0.0254276)
+(-0.00536309 -0.000312858 -0.024909)
+(-0.0179667 0.00493966 -0.024575)
+(-0.0313532 0.0111497 -0.0244763)
+(-0.043486 0.0173732 -0.0246282)
+(-0.0525175 0.0226618 -0.0250075)
+(-0.057071 0.0262073 -0.0255565)
+(-0.0564508 0.0274668 -0.0261914)
+(-0.0507502 0.0262471 -0.0268155)
+(-0.0322113 0.0220198 -0.0289137)
+(-0.0194613 0.0168083 -0.0291115)
+(-0.00591203 0.0106621 -0.0292483)
+(0.00637254 0.00451834 -0.0293034)
+(0.0155226 -0.000688818 -0.0292683)
+(0.0201471 -0.00416957 -0.0291484)
+(0.0195441 -0.0053971 -0.0289617)
+(0.0138067 -0.00418594 -0.0287366)
+(0.00380792 -0.000719378 -0.0285074)
+(-0.00893188 0.0044778 -0.0283091)
+(-0.0224754 0.0106175 -0.0281719)
+(-0.034762 0.0167663 -0.0281168)
+(-0.0439208 0.0219872 -0.0281523)
+(-0.0485554 0.0254822 -0.0282728)
+(-0.0479582 0.0267162 -0.0284598)
+(-0.0422188 0.0255 -0.0286849)
+(-0.0210043 0.0211939 -0.0304614)
+(-0.00811709 0.016204 -0.0305601)
+(0.00552606 0.0103048 -0.030751)
+(0.0178469 0.00439591 -0.0310051)
+(0.0269701 -0.000624365 -0.0312837)
+(0.0315086 -0.00399464 -0.0315443)
+(0.0307737 -0.00520488 -0.0317471)
+(0.0248785 -0.00407216 -0.0318612)
+(0.0147199 -0.000767803 -0.0318692)
+(0.00184274 0.0042081 -0.03177)
+(-0.0117948 0.0101011 -0.0315788)
+(-0.0241177 0.0160153 -0.0313248)
+(-0.0332495 0.0210492 -0.0310466)
+(-0.0377981 0.0244335 -0.0307865)
+(-0.0370688 0.0256499 -0.030584)
+(-0.0311715 0.024512 -0.0304698)
+(-0.00892323 0.0203833 -0.0317393)
+(0.00408145 0.0157472 -0.0317906)
+(0.0177412 0.0102338 -0.0320428)
+(0.0299753 0.00468386 -0.0324576)
+(0.0389216 -5.89054e-05 -0.0329718)
+(0.04322 -0.00327538 -0.0335071)
+(0.0422183 -0.00447887 -0.0339819)
+(0.0360701 -0.00348744 -0.0343238)
+(0.0257109 -0.000450843 -0.0344809)
+(0.0127161 0.00417155 -0.0344293)
+(-0.000938176 0.00967902 -0.0341769)
+(-0.0131744 0.0152344 -0.0337622)
+(-0.0221292 0.0199907 -0.0332483)
+(-0.0264375 0.0232209 -0.0327134)
+(-0.0254412 0.0244303 -0.0322388)
+(-0.0192909 0.0234335 -0.0318968)
+(0.0021929 0.0197115 -0.032552)
+(0.0152774 0.0155075 -0.0326146)
+(0.0288739 0.0104599 -0.0329259)
+(0.0409115 0.00533843 -0.0334385)
+(0.0495579 0.000921514 -0.0340744)
+(0.0534986 -0.00212128 -0.0347367)
+(0.0521357 -0.00332962 -0.0353246)
+(0.045678 -0.0025208 -0.0357484)
+(0.035108 0.000183235 -0.0359438)
+(0.0220332 0.00437372 -0.0358809)
+(0.00844198 0.00941561 -0.0355695)
+(-0.00359771 0.0145426 -0.0350569)
+(-0.0122524 0.0189728 -0.0344213)
+(-0.0162028 0.0220291 -0.0337592)
+(-0.0148453 0.0232431 -0.0331715)
+(-0.00838541 0.0224289 -0.0327476)
+(0.0106528 0.0192806 -0.0327758)
+(0.0237672 0.0155215 -0.0329067)
+(0.0372304 0.0109488 -0.0332658)
+(0.0489915 0.00625998 -0.0337985)
+(0.0572605 0.00216767 -0.0344236)
+(0.0607803 -0.00070798 -0.0350459)
+(0.0590171 -0.00193203 -0.0355708)
+(0.0522405 -0.00131935 -0.0359182)
+(0.0414816 0.00103797 -0.0360352)
+(0.0283767 0.00478389 -0.0359041)
+(0.0149188 0.009351 -0.0355449)
+(0.00315555 0.0140452 -0.0350122)
+(-0.00512169 0.0181507 -0.0343872)
+(-0.00865102 0.0210396 -0.033765)
+(-0.00689306 0.0222692 -0.0332403)
+(-0.000114315 0.0216511 -0.0328929)
+(0.0151696 0.0191564 -0.0323778)
+(0.0282595 0.0157869 -0.0326237)
+(0.0415394 0.011626 -0.033012)
+(0.0529863 0.0073082 -0.0334838)
+(0.060858 0.00348984 -0.0339673)
+(0.0639578 0.00074938 -0.0343888)
+(0.061816 -0.000498809 -0.0346842)
+(0.0547597 -6.5903e-05 -0.0348084)
+(0.0438627 0.00198333 -0.0347426)
+(0.0307822 0.00533972 -0.0344968)
+(0.0175076 0.00949513 -0.0341083)
+(0.00605865 0.0138181 -0.0336363)
+(-0.00182116 0.0176494 -0.0331528)
+(-0.00493046 0.020403 -0.0327313)
+(-0.00279386 0.0216567 -0.0324361)
+(0.00426451 0.0212186 -0.0323119)
+(0.0150566 0.0193575 -0.0314204)
+(0.0280712 0.0162633 -0.0318102)
+(0.0411456 0.0123882 -0.0322048)
+(0.0522883 0.00832343 -0.0325442)
+(0.0598032 0.00468673 -0.0327768)
+(0.062548 0.00202895 -0.0328671)
+(0.0601069 0.000751907 -0.0328015)
+(0.0528527 0.00104879 -0.03259)
+(0.0418893 0.00287549 -0.0322645)
+(0.0288841 0.00595668 -0.0318748)
+(0.015815 0.00982611 -0.03148)
+(0.00467037 0.0138959 -0.0311403)
+(-0.00285256 0.0175454 -0.0309075)
+(-0.0056068 0.0202162 -0.0308171)
+(-0.00317099 0.0214989 -0.0308829)
+(0.00408517 0.021197 -0.0310947)
+(0.0103306 0.0198532 -0.0300503)
+(0.0232306 0.0168779 -0.0305913)
+(0.0361089 0.0131194 -0.0309683)
+(0.0470036 0.00915106 -0.0311239)
+(0.0542565 0.00557607 -0.0310345)
+(0.0567652 0.00293591 -0.0307138)
+(0.0541498 0.0016297 -0.0302107)
+(0.0468097 0.00185503 -0.0296016)
+(0.0358618 0.00357863 -0.0289793)
+(0.0229712 0.00654084 -0.0284383)
+(0.0100983 0.0102935 -0.0280611)
+(-0.000798254 0.0142666 -0.0279051)
+(-0.00805919 0.0178543 -0.0279941)
+(-0.0105773 0.0205075 -0.0283147)
+(-0.00796732 0.0218196 -0.0288181)
+(-0.000625283 0.0215895 -0.0294276)
+(0.00171012 0.0205681 -0.028476)
+(0.0144738 0.0175373 -0.0291525)
+(0.027195 0.0137082 -0.0294907)
+(0.0379359 0.00966506 -0.0294391)
+(0.0450615 0.00602243 -0.0290058)
+(0.047489 0.00333215 -0.0282568)
+(0.0448507 0.0020009 -0.0273061)
+(0.0375495 0.00223003 -0.0262984)
+(0.0266966 0.00398564 -0.0253869)
+(0.0139424 0.00700319 -0.0247105)
+(0.00122675 0.0108262 -0.0243719)
+(-0.00951587 0.0148739 -0.0244229)
+(-0.0166496 0.0185291 -0.0248558)
+(-0.0190866 0.0212326 -0.0256048)
+(-0.0164538 0.02257 -0.0265558)
+(-0.00915081 0.0223363 -0.0275641)
+(-0.00949365 0.0213934 -0.0269358)
+(0.0031327 0.0181411 -0.0277116)
+(0.0157599 0.014065 -0.0279957)
+(0.0264645 0.0097872 -0.0277452)
+(0.033617 0.00595787 -0.0269983)
+(0.0361303 0.00315729 -0.0258688)
+(0.033624 0.0018089 -0.0245287)
+(0.0264807 0.00211659 -0.0231818)
+(0.0157877 0.00403445 -0.0220331)
+(0.0031711 0.00727324 -0.0212573)
+(-0.00945045 0.0113428 -0.0209727)
+(-0.0201567 0.015625 -0.0212225)
+(-0.0273173 0.019467 -0.021969)
+(-0.0298404 0.0222811 -0.0230985)
+(-0.0273397 0.0236359 -0.0244392)
+(-0.0201947 0.0233238 -0.0257867)
+(-0.0215758 0.0222035 -0.0256628)
+(-0.0090668 0.0185974 -0.0264863)
+(0.00354389 0.0141357 -0.0267094)
+(0.0143352 0.00949896 -0.0262985)
+(0.0216645 0.00539223 -0.0253161)
+(0.0244179 0.00243795 -0.0239119)
+(0.0221783 0.0010829 -0.0222996)
+(0.0152879 0.00153191 -0.0207246)
+(0.00479535 0.00371754 -0.0194266)
+(-0.00770369 0.00730981 -0.0186029)
+(-0.0203085 0.0117648 -0.0183792)
+(-0.0311015 0.0164058 -0.0187895)
+(-0.038439 0.0205252 -0.0197715)
+(-0.0412023 0.0234933 -0.0211759)
+(-0.0389685 0.0248551 -0.0227887)
+(-0.0320765 0.0244018 -0.0243643)
+(-0.0326966 0.0228752 -0.0248495)
+(-0.0202672 0.018837 -0.025662)
+(-0.00759315 0.0139094 -0.0258264)
+(0.00339475 0.00884427 -0.0253178)
+(0.011024 0.00441166 -0.0242138)
+(0.014135 0.00128365 -0.0226825)
+(0.0122563 -6.65819e-05 -0.020957)
+(0.00567522 0.000564999 -0.0192998)
+(-0.00460675 0.00308315 -0.0179631)
+(-0.017026 0.00710731 -0.0171503)
+(-0.0296941 0.0120279 -0.0169853)
+(-0.0406837 0.0170973 -0.0174933)
+(-0.0483213 0.0215428 -0.018597)
+(-0.0514424 0.0246848 -0.0201286)
+(-0.0495697 0.026042 -0.0218547)
+(-0.0429869 0.0254063 -0.0235125)
+(-0.0411621 0.0233063 -0.02462)
+(-0.0287624 0.0188233 -0.0253643)
+(-0.0159547 0.0134208 -0.025481)
+(-0.00469029 0.00792283 -0.0249525)
+(0.00331638 0.00316548 -0.0238593)
+(0.00684819 -0.000129823 -0.0223678)
+(0.00536966 -0.00146449 -0.0207052)
+(-0.000892785 -0.000636884 -0.0191243)
+(-0.0109861 0.00222793 -0.0178656)
+(-0.0233756 0.00669666 -0.0171209)
+(-0.0361772 0.0120921 -0.0170035)
+(-0.0474433 0.0175943 -0.0175315)
+(-0.0554585 0.0223647 -0.0186246)
+(-0.0590005 0.0256743 -0.0201164)
+(-0.0575281 0.0270161 -0.0217797)
+(-0.0512639 0.0261843 -0.0233612)
+(-0.0456822 0.0234312 -0.0250104)
+(-0.0332579 0.0185584 -0.0256397)
+(-0.0202668 0.0127441 -0.0257271)
+(-0.008688 0.0068749 -0.0252593)
+(-0.000283961 0.00184342 -0.0243076)
+(0.00366777 -0.00158725 -0.023017)
+(0.00256783 -0.00289795 -0.0215838)
+(-0.00341502 -0.00189067 -0.020226)
+(-0.0133703 0.00128219 -0.0191503)
+(-0.0257843 0.00614047 -0.0185204)
+(-0.0387694 0.0119477 -0.0184324)
+(-0.0503499 0.0178213 -0.0188998)
+(-0.0587625 0.0228661 -0.0198515)
+(-0.0627246 0.0263112 -0.0211426)
+(-0.0616307 0.027629 -0.0225765)
+(-0.0556461 0.0266173 -0.0239347)
+(-0.0455681 0.0232305 -0.0259629)
+(-0.0330686 0.0180825 -0.026448)
+(-0.0198721 0.0119823 -0.0265288)
+(-0.00798911 0.00585996 -0.0261932)
+(0.000771761 0.000646714 -0.0254923)
+(0.00507861 -0.00286674 -0.0245328)
+(0.00427802 -0.00414867 -0.0234607)
+(-0.00150684 -0.00300541 -0.022439)
+(-0.0113957 0.000389974 -0.0216232)
+(-0.0238849 0.00552349 -0.0211376)
+(-0.0370753 0.0116168 -0.0210562)
+(-0.0489602 0.0177436 -0.0213915)
+(-0.0577297 0.0229704 -0.0220926)
+(-0.0620469 0.0264983 -0.0230526)
+(-0.0612524 0.0277873 -0.0241253)
+(-0.0554656 0.0266394 -0.0251473)
+(-0.0397651 0.0252068 -0.0273597)
+(-0.0273891 0.0198 -0.0275976)
+(-0.0142684 0.0133804 -0.0275208)
+(-0.00240176 0.00692694 -0.027141)
+(0.00640454 0.00142097 -0.0265161)
+(0.0108117 -0.00230211 -0.0257411)
+(0.0101509 -0.00367857 -0.0249338)
+(0.00452406 -0.00250032 -0.0242171)
+(-0.00521251 0.00105426 -0.0237001)
+(-0.0175784 0.0064469 -0.0234615)
+(-0.0306931 0.0128597 -0.0235378)
+(-0.0425614 0.0193178 -0.0239176)
+(-0.0513761 0.024837 -0.024543)
+(-0.0557934 0.0285742 -0.0253186)
+(-0.0551386 0.0299574 -0.0261263)
+(-0.04951 0.0287746 -0.0268431)
+(-0.0313044 0.024555 -0.0288821)
+(-0.0187992 0.0192188 -0.028981)
+(-0.00553157 0.0128868 -0.0289393)
+(0.00647726 0.00652446 -0.0287632)
+(0.0153995 0.00109927 -0.0284796)
+(0.0198786 -0.0025657 -0.0281316)
+(0.0192348 -0.00391551 -0.0277719)
+(0.0135675 -0.00274609 -0.0274553)
+(0.00373899 0.000765594 -0.0272301)
+(-0.0087562 0.00608779 -0.0271305)
+(-0.022018 0.0124133 -0.0271719)
+(-0.0340286 0.0187805 -0.0273481)
+(-0.0429592 0.024219 -0.0276322)
+(-0.0474483 0.0278979 -0.0279808)
+(-0.0468104 0.0292542 -0.0283408)
+(-0.0411413 0.02808 -0.0286573)
+(-0.0203231 0.0240083 -0.0305533)
+(-0.00768584 0.0189078 -0.0305517)
+(0.00566658 0.0128368 -0.0305577)
+(0.0177001 0.00672094 -0.0305704)
+(0.0265832 0.00149014 -0.0305879)
+(0.0309653 -0.00206209 -0.0306074)
+(0.0301813 -0.00339794 -0.0306258)
+(0.0243519 -0.00231539 -0.0306402)
+(0.0143642 0.00102186 -0.0306485)
+(0.00173677 0.0061086 -0.0306496)
+(-0.01161 0.0121734 -0.0306433)
+(-0.0236454 0.0182943 -0.0306308)
+(-0.0325368 0.0235384 -0.0306138)
+(-0.0369288 0.0271044 -0.0305949)
+(-0.0361505 0.0284464 -0.0305767)
+(-0.0303192 0.0273588 -0.0305621)
+(-0.00849379 0.0236501 -0.0321173)
+(0.0042583 0.0189145 -0.0320688)
+(0.0176206 0.0132382 -0.032128)
+(0.0295577 0.00748653 -0.0322859)
+(0.0382526 0.00253412 -0.0325183)
+(0.0423834 -0.000867963 -0.03279)
+(0.0413233 -0.0022047 -0.0330592)
+(0.0352349 -0.00127385 -0.0332852)
+(0.0250447 0.00178397 -0.0334334)
+(0.0123023 0.0065061 -0.0334814)
+(-0.00105446 0.0121766 -0.033422)
+(-0.0129934 0.0179333 -0.0332644)
+(-0.0216965 0.0228989 -0.0330323)
+(-0.025837 0.0263145 -0.0327612)
+(-0.0247824 0.0276571 -0.0324921)
+(-0.0186922 0.0267211 -0.032266)
+(0.00238291 0.023535 -0.0333349)
+(0.0152151 0.019238 -0.0333003)
+(0.0285108 0.0140298 -0.03341)
+(0.0402448 0.00870475 -0.0336472)
+(0.0486311 0.00407229 -0.0339758)
+(0.0523946 0.000834892 -0.0343457)
+(0.0509646 -0.00051745 -0.0347006)
+(0.0445598 0.000219922 -0.0349863)
+(0.034155 0.00293587 -0.0351595)
+(0.0213323 0.00721974 -0.0351937)
+(0.00804197 0.0124222 -0.035084)
+(-0.00369393 0.0177525 -0.034847)
+(-0.0120883 0.0223979 -0.0345187)
+(-0.0158613 0.0256485 -0.0341491)
+(-0.0144367 0.0270065 -0.0337943)
+(-0.00803001 0.026264 -0.0335084)
+(0.0106521 0.0236805 -0.034021)
+(0.0235174 0.0198289 -0.0340589)
+(0.0366801 0.0150913 -0.0342085)
+(0.0481354 0.0101901 -0.034447)
+(0.0561397 0.0058705 -0.0347383)
+(0.059476 0.00278725 -0.0350378)
+(0.0576385 0.00140697 -0.0352999)
+(0.0509081 0.00193857 -0.0354848)
+(0.040309 0.00430226 -0.0355642)
+(0.0274531 0.00814094 -0.0355261)
+(0.0142956 0.012873 -0.0353764)
+(0.00283846 0.0177793 -0.0351379)
+(-0.0051737 0.0221117 -0.0348469)
+(-0.00851936 0.0252079 -0.0345476)
+(-0.00668716 0.0265938 -0.0342855)
+(4.51114e-05 0.026057 -0.0341006)
+(0.0150562 0.0240645 -0.0340723)
+(0.0279024 0.0205973 -0.03423)
+(0.0408861 0.0162608 -0.034403)
+(0.0520294 0.0117165 -0.0345648)
+(0.0596364 0.00765498 -0.0346909)
+(0.0625504 0.00469192 -0.034762)
+(0.0603301 0.00327563 -0.0347672)
+(0.0533145 0.00362053 -0.0347059)
+(0.0425712 0.00567519 -0.0345872)
+(0.0297342 0.00912955 -0.0344293)
+(0.0167558 0.0134605 -0.0342562)
+(0.00561069 0.0180098 -0.0340944)
+(-0.00200403 0.0220839 -0.0339684)
+(-0.00492737 0.0250598 -0.0338974)
+(-0.00271228 0.0264816 -0.0338922)
+(0.00430516 0.0261317 -0.0339536)
+(0.0149254 0.0246282 -0.0334825)
+(0.0277034 0.021426 -0.0337895)
+(0.0404891 0.0173604 -0.0339657)
+(0.0513347 0.0130514 -0.0339843)
+(0.0585895 0.00915402 -0.0338425)
+(0.0611507 0.00625893 -0.0335619)
+(0.0586303 0.0048041 -0.0331853)
+(0.0514133 0.0050098 -0.0327699)
+(0.0405979 0.00684575 -0.0323789)
+(0.0278291 0.0100351 -0.0320719)
+(0.0150488 0.0140952 -0.0318956)
+(0.00420148 0.0184089 -0.0318768)
+(-0.00306104 0.0223187 -0.0320184)
+(-0.00563144 0.0252266 -0.032299)
+(-0.0031164 0.026687 -0.0326758)
+(0.00410234 0.0264765 -0.0330914)
+(0.0102795 0.0252858 -0.0323425)
+(0.0229505 0.0221889 -0.0328053)
+(0.0355493 0.0182224 -0.0329642)
+(0.0461567 0.0139916 -0.032795)
+(0.0531582 0.0101394 -0.0323235)
+(0.0554895 0.00724972 -0.0316216)
+(0.0527977 0.0057597 -0.0307962)
+(0.0454938 0.0058949 -0.0299728)
+(0.0346893 0.00763573 -0.0292767)
+(0.0220276 0.0107198 -0.0288139)
+(0.00943412 0.0146804 -0.0286548)
+(-0.00117493 0.0189159 -0.0288236)
+(-0.00818411 0.0227803 -0.0292949)
+(-0.0105247 0.0256828 -0.0299968)
+(-0.00783825 0.0271787 -0.0308225)
+(-0.000532694 0.0270389 -0.0316462)
+(0.00182458 0.0259372 -0.0308258)
+(0.0143661 0.0227697 -0.0314274)
+(0.0268179 0.0187157 -0.0315511)
+(0.0372829 0.0143939 -0.0311781)
+(0.0441685 0.0104611 -0.0303653)
+(0.0464279 0.00751342 -0.0292365)
+(0.0437192 0.0059969 -0.0279636)
+(0.036456 0.00614104 -0.0267402)
+(0.0257438 0.00792483 -0.0257526)
+(0.0132116 0.0110794 -0.025151)
+(0.000765375 0.0151272 -0.025027)
+(-0.00970124 0.0194534 -0.0253995)
+(-0.0165945 0.0233984 -0.026212)
+(-0.0188633 0.0263591 -0.0273408)
+(-0.0161601 0.0278817 -0.0286141)
+(-0.0088954 0.0277332 -0.0298379)
+(-0.00915329 0.0264833 -0.029162)
+(0.00325609 0.0230801 -0.0298642)
+(0.0156229 0.0187653 -0.0299402)
+(0.0260631 0.0141971 -0.0293785)
+(0.0329877 0.01007 -0.0282648)
+(0.0353442 0.00700986 -0.0267685)
+(0.0327757 0.00547954 -0.0251176)
+(0.0256747 0.00571066 -0.0235632)
+(0.0151219 0.00766893 -0.0223419)
+(0.00272202 0.0110589 -0.0216396)
+(-0.00963908 0.0153673 -0.0215631)
+(-0.0200808 0.0199396 -0.0221243)
+(-0.0270132 0.0240789 -0.0232378)
+(-0.0293792 0.0271523 -0.0247341)
+(-0.0268165 0.0286891 -0.0263855)
+(-0.019714 0.0284538 -0.0279404)
+(-0.0209836 0.026841 -0.0276028)
+(-0.00868895 0.023073 -0.0283522)
+(0.00366801 0.0183636 -0.0283753)
+(0.0142048 0.0134312 -0.0276687)
+(0.0213175 0.00902592 -0.0263401)
+(0.0239252 0.0058157 -0.0245917)
+(0.0216327 0.00428634 -0.0226898)
+(0.0147906 0.00466922 -0.0209237)
+(0.00444 0.00690692 -0.0195622)
+(-0.00784492 0.0106615 -0.0188126)
+(-0.020196 0.0153642 -0.0187889)
+(-0.0307342 0.0203005 -0.019495)
+(-0.0378549 0.0247182 -0.0208234)
+(-0.0404722 0.0279419 -0.0225719)
+(-0.0381857 0.029478 -0.0244744)
+(-0.0313421 0.0290911 -0.0262411)
+(-0.0318651 0.0269561 -0.0263845)
+(-0.0196503 0.0227495 -0.0271205)
+(-0.00722655 0.0175719 -0.0270934)
+(0.00351336 0.012213 -0.0263077)
+(0.0109347 0.00748768 -0.024883)
+(0.0139095 0.00411273 -0.0230362)
+(0.0119868 0.00259893 -0.0210485)
+(0.00546082 0.00317524 -0.0192223)
+(-0.00467533 0.00575478 -0.0178355)
+(-0.0168802 0.00994756 -0.0170993)
+(-0.029298 0.0151182 -0.0171257)
+(-0.0400393 0.0204812 -0.0179109)
+(-0.0474687 0.025219 -0.0193355)
+(-0.0504534 0.0286077 -0.0211826)
+(-0.0485367 0.0301284 -0.0231709)
+(-0.0420093 0.0295482 -0.0249976)
+(-0.0401401 0.0268109 -0.0256928)
+(-0.0279581 0.022159 -0.0263565)
+(-0.0154012 0.0165108 -0.0262896)
+(-0.00438251 0.0107278 -0.0255026)
+(0.00342094 0.00568952 -0.0241152)
+(0.00682284 0.00216025 -0.0223388)
+(0.00530749 0.000674258 -0.0204436)
+(-0.000893107 0.00145622 -0.0187181)
+(-0.0108353 0.00438797 -0.0174249)
+(-0.0230072 0.00902594 -0.0167607)
+(-0.035558 0.0146671 -0.016827)
+(-0.0465782 0.0204541 -0.0176136)
+(-0.0543898 0.0255051 -0.019001)
+(-0.0578018 0.0290484 -0.0207778)
+(-0.0562925 0.0305414 -0.0226736)
+(-0.0500904 0.0297554 -0.0243996)
+(-0.0445476 0.0264276 -0.0256342)
+(-0.0323465 0.0213911 -0.0261778)
+(-0.0196104 0.0153417 -0.0260875)
+(-0.00827962 0.00920173 -0.0253771)
+(-7.8809e-05 0.00390517 -0.0241548)
+(0.00374532 0.000255536 -0.0226068)
+(0.00261279 -0.00119462 -0.0209684)
+(-0.00330266 -0.000226058 -0.0194892)
+(-0.0131008 0.00301467 -0.018394)
+(-0.0252917 0.00803699 -0.0178499)
+(-0.0380217 0.0140794 -0.0179396)
+(-0.049354 0.0202235 -0.0186497)
+(-0.0575631 0.025533 -0.0198721)
+(-0.0613974 0.0291968 -0.0214207)
+(-0.060271 0.030654 -0.0230596)
+(-0.054354 0.0296813 -0.0245392)
+(-0.0444158 0.0258643 -0.0262191)
+(-0.0321466 0.0205628 -0.0266132)
+(-0.0192125 0.0142425 -0.0265194)
+(-0.00758401 0.00786707 -0.025952)
+(0.000968961 0.00240627 -0.0249975)
+(0.00514608 -0.00131144 -0.023801)
+(0.00431365 -0.00272313 -0.0225448)
+(-0.00140031 -0.00161542 -0.0214197)
+(-0.0111262 0.00184402 -0.0205972)
+(-0.0233853 0.00713134 -0.0202025)
+(-0.0363133 0.0134447 -0.0202958)
+(-0.0479434 0.0198244 -0.020863)
+(-0.0565048 0.0252984 -0.0218179)
+(-0.0606921 0.0290303 -0.0230149)
+(-0.0598657 0.030449 -0.0242717)
+(-0.0541501 0.0293369 -0.0253969)
+(-0.0387735 0.0256664 -0.0231445)
+(-0.0267184 0.0201372 -0.0232326)
+(-0.013932 0.0135316 -0.0229704)
+(-0.00236224 0.00685677 -0.0223978)
+(0.00622978 0.00112791 -0.021602)
+(0.0105378 -0.00278562 -0.0207041)
+(0.00990809 -0.00429103 -0.0198405)
+(0.00443789 -0.00316055 -0.0191428)
+(-0.00504034 0.000434653 -0.018717)
+(-0.0170854 0.00595005 -0.0186283)
+(-0.0298657 0.012549 -0.0188901)
+(-0.0414369 0.0192283 -0.0194628)
+(-0.0500371 0.02497 -0.0202591)
+(-0.0543551 0.0288974 -0.0211577)
+(-0.0537315 0.0304095 -0.0220216)
+(-0.0482599 0.0292745 -0.0227193)
+(-0.0306891 0.0251437 -0.0243236)
+(-0.0185119 0.0196974 -0.0242679)
+(-0.0055862 0.0131949 -0.0240372)
+(0.00611899 0.00662747 -0.0236666)
+(0.0148219 0.000993977 -0.0232125)
+(0.0191995 -0.00285076 -0.022744)
+(0.0185873 -0.00432437 -0.0223322)
+(0.0130799 -0.0032039 -0.0220397)
+(0.00351541 0.00034108 -0.0219112)
+(-0.00865182 0.0057737 -0.0219662)
+(-0.0215716 0.0122699 -0.0221967)
+(-0.0332783 0.0188419 -0.0225675)
+(-0.0419894 0.0244884 -0.0230222)
+(-0.0463769 0.0283468 -0.0234913)
+(-0.0457707 0.0298268 -0.0239034)
+(-0.0402617 0.0287017 -0.0241957)
+(-0.0201099 0.0248934 -0.0258301)
+(-0.00780838 0.0196949 -0.0256712)
+(0.00519351 0.0134662 -0.0254825)
+(0.0169151 0.00715705 -0.025293)
+(0.0255723 0.0017268 -0.0251313)
+(0.0298488 -0.0020006 -0.0250219)
+(0.0290958 -0.00346063 -0.0249814)
+(0.023429 -0.00243231 -0.0250158)
+(0.0137109 0.000928851 -0.0251202)
+(0.00141918 0.00611396 -0.0252785)
+(-0.0115769 0.0123365 -0.025467)
+(-0.0233001 0.0186506 -0.0256569)
+(-0.0319654 0.0240937 -0.0258192)
+(-0.0362517 0.0278346 -0.0259291)
+(-0.0355044 0.0293007 -0.0259698)
+(-0.029836 0.0282675 -0.025935)
+(-0.00864708 0.0249537 -0.027433)
+(0.00376204 0.02013 -0.0272272)
+(0.0167653 0.0143044 -0.0270848)
+(0.0283819 0.00836493 -0.0270277)
+(0.0368436 0.00321485 -0.0270644)
+(0.040864 -0.000364599 -0.0271893)
+(0.039833 -0.00183133 -0.0273831)
+(0.0339089 -0.000963309 -0.0276165)
+(0.0239931 0.0021084 -0.0278538)
+(0.0115936 0.00691894 -0.0280592)
+(-0.001404 0.0127388 -0.0282015)
+(-0.0130222 0.0186832 -0.0282589)
+(-0.0214919 0.0238461 -0.0282228)
+(-0.0255219 0.0274388 -0.0280984)
+(-0.0244965 0.0289113 -0.0279046)
+(-0.0185708 0.0280383 -0.0276709)
+(0.00195434 0.0253156 -0.0288873)
+(0.014438 0.0209367 -0.0286979)
+(0.0273677 0.0155818 -0.0285989)
+(0.0387738 0.0100673 -0.0286055)
+(0.0469201 0.00523159 -0.0287165)
+(0.0505682 0.00180818 -0.028915)
+(0.0491646 0.000315445 -0.0291706)
+(0.0429244 0.000979423 -0.0294445)
+(0.0327971 0.00370012 -0.0296949)
+(0.0203229 0.00806608 -0.029884)
+(0.00739871 0.0134154 -0.0299829)
+(-0.00400898 0.018935 -0.0299767)
+(-0.0121631 0.0237833 -0.0298661)
+(-0.0158206 0.0272196 -0.029668)
+(-0.0144226 0.0287179 -0.0294124)
+(-0.00818076 0.0280489 -0.0291382)
+(0.0100815 0.0259238 -0.0299717)
+(0.0225952 0.0219921 -0.0298595)
+(0.0353875 0.017104 -0.0297943)
+(0.0465096 0.0120049 -0.0297861)
+(0.0542686 0.00746998 -0.0298359)
+(0.0574849 0.00418696 -0.0299362)
+(0.055671 0.00265289 -0.0300716)
+(0.0491041 0.00310014 -0.0302216)
+(0.0387836 0.00546171 -0.0303633)
+(0.0262791 0.00938077 -0.0304752)
+(0.0134923 0.0142634 -0.0305404)
+(0.00236862 0.0193675 -0.0305489)
+(-0.00539806 0.0239149 -0.0304994)
+(-0.00862369 0.0272106 -0.0303993)
+(-0.00681517 0.0287501 -0.0302639)
+(-0.000246664 0.0282979 -0.0301137)
+(0.0144983 0.0266858 -0.0305223)
+(0.0269931 0.0231354 -0.0305363)
+(0.039605 0.0186392 -0.0304902)
+(0.0504128 0.0138828 -0.0303908)
+(0.0577716 0.00958923 -0.0302533)
+(0.0605625 0.00640958 -0.0300986)
+(0.0583628 0.00482518 -0.0299502)
+(0.0515084 0.00507606 -0.0298308)
+(0.0410426 0.00712507 -0.0297584)
+(0.028557 0.0106629 -0.0297442)
+(0.0159505 0.0151537 -0.0297904)
+(0.00514108 0.019915 -0.0298898)
+(-0.00222521 0.0242208 -0.0300275)
+(-0.00502532 0.0274129 -0.0301823)
+(-0.00283096 0.0290028 -0.0303307)
+(0.00402496 0.0287471 -0.0304501)
+(0.0145333 0.0274853 -0.0304568)
+(0.0269627 0.0241925 -0.0306269)
+(0.0393788 0.0199535 -0.0305821)
+(0.04989 0.0154149 -0.0303292)
+(0.0568964 0.0112667 -0.0299068)
+(0.059333 0.0081377 -0.0293791)
+(0.0568308 0.00650167 -0.0288265)
+(0.049772 0.00660643 -0.0283331)
+(0.0392308 0.00843704 -0.027974)
+(0.0268104 0.0117174 -0.0278039)
+(0.0143998 0.0159509 -0.0278486)
+(0.0038871 0.0204941 -0.0281014)
+(-0.0031268 0.0246545 -0.0285238)
+(-0.00557252 0.0277959 -0.0290515)
+(-0.00307576 0.0294375 -0.0296042)
+(0.00398456 0.0293281 -0.0300977)
+(0.0101807 0.0282007 -0.0297862)
+(0.0225086 0.0250023 -0.0301185)
+(0.0347432 0.0208468 -0.0300572)
+(0.0450204 0.016368 -0.0296119)
+(0.0517761 0.0122469 -0.0288503)
+(0.0539834 0.00910823 -0.0278885)
+(0.0513082 0.00742713 -0.0268728)
+(0.0441589 0.00745829 -0.0259578)
+(0.0336238 0.00919792 -0.0252828)
+(0.0213049 0.0123838 -0.0249506)
+(0.00907594 0.0165335 -0.0250116)
+(-0.0012027 0.0210167 -0.0254567)
+(-0.00796586 0.0251498 -0.0262182)
+(-0.0101823 0.028301 -0.0271801)
+(-0.00751256 0.0299879 -0.028196)
+(-0.000361932 0.0299523 -0.0291111)
+(0.0021022 0.0287229 -0.0286126)
+(0.0143079 0.0254416 -0.0290884)
+(0.0264028 0.0211831 -0.0289956)
+(0.0365446 0.016597 -0.0283482)
+(0.0431893 0.0123807 -0.0272449)
+(0.0453271 0.0091734 -0.0258537)
+(0.0426346 0.00746067 -0.0243865)
+(0.0355227 0.00750195 -0.0230664)
+(0.025074 0.00929186 -0.0220945)
+(0.0128777 0.0125605 -0.0216185)
+(0.000788318 0.016813 -0.0217111)
+(-0.00935469 0.0214032 -0.0223582)
+(-0.0160069 0.0256315 -0.0234613)
+(-0.018154 0.0288514 -0.0248525)
+(-0.0154671 0.0305702 -0.02632)
+(-0.00835393 0.0305247 -0.0276404)
+(-0.00847358 0.0289726 -0.0271133)
+(0.00360767 0.0254436 -0.0276925)
+(0.0156264 0.0209113 -0.0275576)
+(0.0257516 0.0160671 -0.0267293)
+(0.0324421 0.0116477 -0.0253338)
+(0.0346809 0.0083233 -0.0235835)
+(0.0321293 0.00659714 -0.021745)
+(0.0251769 0.00673068 -0.0200979)
+(0.0148819 0.00870446 -0.0188931)
+(0.00281012 0.0122206 -0.0183138)
+(-0.0092028 0.0167465 -0.0184482)
+(-0.0193292 0.0215947 -0.0192761)
+(-0.0260272 0.026026 -0.0206714)
+(-0.0282755 0.0293634 -0.0224218)
+(-0.0257296 0.0310959 -0.0242608)
+(-0.018776 0.0309584 -0.0259082)
+(-0.0199374 0.0289119 -0.0255151)
+(-0.00796366 0.0250081 -0.0261415)
+(0.00405373 0.0200729 -0.0259606)
+(0.014284 0.0148591 -0.0250001)
+(0.0211699 0.0101596 -0.0234063)
+(0.0236648 0.00668733 -0.0214218)
+(0.0213909 0.00496796 -0.0193487)
+(0.0146958 0.00526184 -0.0175026)
+(0.00459838 0.00752507 -0.0161644)
+(-0.00736571 0.0114157 -0.0155377)
+(-0.0193771 0.0163443 -0.0157181)
+(-0.0296086 0.021562 -0.0166782)
+(-0.0365021 0.0262735 -0.0182719)
+(-0.0390066 0.029759 -0.0202566)
+(-0.0367387 0.031485 -0.0223301)
+(-0.0300424 0.0311872 -0.0241767)
+(-0.0305437 0.0285501 -0.0240602)
+(-0.0186443 0.0242015 -0.0246706)
+(-0.00655314 0.0187955 -0.0244466)
+(0.00388772 0.0131568 -0.0234226)
+(0.011089 0.00814292 -0.0217546)
+(0.0139561 0.00451454 -0.0196964)
+(0.0120546 0.00282112 -0.0175614)
+(0.00567531 0.00331901 -0.0156744)
+(-0.0042108 0.00593322 -0.0143227)
+(-0.0161004 0.0102684 -0.013712)
+(-0.0281854 0.0156675 -0.0139354)
+(-0.0386275 0.0213101 -0.014959)
+(-0.0458365 0.0263362 -0.0166271)
+(-0.0487134 0.0299781 -0.0186856)
+(-0.046818 0.0316783 -0.0208211)
+(-0.0404376 0.0311766 -0.0227085)
+(-0.0386767 0.0279424 -0.0229704)
+(-0.0268072 0.0231465 -0.0235036)
+(-0.0145784 0.0172737 -0.0232461)
+(-0.00385347 0.0112195 -0.022237)
+(0.00373516 0.00590465 -0.0206301)
+(0.00703388 0.00213572 -0.01867)
+(0.00554265 0.000483488 -0.016655)
+(-0.000510163 0.00119798 -0.0148917)
+(-0.0102033 0.00417126 -0.0136486)
+(-0.0220629 0.00895338 -0.0131149)
+(-0.0342855 0.0148193 -0.0133719)
+(-0.0450117 0.0208774 -0.0143807)
+(-0.0526082 0.0262046 -0.0159877)
+(-0.0559169 0.0299873 -0.0179482)
+(-0.0544318 0.0316465 -0.0199638)
+(-0.0483778 0.0309281 -0.0217273)
+(-0.0430971 0.027181 -0.0224126)
+(-0.0312084 0.0220038 -0.0228195)
+(-0.0187992 0.015739 -0.0225429)
+(-0.00775992 0.00934192 -0.0216248)
+(0.000229038 0.00378554 -0.0202051)
+(0.00395318 -8.69589e-05 -0.0184999)
+(0.00284771 -0.00168902 -0.0167687)
+(-0.00291771 -0.000778262 -0.0152749)
+(-0.0124656 0.00250754 -0.0142459)
+(-0.0243442 0.00767088 -0.0138384)
+(-0.0367472 0.0139287 -0.0141145)
+(-0.0477878 0.0203298 -0.0150324)
+(-0.0557848 0.0258988 -0.0164524)
+(-0.059519 0.0297852 -0.0181581)
+(-0.0584197 0.0313942 -0.0198899)
+(-0.052653 0.0304794 -0.0213838)
+(-0.043131 0.0263818 -0.0224734)
+(-0.0311772 0.0209471 -0.022724)
+(-0.0185721 0.014425 -0.0224456)
+(-0.0072362 0.00780996 -0.0216808)
+(0.0011051 0.00210817 -0.020546)
+(0.00518366 -0.00181511 -0.0192138)
+(0.00438073 -0.00336562 -0.0178869)
+(-0.00118009 -0.00230879 -0.0167673)
+(-0.0106525 0.0011954 -0.0160253)
+(-0.0225962 0.00661624 -0.0157741)
+(-0.0351951 0.0131315 -0.016052)
+(-0.0465324 0.0197507 -0.0168167)
+(-0.0548818 0.0254653 -0.017952)
+(-0.0589704 0.0294025 -0.0192848)
+(-0.0581737 0.0309599 -0.0206122)
+(-0.0526115 0.0298988 -0.0217318)
+(-0.0380137 0.0240431 -0.015329)
+(-0.0263135 0.0184274 -0.0152359)
+(-0.013873 0.0116808 -0.014806)
+(-0.00258754 0.00483179 -0.014105)
+(0.00582512 -0.00107784 -0.0132394)
+(0.0100859 -0.00515118 -0.012341)
+(0.00954837 -0.00677104 -0.0115463)
+(0.00429568 -0.00569221 -0.0109764)
+(-0.00487273 -0.00207798 -0.0107179)
+(-0.0165628 0.00352418 -0.0108105)
+(-0.028997 0.0102643 -0.0112401)
+(-0.0402836 0.0171177 -0.0119414)
+(-0.0487043 0.0230401 -0.0128075)
+(-0.0529752 0.027127 -0.0137066)
+(-0.0524439 0.0287533 -0.0145015)
+(-0.04719 0.0276701 -0.0150712)
+(-0.0304591 0.0236956 -0.0159316)
+(-0.0186433 0.0181705 -0.015689)
+(-0.00606744 0.0115386 -0.0152876)
+(0.00535243 0.00481092 -0.0147888)
+(0.0138781 -0.000989398 -0.0142683)
+(0.0182133 -0.00498205 -0.0138052)
+(0.0177001 -0.00656208 -0.0134699)
+(0.0124182 -0.0054903 -0.0133135)
+(0.00317126 -0.00192887 -0.0133598)
+(-0.00863462 0.00358279 -0.0136019)
+(-0.0212043 0.0102085 -0.014003)
+(-0.0326254 0.0169408 -0.0145023)
+(-0.041159 0.0227539 -0.0150234)
+(-0.0455042 0.02676 -0.0154871)
+(-0.0449972 0.0283462 -0.0158225)
+(-0.039714 0.0272698 -0.0159786)
+(-0.020397 0.0237137 -0.0170102)
+(-0.00846596 0.0184446 -0.0166608)
+(0.00417898 0.0120964 -0.0162975)
+(0.0156115 0.00563711 -0.0159755)
+(0.0240913 4.89008e-05 -0.0157437)
+(0.0283293 -0.00382019 -0.0156374)
+(0.0276823 -0.00538399 -0.0156724)
+(0.0222501 -0.00440569 -0.0158436)
+(0.0128594 -0.00103319 -0.016125)
+(0.000938278 0.00422283 -0.0164738)
+(-0.0117007 0.0105651 -0.0168371)
+(-0.0231345 0.0170292 -0.0171595)
+(-0.0316222 0.0226301 -0.017392)
+(-0.03587 0.0265124 -0.0174989)
+(-0.035229 0.0280821 -0.0174638)
+(-0.0297955 0.027099 -0.0172922)
+(-0.00935974 0.024095 -0.0183989)
+(0.00266828 0.0192079 -0.018002)
+(0.0153056 0.0132694 -0.0176803)
+(0.0266271 0.00718464 -0.0174829)
+(0.0349094 0.00187901 -0.0174396)
+(0.0388933 -0.00184252 -0.0175569)
+(0.0379744 -0.00341617 -0.0178169)
+(0.0322939 -0.00260359 -0.01818)
+(0.0227162 0.000472588 -0.018591)
+(0.0106978 0.00534678 -0.0189875)
+(-0.00193369 0.0112797 -0.0193092)
+(-0.0132565 0.0173694 -0.0195071)
+(-0.0215466 0.0226876 -0.019551)
+(-0.0255401 0.0264221 -0.0194341)
+(-0.0246271 0.0280013 -0.0191741)
+(-0.0189452 0.0271838 -0.0188105)
+(0.000972429 0.0247814 -0.0198854)
+(0.0130646 0.0203445 -0.0195072)
+(0.0256187 0.0148789 -0.0192245)
+(0.0367224 0.00921794 -0.0190803)
+(0.0446854 0.00422231 -0.0190965)
+(0.0482972 0.000649866 -0.0192705)
+(0.0470099 -0.000958252 -0.0195758)
+(0.0410207 -0.000358397 -0.0199658)
+(0.0312411 0.00235919 -0.0203814)
+(0.0191584 0.00678347 -0.0207594)
+(0.00661 0.0122436 -0.0210422)
+(-0.00449502 0.0179096 -0.0211868)
+(-0.0124657 0.0229177 -0.0211711)
+(-0.0160869 0.0265027 -0.0209974)
+(-0.0148053 0.0281162 -0.020692)
+(-0.00881475 0.0275114 -0.0203015)
+(0.00902765 0.0256683 -0.0212435)
+(0.0211412 0.0216811 -0.0209473)
+(0.0335492 0.01668 -0.0206948)
+(0.0443615 0.0114274 -0.0205244)
+(0.0519322 0.00672202 -0.020462)
+(0.0551103 0.0032775 -0.020517)
+(0.0534142 0.00161556 -0.0206811)
+(0.0471031 0.00198808 -0.0209292)
+(0.0371376 0.00433939 -0.0212237)
+(0.0250333 0.00831421 -0.0215197)
+(0.0126309 0.0133101 -0.0217724)
+(0.00181738 0.0185676 -0.0219431)
+(-0.0057608 0.0232852 -0.0220058)
+(-0.00894825 0.0267421 -0.021951)
+(-0.00725769 0.0284093 -0.0217868)
+(-0.000945299 0.0280319 -0.0215384)
+(0.0135809 0.0266207 -0.0222676)
+(0.0256699 0.0230142 -0.0221042)
+(0.037891 0.0183982 -0.0218685)
+(0.0483825 0.0134766 -0.0215964)
+(0.0555475 0.00899753 -0.0213294)
+(0.0582966 0.00564034 -0.0211079)
+(0.0562135 0.00391346 -0.0209658)
+(0.0496163 0.00407865 -0.0209246)
+(0.0395093 0.0061118 -0.0209908)
+(0.0274295 0.009706 -0.0211541)
+(0.0152139 0.0143167 -0.0213899)
+(0.00472112 0.0192432 -0.0216621)
+(-0.00245121 0.0237343 -0.0219294)
+(-0.00520954 0.0271037 -0.0221509)
+(-0.00313195 0.0288359 -0.022293)
+(0.00346646 0.0286659 -0.022334)
+(0.0139397 0.0274934 -0.0228033)
+(0.0259618 0.0241408 -0.0228032)
+(0.0379838 0.019772 -0.0225685)
+(0.0481741 0.0150535 -0.0221348)
+(0.0549817 0.0107024 -0.0215681)
+(0.0573718 0.00737868 -0.0209548)
+(0.0549824 0.00558565 -0.0203881)
+(0.0481785 0.00559513 -0.0199544)
+(0.0379958 0.00740667 -0.0197197)
+(0.0259828 0.0107471 -0.0197197)
+(0.0139664 0.0151104 -0.0199545)
+(0.00377491 0.0198336 -0.0203883)
+(-0.00303999 0.0241965 -0.020955)
+(-0.00543917 0.0275324 -0.0215684)
+(-0.00305539 0.0293308 -0.022135)
+(0.00374966 0.0293168 -0.0225686)
+(0.0100492 0.0281534 -0.0227699)
+(0.0219724 0.0248891 -0.0229391)
+(0.0338132 0.0205922 -0.0226893)
+(0.0437677 0.015918 -0.0220586)
+(0.0503207 0.0115771 -0.0211431)
+(0.0524762 0.00822791 -0.0200821)
+(0.049908 0.00637762 -0.0190372)
+(0.0430083 0.0063067 -0.0181674)
+(0.0328272 0.00802691 -0.0176051)
+(0.0209132 0.0112789 -0.017436)
+(0.00907813 0.0155703 -0.0176857)
+(-0.000877524 0.0202489 -0.0183163)
+(-0.00743783 0.0246015 -0.0192317)
+(-0.00960248 0.027963 -0.0202927)
+(-0.00703994 0.0298188 -0.0213377)
+(-0.000139087 0.0298854 -0.0222076)
+(0.0025007 0.0285004 -0.0221725)
+(0.0143079 0.0251455 -0.022491)
+(0.0260131 0.0207339 -0.0222126)
+(0.0358332 0.0159385 -0.0213797)
+(0.0422732 0.0114885 -0.0201191)
+(0.0443544 0.00805875 -0.0186229)
+(0.0417619 0.00616879 -0.0171187)
+(0.0348916 0.00610504 -0.0158356)
+(0.0247893 0.0078781 -0.0149688)
+(0.0129914 0.0112206 -0.0146503)
+(0.00129194 0.0156263 -0.0149286)
+(-0.00852913 0.0204259 -0.0157613)
+(-0.0149764 0.0248876 -0.0170217)
+(-0.0170669 0.0283298 -0.018518)
+(-0.0144802 0.0302256 -0.0200223)
+(-0.00760888 0.0302852 -0.0213057)
+(-0.00755802 0.0284816 -0.021101)
+(0.00413394 0.0248709 -0.0215262)
+(0.01577 0.0201756 -0.0212099)
+(0.0255773 0.015112 -0.0202002)
+(0.0320631 0.01045 -0.018651)
+(0.0342415 0.00689697 -0.0167982)
+(0.0317829 0.00499093 -0.0149237)
+(0.0250629 0.00502078 -0.0133129)
+(0.0151044 0.00698282 -0.0122109)
+(0.00342191 0.0105809 -0.0117856)
+(-0.00820815 0.01527 -0.0121016)
+(-0.0180164 0.0203376 -0.013111)
+(-0.0245096 0.0250113 -0.0146601)
+(-0.0266974 0.0285771 -0.0165131)
+(-0.0242448 0.0304892 -0.0183878)
+(-0.0175239 0.0304554 -0.0199989)
+(-0.0185963 0.0281001 -0.0197168)
+(-0.00700129 0.0241072 -0.0201899)
+(0.0046424 0.0190025 -0.0198322)
+(0.0145608 0.0135644 -0.0186983)
+(0.0212441 0.00861996 -0.0169607)
+(0.0236764 0.00491941 -0.0148841)
+(0.0214896 0.00302331 -0.0127846)
+(0.0150179 0.00321892 -0.0109816)
+(0.00524635 0.00547729 -0.00974975)
+(-0.00633905 0.00945718 -0.00927641)
+(-0.0179766 0.0145555 -0.00963374)
+(-0.0278959 0.0199975 -0.0107674)
+(-0.0345867 0.0249537 -0.0125049)
+(-0.0370286 0.0286672 -0.0145817)
+(-0.034848 0.0305698 -0.0166816)
+(-0.0283753 0.0303703 -0.0184848)
+(-0.0289335 0.0274139 -0.0182298)
+(-0.0174024 0.0229709 -0.0186846)
+(-0.00567531 0.0173932 -0.0182883)
+(0.00446096 0.0115313 -0.0171013)
+(0.0114635 0.00627681 -0.0153043)
+(0.0142679 0.00242713 -0.013171)
+(0.0124494 0.000565442 -0.0110259)
+(0.00628608 0.000973726 -0.00919573)
+(-0.00328387 0.00359065 -0.00795889)
+(-0.0148052 0.00802043 -0.00750375)
+(-0.0265259 0.0135915 -0.00789965)
+(-0.0366631 0.0194572 -0.00908642)
+(-0.0436733 0.0247237 -0.0108834)
+(-0.0464875 0.0285866 -0.0130171)
+(-0.0446752 0.030455 -0.0151625)
+(-0.038511 0.0300429 -0.016993)
+(-0.0369947 0.0265275 -0.0168664)
+(-0.0254848 0.0216348 -0.0172394)
+(-0.0136114 0.0155926 -0.0168131)
+(-0.00318357 0.00932215 -0.0156523)
+(0.00421138 0.00377729 -0.0139339)
+(0.00744932 -0.000200478 -0.0119194)
+(0.00603947 -0.0020085 -0.00991547)
+(0.000197834 -0.00137299 -0.00822703)
+(-0.00918645 0.00161014 -0.00711112)
+(-0.0206864 0.0064894 -0.00673767)
+(-0.0325534 0.0125249 -0.00716363)
+(-0.0429822 0.0187992 -0.00832423)
+(-0.0503848 0.0243562 -0.0100428)
+(-0.0536328 0.0283475 -0.0120577)
+(-0.0522293 0.0301622 -0.0140621)
+(-0.0463867 0.0295229 -0.0157507)
+(-0.0415514 0.0255757 -0.0158354)
+(-0.0300168 0.0203023 -0.0160755)
+(-0.0179564 0.0138748 -0.0156322)
+(-0.00720783 0.00727326 -0.014573)
+(0.000592897 0.0015019 -0.0130592)
+(0.00425985 -0.00256339 -0.0113211)
+(0.00323696 -0.00430663 -0.00962332)
+(-0.00231866 -0.00346391 -0.00822419)
+(-0.0115614 -0.000162659 -0.0073367)
+(-0.023086 0.00509724 -0.00709605)
+(-0.0351399 0.011518 -0.00753899)
+(-0.0458895 0.0181235 -0.00859816)
+(-0.0536981 0.0239073 -0.0101123)
+(-0.0573751 0.0279861 -0.0118509)
+(-0.0563586 0.0297361 -0.0135491)
+(-0.050802 0.0288894 -0.0149483)
+(-0.0419091 0.0247034 -0.0152952)
+(-0.0303077 0.019176 -0.0153716)
+(-0.0180482 0.0125011 -0.014927)
+(-0.00699846 0.00569646 -0.0140292)
+(0.00115964 -0.000203003 -0.0128149)
+(0.00518578 -0.00430185 -0.0114687)
+(0.00446921 -0.00597903 -0.0101956)
+(-0.000879594 -0.00498064 -0.00918923)
+(-0.0100466 -0.00145777 -0.00860287)
+(-0.0216378 0.00405598 -0.00852589)
+(-0.0338909 0.0107242 -0.00897013)
+(-0.0449418 0.017533 -0.00986803)
+(-0.0531078 0.0234451 -0.0110829)
+(-0.0571441 0.0275576 -0.0124296)
+(-0.0564339 0.0292414 -0.0137031)
+(-0.051084 0.0282388 -0.0147093)
+)
+;
 
 boundaryField
 {
@@ -25,23 +4125,23 @@ boundaryField
     {
         type            cyclic;
     }
-    patch1_half0
+    patch0_half1
     {
         type            cyclic;
     }
-    patch2_half0
+    patch1_half0
     {
         type            cyclic;
     }
-    patch2_half1
+    patch1_half1
     {
         type            cyclic;
     }
-    patch1_half1
+    patch2_half0
     {
         type            cyclic;
     }
-    patch0_half1
+    patch2_half1
     {
         type            cyclic;
     }
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/0/enstrophy b/tutorials/DNS/dnsFoam/boxTurb16/0/enstrophy
deleted file mode 100644
index 380467277085e99c8d011e9d12e61d6e2e11dc5f..0000000000000000000000000000000000000000
--- a/tutorials/DNS/dnsFoam/boxTurb16/0/enstrophy
+++ /dev/null
@@ -1,57 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "1";
-    object      enstrophy;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [ 0 0 -2 0 0 0 0 ];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    patch0_half0
-    {
-        type            cyclic;
-        value           uniform 0;
-    }
-    patch1_half0
-    {
-        type            cyclic;
-        value           uniform 0;
-    }
-    patch2_half0
-    {
-        type            cyclic;
-        value           uniform 0;
-    }
-    patch2_half1
-    {
-        type            cyclic;
-        value           uniform 0;
-    }
-    patch1_half1
-    {
-        type            cyclic;
-        value           uniform 0;
-    }
-    patch0_half1
-    {
-        type            cyclic;
-        value           uniform 0;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/Allclean b/tutorials/DNS/dnsFoam/boxTurb16/Allclean
index 9a9ff03ee175138c840b219b211e87a294c604d5..caccb99cfd54a81a326679621a45cc9e724317e1 100755
--- a/tutorials/DNS/dnsFoam/boxTurb16/Allclean
+++ b/tutorials/DNS/dnsFoam/boxTurb16/Allclean
@@ -5,7 +5,6 @@ cd ${0%/*} || exit 1    # run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-rm -rf 0
-cp -r 0.org 0
+rm -f 0/enstrophy
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution
index fb3f2564df1f0c15e28b5845cba8f0ca8cce978f..af30bb3339f08a84b55218845ea9af2b847bda59 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution
@@ -58,7 +58,7 @@ PIMPLE
 
 relaxationFactors
 {
-    "(Xi|Su)"     1;
+    "(Xi|Su)"       1;
 }
 
 
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution
index 3e76ec8fa40e59d96db1b38e7ddddaee3a0c0c1e..79bc7cfa55b094c9ff664b72b415d5b733401c65 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution
@@ -58,7 +58,7 @@ PIMPLE
 
 relaxationFactors
 {
-    "(Xi|Su)"     1;
+    "(Xi|Su)"       1;
 }
 
 
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
index e39ae484a2a7490df31e8b514a097ab689fa094d..474d11da9efe391fcf8b1fbc94915f048d7c92c6 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
@@ -72,8 +72,8 @@ relaxationFactors
 {
     "p.*"           0.3;
     "rho.*"         1;
-    "(U|h|k|epsilon|omega)"  0.7;
-    "(U|h|k|epsilon|omega)Final"       1;
+    "(U|h|k|epsilon|omega)" 0.7;
+    "(U|h|k|epsilon|omega)Final" 1;
 }
 
 
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSolution b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSolution
index 4efd7804cc17c8acebd372f7122423aea595fbea..3b632acd3677ff136980c41c9bf4e683c5a95414 100644
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSolution
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSolution
@@ -102,10 +102,10 @@ PIMPLE
 
 relaxationFactors
 {
-    U               1;
-    h               1;
-    k               1;
-    epsilon         1;
+    "U.*"           1;
+    "h.*"           1;
+    "k.*"           1;
+    "epsilon.*"     1;
 }
 
 
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSolution b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSolution
index fe0e7f68a1914f07f8a41a0804daff489d7fa3b8..5b39a0dbf18cc6fcf6164ee9edf164071dcad8da 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSolution
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSolution
@@ -62,9 +62,9 @@ SIMPLE
 
     residualControl
     {
-        p       1e-2;
-        U       1e-4;
-        T       1e-3;
+        p               1e-2;
+        U               1e-4;
+        T               1e-3;
 
         // possibly check turbulence fields
         "(k|epsilon|omega)" 1e-3;
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSolution b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSolution
index c83a7112f6e55645627ed0e5946ebc662b388031..27bbd4e6613dcd52b2a50a3d96a5dd93c94c0144 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSolution
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSolution
@@ -56,9 +56,9 @@ SIMPLE
 
     residualControl
     {
-        p       1e-3;
-        U       1e-4;
-        T       1e-3;
+        p               1e-3;
+        U               1e-4;
+        T               1e-3;
 
         // possibly check turbulence fields
         "(k|epsilon|omega)" 1e-3;
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSolution b/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSolution
index 58aea4483e9cd46104a4657da288b252b27b8bfb..0089b22eee591bc32782958a28f57fdb52eec0d0 100644
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSolution
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSolution
@@ -172,29 +172,29 @@ solvers
 SIMPLE
 {
     nNonOrthogonalCorrectors 0;
-    rhoMin      rhoMin [1 -3 0 0 0] 0.1;
-    rhoMax      rhoMax [1 -3 0 0 0] 1.0;
-    transonic   yes;
+    rhoMin          rhoMin [1 -3 0 0 0] 0.1;
+    rhoMax          rhoMax [1 -3 0 0 0] 1.0;
+    transonic       yes;
 }
 
 relaxationFactors
 {
-    p           1;
-    rho         1; //0.1;
-    U           0.9;
-    h           0.95;
-    k           0.9;
-    epsilon     0.9;
+    p               1;
+    rho             1; //0.1;
+    U               0.9;
+    h               0.95;
+    k               0.9;
+    epsilon         0.9;
 }
 
 relaxationFactors0
 {
-    p           0.3;
-    rho         0.1;
-    U           0.7;
-    h           0.7;
-    k           0.7;
-    epsilon     0.7;
+    p               0.3;
+    rho             0.1;
+    U               0.7;
+    h               0.7;
+    k               0.7;
+    epsilon         0.7;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution
index 3521fbaaa33b0d4539a2523752386382c648b5c4..c56bc7b9c2f40a1d26304e9d86b87874ebd429bc 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution
@@ -42,9 +42,9 @@ SIMPLE
 
     residualControl
     {
-        p_rgh   1e-2;
-        U       1e-4;
-        T       1e-2;
+        p_rgh           1e-2;
+        U               1e-4;
+        T               1e-2;
 
         // possibly check turbulence fields
         "(k|epsilon|omega)" 1e-3;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution
index 9235795a4ad417e44970710406bc70c0d3136317..3388d588bf8f23e4881185207581822e37a17870 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution
@@ -42,9 +42,9 @@ SIMPLE
 
     residualControl
     {
-        p_rgh   1e-2;
-        U       1e-4;
-        T       1e-3;
+        p_rgh           1e-2;
+        U               1e-4;
+        T               1e-3;
 
         // possibly check turbulence fields
         "(k|epsilon|omega)" 1e-3;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution
index 85e7a6f13db9c9d4186a159c75656758f147833e..271f262f8e19ed07d7895e81ffdd7defc41b3e16 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution
@@ -49,9 +49,9 @@ SIMPLE
 
     residualControl
     {
-        p_rgh   1e-2;
-        U       1e-3;
-        h       1e-3;
+        p_rgh           1e-2;
+        U               1e-3;
+        h               1e-3;
 
         // possibly check turbulence fields
         "(k|epsilon|omega)" 1e-3;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution
index b01ef1e96cf2156084124fc24b21554a5dc7fdd3..543710e7b539f709179e1e151cc265894dd6e05a 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution
@@ -42,9 +42,9 @@ SIMPLE
 
     residualControl
     {
-        p_rgh   1e-2;
-        U       1e-3;
-        h       1e-3;
+        p_rgh           1e-2;
+        U               1e-3;
+        h               1e-3;
 
         // possibly check turbulence fields
         "(k|epsilon|omega)" 1e-3;
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution
index afe43862e1ffff075f01276f79bf072702a3bf21..3ffcf2abdccd25cbd3945b86d743abe025b535dd 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution
@@ -49,10 +49,10 @@ SIMPLE
 
     residualControl
     {
-        p_rgh   1e-2;
-        U       1e-3;
-        h       1e-3;
-        G       1e-3;
+        p_rgh           1e-2;
+        U               1e-3;
+        h               1e-3;
+        G               1e-3;
 
         // possibly check turbulence fields
         "(k|epsilon|omega)" 1e-3;
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSolution
index acf998c053f33dfb7e34978a7be74bbc7c2ecfca..14329c77c62ca65c65ef770509617da4de258a1c 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSolution
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSolution
@@ -46,10 +46,10 @@ SIMPLE
 
     residualControl
     {
-        p_rgh   1e-2;
-        U       1e-3;
-        h       1e-3;
-        G       1e-3;
+        p_rgh           1e-2;
+        U               1e-3;
+        h               1e-3;
+        G               1e-3;
 
         // possibly check turbulence fields
         "(k|epsilon|omega)" 1e-3;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution
index ff9e0490c683d617a1442a1d1c6b420e91399b37..00c3e171cd0efdee0f9cf260cd669eee5ec9aa2e 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution
@@ -70,15 +70,15 @@ solvers
 
 PIMPLE
 {
-    momentumPredictor   on;
-    nCorrectors         2;
+    momentumPredictor on;
+    nCorrectors      2;
     nNonOrthogonalCorrectors 0;
 }
 
 relaxationFactors
 {
-    h               1;
-    U               1;
+    "h.*"           1;
+    "U.*"           1;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution
index a3692254e9f5ee6f9dfc8c61088442bd7936adfb..0b1419ba3592fbc135f79b68c927d0b833db37b2 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution
@@ -72,15 +72,15 @@ solvers
 
 PIMPLE
 {
-    momentumPredictor   on;
-    nCorrectors         2;
+    momentumPredictor on;
+    nCorrectors      2;
     nNonOrthogonalCorrectors 0;
 }
 
 relaxationFactors
 {
-    h               1;
-    U               1;
+    "h.*"           1;
+    "U.*"           1;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSolution
index ff9e0490c683d617a1442a1d1c6b420e91399b37..48dae067cb1f5d74b838ad535f602657994ef013 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSolution
@@ -77,8 +77,8 @@ PIMPLE
 
 relaxationFactors
 {
-    h               1;
-    U               1;
+    "h.*            1;
+    "U.*"           1;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSolution
index a3692254e9f5ee6f9dfc8c61088442bd7936adfb..cf4bd3342d9cbb50006afb43c82ba20d63810ee6 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSolution
@@ -79,8 +79,8 @@ PIMPLE
 
 relaxationFactors
 {
-    h               1;
-    U               1;
+    "h.*"           1;
+    "U.*"           1;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution
index 2544a9f5c0027468aa6e4fd726f77d747e7f7408..a13bc4057bb52015689bd2d7ccb15d83bdd68f23 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution
@@ -70,8 +70,8 @@ PIMPLE
 
 relaxationFactors
 {
-    h               1;
-    U               1;
+    "h.*"           1;
+    "U.*"           1;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution
index e4bc540afcce02dd29423fed4de179e8c5068f1f..7ad022df9c76673bcd7536bf56b7361e44d772d2 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution
@@ -72,8 +72,8 @@ PIMPLE
 
 relaxationFactors
 {
-    h               1;
-    U               1;
+    "h.*"           1;
+    "U.*"           1;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/fvSolution
index eff94d930fcb9875b4853c30e7592634920cd851..df5e5f45905828f0af1674cf853b422eb4eaa2ee 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/bottomAir/fvSolution
@@ -51,23 +51,23 @@ SIMPLE
 {
     momentumPredictor on;
     nNonOrthogonalCorrectors 0;
-    pRefCell                0;
-    pRefValue               100000;
-    rhoMin      rhoMin [1 -3 0 0 0] 0.2;
-    rhoMax      rhoMax [1 -3 0 0 0] 2;
+    pRefCell        0;
+    pRefValue       100000;
+    rhoMin          rhoMin [1 -3 0 0 0] 0.2;
+    rhoMax          rhoMax [1 -3 0 0 0] 2;
 }
 
 relaxationFactors
 {
-    rho         1;
-    p_rgh       0.7;
-    U           0.3;
-    h           0.7;
-    nuTilda     0.7;
-    k           0.7;
-    epsilon     0.7;
-    omega       0.7;
-    "ILambda.*" 0.7;
+    rho             1;
+    p_rgh           0.7;
+    U               0.3;
+    h               0.7;
+    nuTilda         0.7;
+    k               0.7;
+    epsilon         0.7;
+    omega           0.7;
+    "ILambda.*"     0.7;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSolution
index 37e956afd7c43d4c1b35015c11b8b4a69e0230a3..88c18f8c019d38aecc46835efa366f172c2c63dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/heater/fvSolution
@@ -32,7 +32,7 @@ SIMPLE
 
 relaxationFactors
 {
-    T           0.7;
+    T               0.7;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/fvSolution
index 37e956afd7c43d4c1b35015c11b8b4a69e0230a3..88c18f8c019d38aecc46835efa366f172c2c63dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/leftSolid/fvSolution
@@ -32,7 +32,7 @@ SIMPLE
 
 relaxationFactors
 {
-    T           0.7;
+    T               0.7;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/fvSolution
index 37e956afd7c43d4c1b35015c11b8b4a69e0230a3..88c18f8c019d38aecc46835efa366f172c2c63dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/rightSolid/fvSolution
@@ -32,7 +32,7 @@ SIMPLE
 
 relaxationFactors
 {
-    T           0.7;
+    T               0.7;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSolution
index 6e31656bb367a276b1ca28c2b355e60e10725968..cd811f912aa8845271437864ddda30386db1750d 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/system/topAir/fvSolution
@@ -53,23 +53,23 @@ SIMPLE
 {
     momentumPredictor on;
     nNonOrthogonalCorrectors 0;
-    pRefCell                0;
-    pRefValue               100000;
-    rhoMin      rhoMin [1 -3 0 0 0] 0.2;
-    rhoMax      rhoMax [1 -3 0 0 0] 2;
+    pRefCell        0;
+    pRefValue       100000;
+    rhoMin          rhoMin [1 -3 0 0 0] 0.2;
+    rhoMax          rhoMax [1 -3 0 0 0] 2;
 }
 
 relaxationFactors
 {
-    rho         1;
-    p_rgh       0.7;
-    U           0.3;
-    h           0.7;
-    nuTilda     0.7;
-    k           0.7;
-    epsilon     0.7;
-    omega       0.7;
-    "ILambda.*" 0.7;
+    rho             1;
+    p_rgh           0.7;
+    U               0.3;
+    h               0.7;
+    nuTilda         0.7;
+    k               0.7;
+    epsilon         0.7;
+    omega           0.7;
+    "ILambda.*"     0.7;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution
index 5aa30bd45188053fa15f9b734ae4a0cdcf1fb94c..cb6fc3d78f7f0e49ca7441035e79c3fb41b97d7f 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution
@@ -58,10 +58,10 @@ SIMPLE
 {
     momentumPredictor on;
     nNonOrthogonalCorrectors 0;
-    pRefCell                0;
-    pRefValue               100000;
-    rhoMin      rhoMin [1 -3 0 0 0] 0.2;
-    rhoMax      rhoMax [1 -3 0 0 0] 2;
+    pRefCell        0;
+    pRefValue       100000;
+    rhoMin          rhoMin [1 -3 0 0 0] 0.2;
+    rhoMax          rhoMax [1 -3 0 0 0] 2;
 }
 
 relaxationFactors
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSolution
index 37e956afd7c43d4c1b35015c11b8b4a69e0230a3..88c18f8c019d38aecc46835efa366f172c2c63dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSolution
@@ -32,7 +32,7 @@ SIMPLE
 
 relaxationFactors
 {
-    T           0.7;
+    T               0.7;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution
index 37e956afd7c43d4c1b35015c11b8b4a69e0230a3..88c18f8c019d38aecc46835efa366f172c2c63dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution
@@ -32,7 +32,7 @@ SIMPLE
 
 relaxationFactors
 {
-    T           0.7;
+    T               0.7;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution
index 37e956afd7c43d4c1b35015c11b8b4a69e0230a3..88c18f8c019d38aecc46835efa366f172c2c63dd 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution
@@ -32,7 +32,7 @@ SIMPLE
 
 relaxationFactors
 {
-    T           0.7;
+    T               0.7;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution
index c9f029c60978048068b986498f114666c85c149b..b84ff6228f902767a1c9ed08e79ebedfaed8d13c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution
@@ -60,10 +60,10 @@ SIMPLE
 {
     momentumPredictor on;
     nNonOrthogonalCorrectors 0;
-    pRefCell                0;
-    pRefValue               100000;
-    rhoMin      rhoMin [1 -3 0 0 0] 0.2;
-    rhoMax      rhoMax [1 -3 0 0 0] 2;
+    pRefCell        0;
+    pRefValue       100000;
+    rhoMin          rhoMin [1 -3 0 0 0] 0.2;
+    rhoMax          rhoMax [1 -3 0 0 0] 2;
 }
 
 relaxationFactors
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution
index 7bc07fa0a490b1c1a24f7caf3c42f107779441e9..b5d8374d487ebbbace797849d82065e0edd4f58e 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution
@@ -74,8 +74,7 @@ PIMPLE
 
 relaxationFactors
 {
-    U        1;
-    UFinal   1;
+    "U.*"           1;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution
index 90f68beb375a42e2b3715fe1fd85423ef4b0e4b6..046daa4335ebb8843caeae44f110985b0be45b12 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution
@@ -83,9 +83,8 @@ PIMPLE
 relaxationFactors
 {
     p               0.3;
-    U               0.7;
-    k               0.7;
-    omega           0.7;
+    "(U|k|omega)"   0.7;
+    "(U|k|omega)Final" 1.0;
 }
 
 cache
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSolution
index f7ab2e81b2921acfaa4233fe0732094ce1b4fd98..2205802f4e06024d6b0cd414a86ad11a57cb2844 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSolution
@@ -66,9 +66,8 @@ SIMPLE
 relaxationFactors
 {
     p               0.3;
-    U               0.7;
-    k               0.7;
-    omega           0.7;
+    "(U|k|omega)"   0.7;
+    "(U|k|omega)Final" 1.0;
 }
 
 cache
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/U b/tutorials/incompressible/pimpleFoam/TJunction/0/U
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction/0/U
rename to tutorials/incompressible/pimpleFoam/TJunction/0/U
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/epsilon b/tutorials/incompressible/pimpleFoam/TJunction/0/epsilon
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction/0/epsilon
rename to tutorials/incompressible/pimpleFoam/TJunction/0/epsilon
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/k b/tutorials/incompressible/pimpleFoam/TJunction/0/k
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction/0/k
rename to tutorials/incompressible/pimpleFoam/TJunction/0/k
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/nuTilda b/tutorials/incompressible/pimpleFoam/TJunction/0/nuTilda
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction/0/nuTilda
rename to tutorials/incompressible/pimpleFoam/TJunction/0/nuTilda
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/nut b/tutorials/incompressible/pimpleFoam/TJunction/0/nut
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction/0/nut
rename to tutorials/incompressible/pimpleFoam/TJunction/0/nut
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/0/p b/tutorials/incompressible/pimpleFoam/TJunction/0/p
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction/0/p
rename to tutorials/incompressible/pimpleFoam/TJunction/0/p
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/README.txt b/tutorials/incompressible/pimpleFoam/TJunction/README.txt
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction/README.txt
rename to tutorials/incompressible/pimpleFoam/TJunction/README.txt
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/RASProperties b/tutorials/incompressible/pimpleFoam/TJunction/constant/RASProperties
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/RASProperties
rename to tutorials/incompressible/pimpleFoam/TJunction/constant/RASProperties
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/p0vsTime b/tutorials/incompressible/pimpleFoam/TJunction/constant/p0vsTime
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/p0vsTime
rename to tutorials/incompressible/pimpleFoam/TJunction/constant/p0vsTime
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pimpleFoam/TJunction/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/pimpleFoam/TJunction/constant/polyMesh/blockMeshDict
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/boundary b/tutorials/incompressible/pimpleFoam/TJunction/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/boundary
rename to tutorials/incompressible/pimpleFoam/TJunction/constant/polyMesh/boundary
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/transportProperties b/tutorials/incompressible/pimpleFoam/TJunction/constant/transportProperties
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/transportProperties
rename to tutorials/incompressible/pimpleFoam/TJunction/constant/transportProperties
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/TJunction/constant/turbulenceProperties
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/turbulenceProperties
rename to tutorials/incompressible/pimpleFoam/TJunction/constant/turbulenceProperties
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict b/tutorials/incompressible/pimpleFoam/TJunction/system/controlDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
rename to tutorials/incompressible/pimpleFoam/TJunction/system/controlDict
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/fvSchemes b/tutorials/incompressible/pimpleFoam/TJunction/system/fvSchemes
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/fvSchemes
rename to tutorials/incompressible/pimpleFoam/TJunction/system/fvSchemes
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/fvSolution b/tutorials/incompressible/pimpleFoam/TJunction/system/fvSolution
similarity index 96%
rename from tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/fvSolution
rename to tutorials/incompressible/pimpleFoam/TJunction/system/fvSolution
index 637611c63f451002f3fab2255be9f4091387b470..a7e4f0c98751e5bfbf50b32fe6e0118e684547b9 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/TJunction/system/fvSolution
@@ -68,9 +68,9 @@ PIMPLE
 
 relaxationFactors
 {
-    U               1;
-    k               1;
-    epsilon         1;
+    "U.*"           1;
+    "k.*"           1;
+    "epsilon.*"     1;
 }
 
 
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/U b/tutorials/incompressible/pimpleFoam/TJunctionFan/0/U
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/U
rename to tutorials/incompressible/pimpleFoam/TJunctionFan/0/U
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/epsilon b/tutorials/incompressible/pimpleFoam/TJunctionFan/0/epsilon
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/epsilon
rename to tutorials/incompressible/pimpleFoam/TJunctionFan/0/epsilon
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/k b/tutorials/incompressible/pimpleFoam/TJunctionFan/0/k
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/k
rename to tutorials/incompressible/pimpleFoam/TJunctionFan/0/k
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nuTilda b/tutorials/incompressible/pimpleFoam/TJunctionFan/0/nuTilda
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nuTilda
rename to tutorials/incompressible/pimpleFoam/TJunctionFan/0/nuTilda
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nut b/tutorials/incompressible/pimpleFoam/TJunctionFan/0/nut
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/nut
rename to tutorials/incompressible/pimpleFoam/TJunctionFan/0/nut
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/p b/tutorials/incompressible/pimpleFoam/TJunctionFan/0/p
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction-with-fan/0/p
rename to tutorials/incompressible/pimpleFoam/TJunctionFan/0/p
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/Allrun b/tutorials/incompressible/pimpleFoam/TJunctionFan/Allrun
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction-with-fan/Allrun
rename to tutorials/incompressible/pimpleFoam/TJunctionFan/Allrun
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/README.txt b/tutorials/incompressible/pimpleFoam/TJunctionFan/README.txt
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction-with-fan/README.txt
rename to tutorials/incompressible/pimpleFoam/TJunctionFan/README.txt
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/constant/RASProperties b/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/RASProperties
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction/constant/RASProperties
rename to tutorials/incompressible/pimpleFoam/TJunctionFan/constant/RASProperties
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/constant/p0vsTime b/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/p0vsTime
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction/constant/p0vsTime
rename to tutorials/incompressible/pimpleFoam/TJunctionFan/constant/p0vsTime
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/polyMesh/blockMeshDict b/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/polyMesh/blockMeshDict
rename to tutorials/incompressible/pimpleFoam/TJunctionFan/constant/polyMesh/blockMeshDict
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/polyMesh/boundary b/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction-with-fan/constant/polyMesh/boundary
rename to tutorials/incompressible/pimpleFoam/TJunctionFan/constant/polyMesh/boundary
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/constant/transportProperties b/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/transportProperties
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction/constant/transportProperties
rename to tutorials/incompressible/pimpleFoam/TJunctionFan/constant/transportProperties
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/turbulenceProperties
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction/constant/turbulenceProperties
rename to tutorials/incompressible/pimpleFoam/TJunctionFan/constant/turbulenceProperties
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/selectBaffles.setSet b/tutorials/incompressible/pimpleFoam/TJunctionFan/selectBaffles.setSet
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction-with-fan/selectBaffles.setSet
rename to tutorials/incompressible/pimpleFoam/TJunctionFan/selectBaffles.setSet
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/selectCyclics.setSet b/tutorials/incompressible/pimpleFoam/TJunctionFan/selectCyclics.setSet
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction-with-fan/selectCyclics.setSet
rename to tutorials/incompressible/pimpleFoam/TJunctionFan/selectCyclics.setSet
diff --git a/tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/controlDict b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction-with-fan/system/controlDict
rename to tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/system/fvSchemes b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSchemes
similarity index 100%
rename from tutorials/incompressible/pimpleFoam/t-junction/system/fvSchemes
rename to tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSchemes
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/system/fvSolution b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSolution
similarity index 96%
rename from tutorials/incompressible/pimpleFoam/t-junction/system/fvSolution
rename to tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSolution
index 637611c63f451002f3fab2255be9f4091387b470..a7e4f0c98751e5bfbf50b32fe6e0118e684547b9 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSolution
@@ -68,9 +68,9 @@ PIMPLE
 
 relaxationFactors
 {
-    U               1;
-    k               1;
-    epsilon         1;
+    "U.*"           1;
+    "k.*"           1;
+    "epsilon.*"     1;
 }
 
 
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution b/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution
index 847a41dd93ea874261bb439479d7e6cd26cc28d0..f201e194a3e5dce439ada52240a1203735279d7c 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/system/fvSolution
@@ -55,6 +55,13 @@ SIMPLE
     nNonOrthogonalCorrectors 0;
     pRefCell        0;
     pRefValue       0;
+
+    residualControl
+    {
+        p               1e-5;
+        U               1e-5;
+        nuTilda         1e-5;
+    }
 }
 
 relaxationFactors
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution
index b6de74a11daea8fd612bd7b61fa7379994acf001..88f0838d6e415fb98d5215594859df3c195fd84a 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/fvSolution
@@ -72,8 +72,8 @@ SIMPLE
 
     residualControl
     {
-        p       1e-2;
-        U       1e-3;
+        p               1e-2;
+        U               1e-3;
         "(k|epsilon|omega)" 1e-3;
     }
 }
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution
index b6de74a11daea8fd612bd7b61fa7379994acf001..88f0838d6e415fb98d5215594859df3c195fd84a 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSolution
@@ -72,8 +72,8 @@ SIMPLE
 
     residualControl
     {
-        p       1e-2;
-        U       1e-3;
+        p               1e-2;
+        U               1e-3;
         "(k|epsilon|omega)" 1e-3;
     }
 }
diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/system/fvSolution b/tutorials/incompressible/windSimpleFoam/turbineSiting/system/fvSolution
index 3bb956bf32af4c1ad29dd9e922e59723675877c8..9f592655fd8be4dd5c5d29347ccf9b4de68f3f8b 100644
--- a/tutorials/incompressible/windSimpleFoam/turbineSiting/system/fvSolution
+++ b/tutorials/incompressible/windSimpleFoam/turbineSiting/system/fvSolution
@@ -60,16 +60,22 @@ solvers
 
 SIMPLE
 {
-    nNonOrthogonalCorrectors     0;
-    convergence                  1e-3;
+    nNonOrthogonalCorrectors 0;
+
+    residualControl
+    {
+        p               1e-2;
+        U               1e-3;
+        "(k|epsilon)"   1e-3;
+    }
 }
 
 relaxationFactors
 {
-    p           0.3;
-    U           0.7;
-    k           0.7;
-    epsilon     0.7;
+    p               0.3;
+    U               0.7;
+    k               0.7;
+    epsilon         0.7;
 }
 
 cache
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution
index 69d711902521ece7bad44a33b7afcb1419f64240..c6ade883d7d10298220ac1f2c40d46c20d8551f2 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution
@@ -78,15 +78,16 @@ solvers
 
 PIMPLE
 {
-    nCorrectors         2;
+    nCorrectors     2;
     nNonOrthogonalCorrectors 0;
     momentumPredictor yes;
-    rhoMin rhoMin [1 -3 0 0 0] 0.1;
-    rhoMax rhoMax [1 -3 0 0 0] 1.5;
+    rhoMin          rhoMin [1 -3 0 0 0] 0.1;
+    rhoMax          rhoMax [1 -3 0 0 0] 1.5;
 
     maxCo           0.5;
+    rDeltaTSmoothingCoeff 0.1;
     maxDeltaT       1;
-    alphaTauTemp    0.005;
+    alphaTemp       0.005;
 }
 
 additional
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index 2215e348f711e0cb3389623d3be6e2629f23d7a6..24bf767369ac115b2bbca47a64d184642e9ffe46 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -110,13 +110,10 @@ subModels
 
     surfaceReactionModel none;
 
-    postProcessingModel particleTracks;
-
     surfaceFilmModel none;
 
     radiation       off;
 
-
     patchInjectionCoeffs
     {
         massFlowRate    0.8e-03;
@@ -190,14 +187,18 @@ subModels
         enthalpyTransfer enthalpyDifference;
         activeLiquids   ( H2O );
     }
+}
 
-    patchPostProcessingCoeffs
+
+cloudFunctions
+{
+    patchPostProcessing
     {
         maxStoredParcels 100;
         patches         ( outlet );
     }
 
-    particleTracksCoeffs
+    particleTracks
     {
         trackInterval   5;
         maxSamples      1000000;
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSolution b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSolution
index b750e0d5e5735db6b82353f9ecd091857b694bef..d8d87cc1316b3d45dd1f147817675cbb11b0a05e 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSolution
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSolution
@@ -64,16 +64,16 @@ solvers
 
 PIMPLE
 {
-    nOuterCorrectors    1;
-    nCorrectors         2;
+    nOuterCorrectors 1;
+    nCorrectors     2;
     nNonOrthogonalCorrectors 0;
     momentumPredictor yes;
-    rhoMin rhoMin [1 -3 0 0 0] 0.1;
-    rhoMax rhoMax [1 -3 0 0 0] 1.5;
+    rhoMin          rhoMin [1 -3 0 0 0] 0.1;
+    rhoMax          rhoMax [1 -3 0 0 0] 1.5;
 
     maxCo           5;
-    alphaTauSmooth  1;
-    alphaTauTemp    1;
+    rDeltaTSmoothingCoeff 1;
+    alphaTemp       1;
     maxDeltaT       1;
 }
 
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
index bf74ccebdb56172a4d50908bfdaad7afe1d1765b..e964b64233a7e67366660898f1993e277074403e 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
@@ -103,8 +103,6 @@ subModels
 
     surfaceReactionModel COxidationKineticDiffusionLimitedRate;
 
-    postProcessingModel none;
-
     surfaceFilmModel none;
 
     radiation       on;
@@ -195,4 +193,8 @@ subModels
 }
 
 
+cloudFunctions
+{}
+
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/energySourceProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/energySourceProperties
index ba68f2616fcfc8ff9c9681aa10269f58f1af4180..bcb527b17252de76f74fbac2adf86d8c417b9048 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/energySourceProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/energySourceProperties
@@ -23,7 +23,7 @@ FoamFile
         duration        0.2;
         selectionMode   cellSet;
         volumeMode      absolute;
-        fieldData       15000;
+        fieldData       20000;
         cellSet         ignitionCells;
     }
 );
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
index d58f7af8a9a60cae6066dc754a79f2339629519e..a15680a79e8b4eee294390ec25b8ad840385c141 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
@@ -85,8 +85,6 @@ subModels
 
     heatTransferModel RanzMarshall;
 
-    postProcessingModel none;
-
     surfaceFilmModel none;
 
     radiation       on;
@@ -125,4 +123,8 @@ subModels
 }
 
 
+cloudFunctions
+{}
+
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
index a0da4cdb0fe7ce82e7b9ca409df00f105b07a6c7..8c3798c5b89b26d96c35b37ebed8a2163f65170a 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
@@ -95,4 +95,9 @@ PIMPLE
 }
 
 
+relaxationFactors
+{
+    ".*Final"       1;
+}
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/Allclean b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allclean
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/Allclean
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allclean
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/Allrun b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allrun
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/Allrun
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allrun
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/0/U b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0/U
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/0/U
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0/U
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/RASProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/RASProperties
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/RASProperties
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/RASProperties
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/g b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/g
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/g
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/g
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/kinematicCloudProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties
similarity index 98%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/kinematicCloudProperties
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties
index 4376f6ce5aa2e7073ee836771f7d7b09203df962..253b33246017170df7c1a76f26302f0986d6bad7 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties
@@ -42,6 +42,7 @@ solution
     }
 }
 
+
 constantProperties
 {
     parcelTypeId    1;
@@ -56,6 +57,7 @@ constantProperties
     constantVolume  false;
 }
 
+
 subModels
 {
     particleForces
@@ -72,8 +74,6 @@ subModels
 
     heatTransferModel none;
 
-    postProcessingModel none;
-
     surfaceFilmModel none;
 
     collisionModel pairCollision;
@@ -129,4 +129,8 @@ subModels
 }
 
 
+cloudFunctions
+{}
+
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/polyMesh/blockMeshDict
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/polyMesh/blockMeshDict
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/polyMesh/boundary b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/polyMesh/boundary
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/polyMesh/boundary
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/transportProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/transportProperties
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/transportProperties
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/transportProperties
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/turbulenceProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/constant/turbulenceProperties
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/system/controlDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/controlDict
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/system/controlDict
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/controlDict
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/system/decomposeParDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/decomposeParDict
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/system/decomposeParDict
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/decomposeParDict
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/system/fvSchemes b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSchemes
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/system/fvSchemes
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSchemes
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/system/fvSolution b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSolution
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/system/fvSolution
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSolution
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/system/mapFieldsDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/mapFieldsDict
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/system/mapFieldsDict
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/mapFieldsDict
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/0/U b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/0/U
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/0/U
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/0/U
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/RASProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/RASProperties
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/RASProperties
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/RASProperties
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/g b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/g
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/g
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/g
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/kinematicCloudPositions b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudPositions
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/kinematicCloudPositions
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudPositions
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/kinematicCloudProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties
similarity index 99%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/kinematicCloudProperties
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties
index 15f9068b615feb528b830c180071bc77b5a4fe91..93315fbd6307c26b1551ca1564e8b288071179be 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties
@@ -65,8 +65,6 @@ subModels
 
     heatTransferModel none;
 
-    postProcessingModel none;
-
     surfaceFilmModel none;
 
     collisionModel pairCollision;
@@ -140,4 +138,8 @@ subModels
 }
 
 
+cloudFunctions
+{}
+
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/polyMesh/blockMeshDict
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/polyMesh/blockMeshDict
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/polyMesh/boundary b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/polyMesh/boundary
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/polyMesh/boundary
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/transportProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/transportProperties
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/transportProperties
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/transportProperties
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/turbulenceProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/constant/turbulenceProperties
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/system/controlDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/controlDict
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/system/controlDict
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/controlDict
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/system/decomposeParDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/decomposeParDict
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/system/decomposeParDict
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/decomposeParDict
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/system/fvSchemes b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSchemes
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/system/fvSchemes
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSchemes
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/system/fvSolution b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSolution
similarity index 100%
rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperInitialState/system/fvSolution
rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSolution
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
index 8a67b373e704ec54f55d916a19fc731f833f8eb1..4eaea3d71aab63e8bfd91c4e73ab71c6ffb98523 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
@@ -50,6 +50,7 @@ solution
     }
 }
 
+
 constantProperties
 {
     parcelTypeId    1;
@@ -78,6 +79,7 @@ constantProperties
     constantVolume  false;
 }
 
+
 subModels
 {
     particleForces
@@ -98,8 +100,6 @@ subModels
 
     phaseChangeModel liquidEvaporation;
 
-    postProcessingModel patchPostProcessing;
-
     devolatilisationModel none;
 
     surfaceReactionModel none;
@@ -160,8 +160,12 @@ subModels
 
         activeLiquids   ( H2O );
     }
+}
+
 
-    patchPostProcessingCoeffs
+cloudFunctions
+{
+    patchPostProcessing
     {
         maxStoredParcels 20;
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution
index 8eacc7bc9caacc0aabaca08fcc21dc359e513913..27fcc2d5f29b691ea0769f1bcb516438ffac5725 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution
@@ -91,6 +91,7 @@ additional
 
 relaxationFactors
 {
+    ".*Final"       1;
 }
 
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties
index b903f6642feb311dde78aad33d050d64efdfa427..8484d88a754b2578ea6821c891745325c64ab97f 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties
@@ -50,6 +50,7 @@ solution
     }
 }
 
+
 constantProperties
 {
     parcelTypeId    1;
@@ -78,6 +79,7 @@ constantProperties
     constantVolume  false;
 }
 
+
 subModels
 {
     particleForces
@@ -102,8 +104,6 @@ subModels
 
     surfaceReactionModel none;
 
-    postProcessingModel none;
-
     surfaceFilmModel none;
 
     radiation       off;
@@ -165,4 +165,8 @@ subModels
 }
 
 
+cloudFunctions
+{}
+
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSolution b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSolution
index b913d158bf70526caaf7c154e29fcfebe6932d99..84ef047c174b0e68d71a1d23c618a84d88590a9c 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSolution
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSolution
@@ -87,5 +87,9 @@ additional
     pressureWorkTimeDerivative true;
 }
 
+relaxationFactors
+{
+    ".*Final"       1;
+}
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index 465586406946c10eb78224da4e20a2c522c8cdf4..759cfa287426ed908693493dcffd4fe228b88438 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -50,6 +50,7 @@ solution
     }
 }
 
+
 constantProperties
 {
     parcelTypeId    1;
@@ -78,6 +79,7 @@ constantProperties
     constantVolume  false;
 }
 
+
 subModels
 {
     particleForces
@@ -102,8 +104,6 @@ subModels
 
     surfaceReactionModel none;
 
-    postProcessingModel patchPostProcessing;
-
     surfaceFilmModel none;
 
     radiation       off;
@@ -183,8 +183,12 @@ subModels
 
         activeLiquids   ( H2O );
     }
+}
+
 
-    patchPostProcessingCoeffs
+cloudFunctions
+{
+    patchPostProcessing
     {
         maxStoredParcels 100;
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSolution b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSolution
index c008af3c1ecbe200ea09b665b11d453294cfdc16..2a698ba16af42778d5102187e55eb3c506a690fc 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSolution
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSolution
@@ -93,5 +93,9 @@ additional
     pressureWorkTimeDerivative false;
 }
 
+relaxationFactors
+{
+    ".*Final"       1;
+}
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties
index b4e73e234ef22f4434d7277873bde10907f9ba69..2a1d0f940a295310d9d68c924572d8d915eef260 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties
@@ -95,8 +95,6 @@ subModels
 
     phaseChangeModel none;
 
-    postProcessingModel none;
-
     surfaceFilmModel thermoSurfaceFilm;
 
     radiation       off;
@@ -134,4 +132,8 @@ subModels
 }
 
 
+cloudFunctions
+{}
+
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution
index 50abc46a930b234236ae2f57193e58b1aebbce7b..b51da28b4b656e54eebdce513c1004b9213be252 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution
@@ -82,7 +82,7 @@ PIMPLE
 
 relaxationFactors
 {
-    ".*Final" 1;
+    ".*Final"       1;
 }
 
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties
index e9f1c791af1f1d4a0d997121255ba33f9da95c69..1a1a6ff1d8ddce077faa755413f7c408305ac9d7 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties
@@ -95,8 +95,6 @@ subModels
 
     phaseChangeModel none;
 
-    postProcessingModel none;
-
     surfaceFilmModel thermoSurfaceFilm;
 
     radiation       off;
@@ -160,4 +158,8 @@ subModels
 }
 
 
+cloudFunctions
+{}
+
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution
index 9f903209b0128524d3bf2fa6e3ab354d440c600b..2f99dc42aa2813cf19cc6ee9cb381322c1493ac1 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution
@@ -84,7 +84,7 @@ PIMPLE
 
 relaxationFactors
 {
-    ".*Final" 1;
+    ".*Final"       1;
 }
 
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties
index 269063a1682edcc08067440d807cd4733fd98378..a26564ebb297f18cb918288afa0a66e960866de2 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties
@@ -95,8 +95,6 @@ subModels
 
     phaseChangeModel none;
 
-    postProcessingModel none;
-
     surfaceFilmModel thermoSurfaceFilm;
 
     radiation       off;
@@ -140,4 +138,8 @@ subModels
 }
 
 
+cloudFunctions
+{}
+
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution
index 50abc46a930b234236ae2f57193e58b1aebbce7b..b51da28b4b656e54eebdce513c1004b9213be252 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution
@@ -82,7 +82,7 @@ PIMPLE
 
 relaxationFactors
 {
-    ".*Final" 1;
+    ".*Final"       1;
 }
 
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
index f93637094d009389096f1505f607422ba01f7779..3c5ec0512d9321e593b67fb9f4139ba6ff4d5559 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
@@ -50,6 +50,7 @@ solution
     }
 }
 
+
 constantProperties
 {
     parcelTypeId    1;
@@ -75,6 +76,7 @@ constantProperties
     constantVolume  false;
 }
 
+
 subModels
 {
     particleForces
@@ -95,8 +97,6 @@ subModels
 
     phaseChangeModel liquidEvaporation;
 
-    postProcessingModel none;
-
     surfaceFilmModel none;
 
     radiation       off;
@@ -149,4 +149,8 @@ subModels
 }
 
 
+cloudFunctions
+{}
+
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution
index 010c007ed97c27281996d6f048ebad390831c62c..daa88262a99b9ca7e1f06c168fae2569407388ce 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution
@@ -81,5 +81,9 @@ PIMPLE
     momentumPredictor yes;
 }
 
+relaxationFactors
+{
+    ".*Final"       1;
+}
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/Allclean b/tutorials/multiphase/LTSInterFoam/wigleyHull/Allclean
new file mode 100755
index 0000000000000000000000000000000000000000..5f6efdd65d9b7e1096cb335d0a5180be5b6aa7da
--- /dev/null
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/Allclean
@@ -0,0 +1,11 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+cleanCase
+rm 0/alpha1.gz 0/cellLevel.gz 0/pointLevel.gz constant/polyMesh/boundary \
+    > /dev/null 2>&1
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/Allrun b/tutorials/multiphase/LTSInterFoam/wigleyHull/Allrun
index 1c7f483fa4044ba1f6a21179db81ffc75e15ca56..c9f16269d49fa78a504d26d98a328e3cf990ce59 100755
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/Allrun
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/Allrun
@@ -6,8 +6,10 @@ cd ${0%/*} || exit 1    # run from this directory
 
 runApplication blockMesh
 runApplication snappyHexMesh -overwrite
-#runApplication transformPoints -scale '(2 1 1)'
-transformPoints -scale '(2 1 1)'
+if [ ! -e log.transformPoints ]
+then
+    transformPoints -scale '(2 1 1)' > log.transformPoints 2>&1
+fi
 cp 0/alpha1.org 0/alpha1
 runApplication setFields
 runApplication `getApplication`
diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution b/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution
index a99fa7eef7549e3b2b1952ba9111fd83891f03de..e8b730f469a32770fd503dd430efac587b7a7a25 100644
--- a/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution
+++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/system/fvSolution
@@ -94,8 +94,8 @@ PIMPLE
 
 relaxationFactors
 {
-    p_rgh       0.3;
-    p_rghFinal  0.3;
+    p_rgh           0.3;
+    p_rghFinal      0.3;
 }
 
 
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/fvSolution b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/fvSolution
index 939dbe2c7f420f93ed5c3d108e954f9eaf7f9e4b..214345bdfe7acaeb234bace012a36f738aa2d5ab 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/fvSolution
@@ -65,7 +65,7 @@ PIMPLE
 
 relaxationFactors
 {
-    U 1;
+    "U.*"           1;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/les/throttle/Allrun
index 93db53b842d7507446693258095c29bbf2ae43b0..bdeacd7831d2a2c15696477e68478f10fb58ff2c 100755
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/Allrun
@@ -11,12 +11,15 @@ refineMeshByCellSet()
 {
    while [ $# -ge 1 ]
    do
-      echo "creating cell set for primary zone - $1"
-      cp system/topoSetDict.$1 system/topoSetDict
-      topoSet > log.topoSet.$1 2>&1
+      if [ ! -e log.refineMesh.$1 ]
+      then
+          echo "creating cell set for primary zone - $1"
+          cp system/topoSetDict.$1 system/topoSetDict
+          topoSet > log.topoSet.$1 2>&1
 
-      echo "refining primary zone - $1"
-      refineMesh -dict -overwrite > log.refineMesh.$1 2>&1
+          echo "refining primary zone - $1"
+          refineMesh -dict -overwrite > log.refineMesh.$1 2>&1
+      fi
       shift
    done
 }
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary
index f0310294bf5b844cdaae7a734590b4a6b8e83846..b78429d69f9ea190c208dd617f71fa7e5fb4d2ab 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      ascii;
+    format      binary;
     class       polyBoundaryMesh;
     location    "constant/polyMesh";
     object      boundary;
@@ -21,25 +21,25 @@ FoamFile
     {
         type            patch;
         nFaces          51;
-        startFace       35380;
+        startFace       651284;
     }
     outlet
     {
         type            patch;
         nFaces          51;
-        startFace       35431;
+        startFace       651335;
     }
     walls
     {
         type            wall;
-        nFaces          640;
-        startFace       35482;
+        nFaces          2216;
+        startFace       651386;
     }
     frontBack
     {
         type            empty;
-        nFaces          35580;
-        startFace       36122;
+        nFaces          651180;
+        startFace       653602;
     }
 )
 
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun b/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun
index f345d7dc043f0dc574811408c625e2679ecf7955..213a2a5ecf094bfac092971663a6d716f15d619c 100755
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun
@@ -11,12 +11,15 @@ refineMeshByCellSet()
 {
    while [ $# -ge 1 ]
    do
-      echo "creating cell set for primary zone - $1"
-      cp system/topoSetDict.$1 system/topoSetDict
-      topoSet > log.topoSet.$1 2>&1
-
-      echo "refining primary zone - $1"
-      refineMesh -dict -overwrite > log.refineMesh.$1 2>&1
+      if [ ! -e log.refineMesh.$1 ]
+      then
+          echo "creating cell set for primary zone - $1"
+          cp system/topoSetDict.$1 system/topoSetDict
+          topoSet > log.topoSet.$1 2>&1
+
+          echo "refining primary zone - $1"
+          refineMesh -dict -overwrite > log.refineMesh.$1 2>&1
+      fi
       shift
    done
 }
@@ -27,7 +30,7 @@ runApplication blockMesh
 refineMeshByCellSet 1 2 3
 
 echo "mapping fields from 2D throttle case"
-mapFields ../throttle -sourceTime latestTime > log.mapFields 2>&1
+runApplication mapFields ../throttle -sourceTime latestTime
 
 runApplication decomposePar
 runParallel $application 4
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary
index 25ebc9913304a941538202c92e67f0e6a4659f09..84ff6aae72250c49b9d709c2329e8b78705726fe 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      ascii;
+    format      binary;
     class       polyBoundaryMesh;
     location    "constant/polyMesh";
     object      boundary;
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
index 9f117b0ba86f3a54a3c558c64664c9187fe0a74f..37600b5049bfd7d7ba5f66902446f4fe9df287cf 100755
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
@@ -10,12 +10,15 @@ refineMeshByCellSet()
 {
    while [ $# -ge 1 ]
    do
-      echo "creating cell set for primary zone - $1"
-      cp system/topoSetDict.$1 system/topoSetDict
-      topoSet > log.topoSet.$1 2>&1
+      if [ ! -e log.refineMesh.$1 ]
+      then
+          echo "creating cell set for primary zone - $1"
+          cp system/topoSetDict.$1 system/topoSetDict
+          topoSet > log.topoSet.$1 2>&1
 
-      echo "refining primary zone - $1"
-      refineMesh -dict -overwrite > log.refineMesh.$1 2>&1
+          echo "refining primary zone - $1"
+          refineMesh -dict -overwrite > log.refineMesh.$1 2>&1
+      fi
       shift
    done
 }
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary
index b1f230b1a863aac32e90cdd4eb39b862900f939a..c5c9836df27480fc19ab1d6f039dc66d6e4a1eca 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary
@@ -21,25 +21,25 @@ FoamFile
     {
         type            patch;
         nFaces          51;
-        startFace       57362;
+        startFace       2061220;
     }
     outlet
     {
         type            patch;
         nFaces          51;
-        startFace       57413;
+        startFace       2061271;
     }
     walls
     {
         type            wall;
-        nFaces          836;
-        startFace       57464;
+        nFaces          3788;
+        startFace       2061322;
     }
     frontBack
     {
         type            empty;
-        nFaces          57540;
-        startFace       58300;
+        nFaces          2060940;
+        startFace       2065110;
     }
 )
 
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allclean b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allclean
index ae79bb922fd6a55add08180ad5ea92b6398aa760..1f81d5f86a1a82fe3da7c5866fa769511be561b4 100755
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allclean
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allclean
@@ -2,4 +2,4 @@
 
 foamCleanTutorials cases
 rm -rf processor*
-rm -rf 0/p_rgh.gz 0/alpha1.gz
+rm -rf 0/p_rgh 0/p_rgh.gz 0/alpha1 0/alpha1.gz
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allclean b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allclean
index a550e023bd2a4e51fb6eaa2ee2f3a6c80ea7242b..902055c7f72789a34d390cc9bea010bade61ab90 100755
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allclean
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allclean
@@ -3,6 +3,6 @@ cd ${0%/*} || exit 1    # run from this directory
 
 foamCleanTutorials cases
 rm -rf processor*
-rm -rf 0/p_rgh.gz 0/alpha1.gz
+rm -rf 0/p_rgh 0/p_rgh.gz 0/alpha1 0/alpha1.gz
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution
index 359560da4e043aac91f878d9a47e965e510a1408..c72200933041fdada6fab586b081b719b1d16eb5 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution
@@ -123,7 +123,7 @@ PIMPLE
 
 relaxationFactors
 {
-    "(U|k|epsilon|omega|R|nuTilda)"               1;
+    "(U|k|epsilon|omega|R|nuTilda)" 1;
 }
 
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allclean b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allclean
index a65375ff722ee52cde31730b6ed15ab56b8a8dfb..4ee30b518c6492f4f3673b5d986de57f13a2fb5c 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/Allclean
@@ -2,6 +2,6 @@
 cd ${0%/*} || exit 1    # run from this directory
 
 foamCleanTutorials cases
-rm -rf 0/alpha1.gz probes wallPressure pRefProbe
+rm -rf 0/alpha1 0/alpha1.gz probes wallPressure pRefProbe
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution
index 796e7cd3023363286546c7e270cf79286cd7cc21..01a6599f96cbacc5ca94cf4b2192a6fefe7f685d 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution
@@ -105,7 +105,7 @@ PIMPLE
 
 relaxationFactors
 {
-    U               1;
+    "U.*"           1;
 }
 
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allclean b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allclean
index a65375ff722ee52cde31730b6ed15ab56b8a8dfb..4ee30b518c6492f4f3673b5d986de57f13a2fb5c 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/Allclean
@@ -2,6 +2,6 @@
 cd ${0%/*} || exit 1    # run from this directory
 
 foamCleanTutorials cases
-rm -rf 0/alpha1.gz probes wallPressure pRefProbe
+rm -rf 0/alpha1 0/alpha1.gz probes wallPressure pRefProbe
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution
index 796e7cd3023363286546c7e270cf79286cd7cc21..01a6599f96cbacc5ca94cf4b2192a6fefe7f685d 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution
@@ -105,7 +105,7 @@ PIMPLE
 
 relaxationFactors
 {
-    U               1;
+    "U.*"           1;
 }
 
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allclean b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allclean
index a65375ff722ee52cde31730b6ed15ab56b8a8dfb..4ee30b518c6492f4f3673b5d986de57f13a2fb5c 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/Allclean
@@ -2,6 +2,6 @@
 cd ${0%/*} || exit 1    # run from this directory
 
 foamCleanTutorials cases
-rm -rf 0/alpha1.gz probes wallPressure pRefProbe
+rm -rf 0/alpha1 0/alpha1.gz probes wallPressure pRefProbe
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
index 69f4f2ca46203b5851bb285c2499946106299764..c978e3a811ecc2201d74daedb8e08014bdb8d8dc 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
@@ -25,7 +25,7 @@ stopAt          endTime;
 
 endTime         40;
 
-deltaT          0.01;
+deltaT          0.05;
 
 writeControl    adjustableRunTime;
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution
index 796e7cd3023363286546c7e270cf79286cd7cc21..01a6599f96cbacc5ca94cf4b2192a6fefe7f685d 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution
@@ -105,7 +105,7 @@ PIMPLE
 
 relaxationFactors
 {
-    U               1;
+    "U.*"           1;
 }
 
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allclean b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allclean
index a65375ff722ee52cde31730b6ed15ab56b8a8dfb..4ee30b518c6492f4f3673b5d986de57f13a2fb5c 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/Allclean
@@ -2,6 +2,6 @@
 cd ${0%/*} || exit 1    # run from this directory
 
 foamCleanTutorials cases
-rm -rf 0/alpha1.gz probes wallPressure pRefProbe
+rm -rf 0/alpha1 0/alpha1.gz probes wallPressure pRefProbe
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution
index 796e7cd3023363286546c7e270cf79286cd7cc21..01a6599f96cbacc5ca94cf4b2192a6fefe7f685d 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution
@@ -105,7 +105,7 @@ PIMPLE
 
 relaxationFactors
 {
-    U               1;
+    "U.*"           1;
 }
 
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allclean b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allclean
index a65375ff722ee52cde31730b6ed15ab56b8a8dfb..4ee30b518c6492f4f3673b5d986de57f13a2fb5c 100755
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allclean
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/Allclean
@@ -2,6 +2,6 @@
 cd ${0%/*} || exit 1    # run from this directory
 
 foamCleanTutorials cases
-rm -rf 0/alpha1.gz probes wallPressure pRefProbe
+rm -rf 0/alpha1 0/alpha1.gz probes wallPressure pRefProbe
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution
index 796e7cd3023363286546c7e270cf79286cd7cc21..01a6599f96cbacc5ca94cf4b2192a6fefe7f685d 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution
@@ -105,7 +105,7 @@ PIMPLE
 
 relaxationFactors
 {
-    U               1;
+    "U.*"           1;
 }
 
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution
index 4760777dd06bcd9f70e2833bbc3a4153e8f6caea..20d127dbc6847a553b499096e8744e3ff07467f9 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/fvSolution
@@ -105,7 +105,7 @@ PIMPLE
 
 relaxationFactors
 {
-    U               1;
+    "U.*"           1;
 }
 
 
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allclean b/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allclean
index ec47d1656a4cec01ae52e8ef5a5c7363a249856d..781018201d43b3b588ce9738c5acd428860aa827 100755
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allclean
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/Allclean
@@ -2,6 +2,6 @@
 cd ${0%/*} || exit 1    # run from this directory
 
 foamCleanTutorials cases
-rm -rf 0/alpha[1-3].gz
+rm -rf 0/alpha[1-3] 0/alpha[1-3].gz
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/polyMesh/boundary b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/polyMesh/boundary
index 6d438fa52b4c52beadf6a7f0563f512328656dda..4f73372f0f8017101959bfa1be3bb94553fbe2f4 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/polyMesh/boundary
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/polyMesh/boundary
@@ -38,7 +38,7 @@ FoamFile
     bullet
     {
         type            wall;
-        nFaces          37896;
+        nFaces          37743;
         startFace       1133431;
     }
 )
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution
index 22766f7fbd659da3d2a541ed88b3d2430d8b9644..a8872f4a5f8e8c2753cc264c7527052102a288a5 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/fvSolution
@@ -105,7 +105,7 @@ PIMPLE
 
 relaxationFactors
 {
-    U                          1;
+    "U.*"                      1;
 }
 
 
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
index 57085caff48981b8c368d420e062d579e1601726..2306b1ac657f1ab002932ea025141d9106482c3d 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution
@@ -106,7 +106,7 @@ PIMPLE
 
 relaxationFactors
 {
-    U 1;
+    "U.*"           1;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
index ec09dce2a177cbb4be155f26a1285f7918a6d433..5f46d6dc86c0a7ceb50da9767bdadc325903a470 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution
@@ -100,7 +100,7 @@ PIMPLE
 
 relaxationFactors
 {
-    U 1;
+    "U.*"           1;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict b/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict
index e723ac6686ca55a779ced6f3da7e186413877faa..1e498bcc7d39ca8fa3ba3d4dc0ddc5a95bbdba6c 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict
@@ -27,7 +27,7 @@ endTime         6400;
 
 deltaT          0.1;
 
-writeControl    adjustableRunTime;
+writeControl    runTime;
 
 writeInterval   20;
 
@@ -45,8 +45,4 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
-adjustTimeStep  yes;
-
-maxCo           1;
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/system/fvSolution b/tutorials/multiphase/settlingFoam/ras/dahl/system/fvSolution
index 858173d556dd66290135b81d565d1521d75ff714..6ecd786033b71513392543a7589f71f5dccc7858 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/system/fvSolution
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/system/fvSolution
@@ -69,5 +69,12 @@ PIMPLE
     nNonOrthogonalCorrectors 0;
 }
 
+relaxationFactors
+{
+    "U.*"           1;
+    "k.*"           1;
+    "epsilon.*"     1;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/system/controlDict b/tutorials/multiphase/settlingFoam/ras/tank3D/system/controlDict
index 4a4e21da1823ed710762d6cb1a86ff7c43cbdf57..dadd06ebb9dfd7600c4c95789410ad6cae9518e0 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/system/controlDict
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/system/controlDict
@@ -17,7 +17,7 @@ FoamFile
 
 application     settlingFoam;
 
-startFrom       latestTime;
+startFrom       startTime;
 
 startTime       0;
 
@@ -27,7 +27,7 @@ endTime         8000;
 
 deltaT          0.1;
 
-writeControl    adjustableRunTime;
+writeControl    runTime;
 
 writeInterval   50;
 
@@ -45,10 +45,4 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
-adjustTimeStep  yes;
-
-maxCo           1;
-
-maxDeltaT       1;
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSolution b/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSolution
index 858173d556dd66290135b81d565d1521d75ff714..6ecd786033b71513392543a7589f71f5dccc7858 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSolution
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSolution
@@ -69,5 +69,12 @@ PIMPLE
     nNonOrthogonalCorrectors 0;
 }
 
+relaxationFactors
+{
+    "U.*"           1;
+    "k.*"           1;
+    "epsilon.*"     1;
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/boundary b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/boundary
index 8b7772d76cb08ce4a5f00a33c114c43569d5ea6b..dd2a4252a41912216786c25217e8fa270a019442 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/boundary
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/boundary
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      ascii;
+    format      binary;
     class       polyBoundaryMesh;
     location    "constant/polyMesh";
     object      boundary;