diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
index dbfcbd12d5140425c5d6cce9cf9ebd8f7336bcce..1a27956dbc5e54f91526642cdd89a47b2e2cb616 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
+|  \\    /   O peration     | Version:  1.7.1                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -106,7 +106,8 @@ castellatedMeshControls
     // Explicit feature edge refinement
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    // Specifies a level for any cell intersected by its edges.
+    // Specifies a level for any cell intersected by explicitly provided
+    // edges.
     // This is a featureEdgeMesh, read from constant/triSurface for now.
     features
     (
diff --git a/bin/mpirunDebug b/bin/mpirunDebug
index bd5c8a4c1594742b77ab739824afd85471943076..3b0c6f7fcec1fba7e72fbfce40d4e8b30411ee90 100755
--- a/bin/mpirunDebug
+++ b/bin/mpirunDebug
@@ -161,7 +161,7 @@ for ((proc=0; proc<$nProcs; proc++))
 do
     procCmdFile="$PWD/processor${proc}.sh"
     procLog="processor${proc}.log"
-    geom="-geometry 120x20+$xpos+$ypos"
+    geom="-geometry 120x15+$xpos+$ypos"
 
     case "$WM_MPLIB" in
     *OPENMPI)
@@ -183,11 +183,11 @@ do
         echo "${node}xterm -font fixed -title 'processor'$proc $geom -e $procCmdFile" >> $PWD/mpirun.schema
         ;;
     2)
-        echo "$sourceFoam; cd $PWD; gdb -command $PWD/gdbCommands >& $procLog" >> $procCmdFile
+        echo "$sourceFoam; cd $PWD; gdb -command $PWD/gdbCommands $exec > $procLog 2>&1" >> $procCmdFile
         echo "${node}$procCmdFile" >> $PWD/mpirun.schema
         ;;
     3)
-        echo "$sourceFoam; cd $PWD; $exec $args >& $procLog" >> $procCmdFile
+        echo "$sourceFoam; cd $PWD; $exec $args > $procLog 2>&1" >> $procCmdFile
         echo "${node}$procCmdFile" >> $PWD/mpirun.schema
         ;;
     4)
diff --git a/bin/tools/foamConfigurePaths b/bin/tools/foamConfigurePaths
index eb85ed9d972d0e439fd062684e843651bf377cdc..2b7bf40bad3ef3fb64b56ac10d329d3bdd7090e5 100644
--- a/bin/tools/foamConfigurePaths
+++ b/bin/tools/foamConfigurePaths
@@ -53,7 +53,8 @@ _inlineSed()
     backup=`tempfile`
     cp $1 $backup
     sed -i -e "$2" $1
-    cmp $1 $backup || usage "Failed : $3"
+    cmp --quiet $1 $backup && usage "Failed : $3"
+    return 0
 }
 
 
@@ -70,9 +71,7 @@ do
         ;;
     --foamInstall)
         [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
-    foamInstall="$2"
-        echo "** foamInstall:$foamInstall"
-
+        foamInstall="$2"
         _inlineSed \
             etc/bashrc \
             '/^[^#]/s@foamInstall=.*@foamInstall='"$foamInstall@" \
@@ -81,7 +80,7 @@ do
         ;;
    --projectName)
         [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
-    projectName="$2"
+        projectName="$2"
         _inlineSed \
             etc/bashrc \
             '/^[^#]/s@WM_PROJECT_DIR=.*@WM_PROJECT_DIR=$WM_PROJECT_INST_DIR/'"$projectName@" \
@@ -90,7 +89,7 @@ do
         ;;
     --archOption)
         [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
-    archOption="$2"
+        archOption="$2"
         _inlineSed \
             etc/bashrc \
             '/^[^#]/s@: ${WM_ARCH_OPTION:=64}@WM_ARCH_OPTION='"$archOption@" \
@@ -99,7 +98,7 @@ do
         ;;
     --paraviewInstall)
         [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
-    paraviewInstall="$2"
+        paraviewInstall="$2"
         _inlineSed \
             etc/apps/paraview3/bashrc \
             '/^[^#]/s@ParaView_DIR=.*@ParaView_DIR='"$paraviewInstall@" \
diff --git a/src/meshTools/PointEdgeWave/PointEdgeWave.C b/src/meshTools/PointEdgeWave/PointEdgeWave.C
index c27e8ab78f65d43512b3cdb88275c3a4b6ccb9b2..168d1f1d2d04e03cc2900e8dd0e4f333ee3a3958 100644
--- a/src/meshTools/PointEdgeWave/PointEdgeWave.C
+++ b/src/meshTools/PointEdgeWave/PointEdgeWave.C
@@ -515,13 +515,16 @@ void Foam::PointEdgeWave<Type>::handleProcPatches()
         label meshPointI = pd.sharedPointLabels()[i];
 
         // Retrieve my entries from the shared points
-        updatePoint
-        (
-            meshPointI,
-            sharedData[pd.sharedPointAddr()[i]],
-            propagationTol_,
-            allPointInfo_[meshPointI]
-        );
+        if (sharedData[pd.sharedPointAddr()[i]].valid())
+        {
+            updatePoint
+            (
+                meshPointI,
+                sharedData[pd.sharedPointAddr()[i]],
+                propagationTol_,
+                allPointInfo_[meshPointI]
+            );
+        }
     }
 }
 
diff --git a/src/meshTools/PointEdgeWave/PointEdgeWave.H b/src/meshTools/PointEdgeWave/PointEdgeWave.H
index f5f46ae151a46b86701f28a29dd311b195021a5c..9423fbbd71da0b08d72c6fd036dbda264f8ebe5b 100644
--- a/src/meshTools/PointEdgeWave/PointEdgeWave.H
+++ b/src/meshTools/PointEdgeWave/PointEdgeWave.H
@@ -350,7 +350,10 @@ public:
     {
         forAll(x, i)
         {
-            x[i].updatePoint(y[i], PointEdgeWave<Type>::propagationTol());
+            if (y[i].valid())
+            {
+                x[i].updatePoint(y[i], PointEdgeWave<Type>::propagationTol());
+            }
         }
     }
 };
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/createPatchDict b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/createPatchDict
index 0b0d58af959dfb413ca5929f639f45c32a523228..6f22c41d23bd197604fb8a102a409d2e22a4b356 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/createPatchDict
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/createPatchDict
@@ -25,7 +25,7 @@ FoamFile
 // Tolerance used in matching faces. Absolute tolerance is span of
 // face times this factor. To load incorrectly matches meshes set this
 // to a higher value.
-matchTolerance 1E-3;
+matchTolerance 1e-3;
 
 // Do a synchronisation of coupled points after creation of any patches.
 pointSync true;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/createPatchDict b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/createPatchDict
index 0b0d58af959dfb413ca5929f639f45c32a523228..6f22c41d23bd197604fb8a102a409d2e22a4b356 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/createPatchDict
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/createPatchDict
@@ -25,7 +25,7 @@ FoamFile
 // Tolerance used in matching faces. Absolute tolerance is span of
 // face times this factor. To load incorrectly matches meshes set this
 // to a higher value.
-matchTolerance 1E-3;
+matchTolerance 1e-3;
 
 // Do a synchronisation of coupled points after creation of any patches.
 pointSync true;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/setFieldsDict b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/setFieldsDict
index 6c4da7bc6a83763df37d04343e02345c17a7b859..bddf4b0790ba0c4562b2c88f5ba28a9b6affccb5 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/setFieldsDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/setFieldsDict
@@ -25,7 +25,7 @@ regions
     // Set patch values (using ==)
     boxToFace
     {
-        box (4.5 -1000 4.5) (5.5 1E-5 5.5);
+        box (4.5 -1000 4.5) (5.5 1e-5 5.5);
 
         fieldValues
         (
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/setFieldsDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/setFieldsDict
index 6c4da7bc6a83763df37d04343e02345c17a7b859..bddf4b0790ba0c4562b2c88f5ba28a9b6affccb5 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/setFieldsDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/setFieldsDict
@@ -25,7 +25,7 @@ regions
     // Set patch values (using ==)
     boxToFace
     {
-        box (4.5 -1000 4.5) (5.5 1E-5 5.5);
+        box (4.5 -1000 4.5) (5.5 1e-5 5.5);
 
         fieldValues
         (
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
index 6f09959210749fc2196206f99c1ca168c896ba19..573e23b23bbef144545921f7e32362e6bdb4595f 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
@@ -409,7 +409,7 @@ debug 0;
 
 // Merge tolerance. Is fraction of overall bounding box of initial mesh.
 // Note: the write tolerance needs to be higher than this.
-mergeTolerance 1E-6;
+mergeTolerance 1e-6;
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/setFieldsDict b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/setFieldsDict
index 6c4da7bc6a83763df37d04343e02345c17a7b859..bddf4b0790ba0c4562b2c88f5ba28a9b6affccb5 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/setFieldsDict
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/setFieldsDict
@@ -25,7 +25,7 @@ regions
     // Set patch values (using ==)
     boxToFace
     {
-        box (4.5 -1000 4.5) (5.5 1E-5 5.5);
+        box (4.5 -1000 4.5) (5.5 1e-5 5.5);
 
         fieldValues
         (
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/setFieldsDict b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/setFieldsDict
index 6c4da7bc6a83763df37d04343e02345c17a7b859..bddf4b0790ba0c4562b2c88f5ba28a9b6affccb5 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/setFieldsDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/setFieldsDict
@@ -25,7 +25,7 @@ regions
     // Set patch values (using ==)
     boxToFace
     {
-        box (4.5 -1000 4.5) (5.5 1E-5 5.5);
+        box (4.5 -1000 4.5) (5.5 1e-5 5.5);
 
         fieldValues
         (
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties
index 6afd8ebe64622b34804728109e2644ee4a2b0cc8..9f742f1d645d1d46d684caf62653724023eaf784 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/solidThermophysicalProperties
@@ -65,7 +65,7 @@ directionalSolidThermoCoeffs
         {
             type    axes;
             e1      (1 0 0);
-            e3      (-3.1807824E-6 -0.99813473 0.0610505);
+            e3      (-3.1807824e-6 -0.99813473 0.0610505);
         }
     }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution
index 3fd7359865cc96bde6b50fd67ce32912e8c72159..82bac3f059ea04f4b3f15c8a8df79826ee5ebf46 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution
@@ -20,14 +20,14 @@ solvers
     {
         solver           PCG;
         preconditioner   DIC;
-        tolerance        1E-06;
+        tolerance        1e-06;
         relTol           0.1;
     }
 
     TFinal
     {
         $T;
-        tolerance        1E-06;
+        tolerance        1e-06;
         relTol           0;
     }
 }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution
index 3fd7359865cc96bde6b50fd67ce32912e8c72159..82bac3f059ea04f4b3f15c8a8df79826ee5ebf46 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution
@@ -20,14 +20,14 @@ solvers
     {
         solver           PCG;
         preconditioner   DIC;
-        tolerance        1E-06;
+        tolerance        1e-06;
         relTol           0.1;
     }
 
     TFinal
     {
         $T;
-        tolerance        1E-06;
+        tolerance        1e-06;
         relTol           0;
     }
 }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution
index 3fd7359865cc96bde6b50fd67ce32912e8c72159..82bac3f059ea04f4b3f15c8a8df79826ee5ebf46 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution
@@ -20,14 +20,14 @@ solvers
     {
         solver           PCG;
         preconditioner   DIC;
-        tolerance        1E-06;
+        tolerance        1e-06;
         relTol           0.1;
     }
 
     TFinal
     {
         $T;
-        tolerance        1E-06;
+        tolerance        1e-06;
         relTol           0;
     }
 }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/solidThermophysicalProperties
index 6afd8ebe64622b34804728109e2644ee4a2b0cc8..9f742f1d645d1d46d684caf62653724023eaf784 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/solidThermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/solidThermophysicalProperties
@@ -65,7 +65,7 @@ directionalSolidThermoCoeffs
         {
             type    axes;
             e1      (1 0 0);
-            e3      (-3.1807824E-6 -0.99813473 0.0610505);
+            e3      (-3.1807824e-6 -0.99813473 0.0610505);
         }
     }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/fvSolution
index 7c00e466f4b508dc216b21874718108befe65e16..568b2a57b4fe8424dc6361c84fba2778d897772b 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/heater/fvSolution
@@ -20,22 +20,17 @@ solvers
     {
         solver           PCG;
         preconditioner   DIC;
-        tolerance        1E-06;
+        tolerance        1e-06;
         relTol           0.1;
     }
     TFinal
     {
         $T;
-        tolerance        1E-06;
+        tolerance        1e-06;
         relTol           0;
     }
 }
 
-PISO
-{
-    nNonOrthogonalCorrectors 1;
-}
-
 PIMPLE
 {
     nNonOrthogonalCorrectors 1;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/fvSolution
index 7c00e466f4b508dc216b21874718108befe65e16..568b2a57b4fe8424dc6361c84fba2778d897772b 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/leftSolid/fvSolution
@@ -20,22 +20,17 @@ solvers
     {
         solver           PCG;
         preconditioner   DIC;
-        tolerance        1E-06;
+        tolerance        1e-06;
         relTol           0.1;
     }
     TFinal
     {
         $T;
-        tolerance        1E-06;
+        tolerance        1e-06;
         relTol           0;
     }
 }
 
-PISO
-{
-    nNonOrthogonalCorrectors 1;
-}
-
 PIMPLE
 {
     nNonOrthogonalCorrectors 1;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/fvSolution
index 7c00e466f4b508dc216b21874718108befe65e16..568b2a57b4fe8424dc6361c84fba2778d897772b 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/rightSolid/fvSolution
@@ -20,22 +20,17 @@ solvers
     {
         solver           PCG;
         preconditioner   DIC;
-        tolerance        1E-06;
+        tolerance        1e-06;
         relTol           0.1;
     }
     TFinal
     {
         $T;
-        tolerance        1E-06;
+        tolerance        1e-06;
         relTol           0;
     }
 }
 
-PISO
-{
-    nNonOrthogonalCorrectors 1;
-}
-
 PIMPLE
 {
     nNonOrthogonalCorrectors 1;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
index be6c8895fda5db2e35371a7e90f78e060d7e5266..1c4488eb5e030a7cb28293290fff08fd2e85ec38 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
+thermoType      hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
 mixture
 {
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/solidThermophysicalProperties
index 6afd8ebe64622b34804728109e2644ee4a2b0cc8..9f742f1d645d1d46d684caf62653724023eaf784 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/solidThermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/solidThermophysicalProperties
@@ -65,7 +65,7 @@ directionalSolidThermoCoeffs
         {
             type    axes;
             e1      (1 0 0);
-            e3      (-3.1807824E-6 -0.99813473 0.0610505);
+            e3      (-3.1807824e-6 -0.99813473 0.0610505);
         }
     }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/solidThermophysicalProperties
index 6afd8ebe64622b34804728109e2644ee4a2b0cc8..9f742f1d645d1d46d684caf62653724023eaf784 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/solidThermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/solidThermophysicalProperties
@@ -65,7 +65,7 @@ directionalSolidThermoCoeffs
         {
             type    axes;
             e1      (1 0 0);
-            e3      (-3.1807824E-6 -0.99813473 0.0610505);
+            e3      (-3.1807824e-6 -0.99813473 0.0610505);
         }
     }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/solidThermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/solidThermophysicalProperties
index 6afd8ebe64622b34804728109e2644ee4a2b0cc8..9f742f1d645d1d46d684caf62653724023eaf784 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/solidThermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/solidThermophysicalProperties
@@ -65,7 +65,7 @@ directionalSolidThermoCoeffs
         {
             type    axes;
             e1      (1 0 0);
-            e3      (-3.1807824E-6 -0.99813473 0.0610505);
+            e3      (-3.1807824e-6 -0.99813473 0.0610505);
         }
     }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
index 972acfc40c53c7c807e63079092c3db82c4206ba..7f67791ae58ab8bd27e9dcb06a5dd7e7528cc8c0 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
+thermoType      hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
 mixture
 {
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution
index 3fd7359865cc96bde6b50fd67ce32912e8c72159..82bac3f059ea04f4b3f15c8a8df79826ee5ebf46 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution
@@ -20,14 +20,14 @@ solvers
     {
         solver           PCG;
         preconditioner   DIC;
-        tolerance        1E-06;
+        tolerance        1e-06;
         relTol           0.1;
     }
 
     TFinal
     {
         $T;
-        tolerance        1E-06;
+        tolerance        1e-06;
         relTol           0;
     }
 }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution
index 3fd7359865cc96bde6b50fd67ce32912e8c72159..82bac3f059ea04f4b3f15c8a8df79826ee5ebf46 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution
@@ -20,14 +20,14 @@ solvers
     {
         solver           PCG;
         preconditioner   DIC;
-        tolerance        1E-06;
+        tolerance        1e-06;
         relTol           0.1;
     }
 
     TFinal
     {
         $T;
-        tolerance        1E-06;
+        tolerance        1e-06;
         relTol           0;
     }
 }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution
index 3fd7359865cc96bde6b50fd67ce32912e8c72159..82bac3f059ea04f4b3f15c8a8df79826ee5ebf46 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution
@@ -20,14 +20,14 @@ solvers
     {
         solver           PCG;
         preconditioner   DIC;
-        tolerance        1E-06;
+        tolerance        1e-06;
         relTol           0.1;
     }
 
     TFinal
     {
         $T;
-        tolerance        1E-06;
+        tolerance        1e-06;
         relTol           0;
     }
 }
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict
index f86acc422643d14970063f4831f0e4046e47d8bd..e316ec6be9739c9207a9ecea804786fc8f3b2fdb 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict
@@ -391,7 +391,7 @@ debug 0;
 
 // Merge tolerance. Is fraction of overall bounding box of initial mesh.
 // Note: the write tolerance needs to be higher than this.
-mergeTolerance 1E-6;
+mergeTolerance 1e-6;
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
index be6c8895fda5db2e35371a7e90f78e060d7e5266..1c4488eb5e030a7cb28293290fff08fd2e85ec38 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
+thermoType      hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
 mixture
 {
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
index 972acfc40c53c7c807e63079092c3db82c4206ba..7f67791ae58ab8bd27e9dcb06a5dd7e7528cc8c0 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType      hPsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
+thermoType      hRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>>;
 
 mixture
 {
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/createPatchDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/createPatchDict
index 3cc5bf67e984badfcea570469a06e3dcccb77060..388d8a9dfedc2cd19ef121c1930b829f10ae97f7 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/createPatchDict
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/createPatchDict
@@ -18,7 +18,7 @@ FoamFile
 // Tolerance used in matching faces. Absolute tolerance is span of
 // face times this factor. To load incorrectly matches meshes set this
 // to a higher value.
-matchTolerance 1E-3;
+matchTolerance 1e-3;
 
 // Do a synchronisation of coupled points after creation of any patches.
 // Note: this does not work with points that are on multiple coupled patches
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict
index 78068461c3e79e8daad561dab43d5408bd5c3aed..ab931a25828e2241b9de237107cb122e36de44cf 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict
@@ -323,7 +323,7 @@ debug 0;
 
 // Merge tolerance. Is fraction of overall bounding box of initial mesh.
 // Note: the write tolerance needs to be higher than this.
-mergeTolerance 1E-6;
+mergeTolerance 1e-6;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/controlDict b/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
index 35dc084c0e7c595a94e59a6aeda83a317237bb4a..8d62c2cd9447e132970f9897451a4b7bf8044cd8 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
@@ -100,8 +100,8 @@ functions
             axis        x;  //distance;
 
             // Note: tracks slightly offset so as not to be on a face
-            start       (-1.001 1E-7 0.0011);
-            end         (-1.001 1E-7 1.0011);
+            start       (-1.001 1e-7 0.0011);
+            end         (-1.001 1e-7 1.0011);
             nPoints     20;
         }
     }
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
index 9506b9d641f404aec0b8d82834fb0deed9f72781..d7678a15cdb87e3ea03c47df12be34cb8a1dc50d 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
@@ -334,7 +334,7 @@ debug 0;
 
 // Merge tolerance. Is fraction of overall bounding box of initial mesh.
 // Note: the write tolerance needs to be higher than this.
-mergeTolerance 1E-6;
+mergeTolerance 1e-6;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/snappyHexMeshDict
index 7b7a4e571425abddc0a5c93e1a8b0194a2d713a2..38b3eb4a1f5196ae0c455a92cb21dce41cfbe91b 100644
--- a/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/snappyHexMeshDict
+++ b/tutorials/incompressible/simpleFoam/windTurbineTerrain/system/snappyHexMeshDict
@@ -49,7 +49,7 @@ geometry
         type triSurfaceMesh;
         name terrain;
 
-        //tolerance   1E-5;   // optional:non-default tolerance on intersections
+        //tolerance   1e-5;   // optional:non-default tolerance on intersections
         //maxTreeDepth 10;    // optional:depth of octree. Decrease only in case
                               // of memory limitations.
 
@@ -429,7 +429,7 @@ debug 0;
 
 // Merge tolerance. Is fraction of overall bounding box of initial mesh.
 // Note: the write tolerance needs to be higher than this.
-mergeTolerance 1E-6;
+mergeTolerance 1e-6;
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/createPatchDict b/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/createPatchDict
index fd20a082b818a74cbb316dac89cf05a75a2ae336..e4d587b59a2f051a066357d6f4b4c9d03898785a 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/createPatchDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/createPatchDict
@@ -17,7 +17,7 @@ FoamFile
 // Tolerance used in matching faces. Absolute tolerance is span of
 // face times this factor. To load incorrectly matches meshes set this
 // to a higher value.
-matchTolerance 1E-3;
+matchTolerance 1e-3;
 
 // Do a synchronisation of coupled points after creation of any patches.
 pointSync false;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/wallFilmRegion/createPatchDict b/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/wallFilmRegion/createPatchDict
index 4895599e4b553d08e85847ecd1a362178853eb6f..660b449f87cc5e308a50c97bed27e92727d7b9ae 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/wallFilmRegion/createPatchDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/wallFilmRegion/createPatchDict
@@ -17,7 +17,7 @@ FoamFile
 // Tolerance used in matching faces. Absolute tolerance is span of
 // face times this factor. To load incorrectly matches meshes set this
 // to a higher value.
-matchTolerance 1E-3;
+matchTolerance 1e-3;
 
 // Do a synchronisation of coupled points after creation of any patches.
 pointSync false;
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict
index 3cb346dcf3792da0ee26c464f77f7dc428bbb3c9..b44a7ceab881d58d9566e65edd7a5dc216f973c1 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict
@@ -343,7 +343,7 @@ debug 0;
 
 // Merge tolerance. Is fraction of overall bounding box of initial mesh.
 // Note: the write tolerance needs to be higher than this.
-mergeTolerance 1E-6;
+mergeTolerance 1e-6;
 
 
 // ************************************************************************* //