From 4c21f24a8c3ae823402b1647116f339e06fcaf48 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 20 Jul 2015 22:52:53 +0100
Subject: [PATCH] Input of dimensionedScalars: update read-construction of
 dimensionedScalar in applications so that the specification of the name and
 dimensions are optional in property dictionaries.

Update tutorials so that the name of the dimensionedScalar property is
no longer duplicated but optional dimensions are still provided and are
checked on read.
---
 .../financial/financialFoam/createFields.H    | 156 +++++++++---------
 .../readTransportProperties.H                 |  23 ++-
 .../boundaryFoam/createFields.H               |  80 ++++-----
 .../createFields.H                            |   2 +
 .../readThermodynamicProperties.H             |  75 ++++++---
 .../createFields.H                            |   2 +-
 .../incompressibleThreePhaseMixture.C         |   8 +-
 .../phaseChangeTwoPhaseMixture.C              |   4 +-
 .../multiphaseMixture/phase/phase.C           |   4 +-
 .../twoLiquidMixingFoam/createFields.H        |   4 +-
 .../constant/transportProperties              |  34 ++--
 .../constant/transportProperties              |  34 ++--
 .../constant/transportProperties              |  34 ++--
 .../constant/transportProperties              |  34 ++--
 src/OpenFOAM/dimensionSet/dimensionSets.C     |   1 +
 src/OpenFOAM/dimensionSet/dimensionSets.H     |   1 +
 ...ayatillekeWallFunctionFvPatchScalarField.C |   7 +-
 .../Chung/Chung.C                             |  30 +++-
 .../Wallis/Wallis.C                           |  30 +++-
 .../linear/linear.C                           |  16 +-
 .../viscosityModels/BirdCarreau/BirdCarreau.C |  10 +-
 .../CrossPowerLaw/CrossPowerLaw.C             |  10 +-
 .../HerschelBulkley/HerschelBulkley.C         |  20 +--
 .../viscosityModels/powerLaw/powerLaw.C       |  10 +-
 .../interfaceProperties/interfaceProperties.C |   2 +-
 tutorials/DNS/dnsFoam/boxTurb16/0/p           |   2 +-
 .../boxTurb16/constant/transportProperties    |   2 +-
 .../flange/constant/transportProperties       |   2 +-
 .../pitzDaily/constant/transportProperties    |   2 +-
 .../flamePropagationWithObstacles/0.org/Aw    |   2 +-
 .../flamePropagationWithObstacles/0.org/B     |   2 +-
 .../flamePropagationWithObstacles/0.org/CR    |   2 +-
 .../flamePropagationWithObstacles/0.org/CT    |   2 +-
 .../flamePropagationWithObstacles/0.org/Lobs  |   2 +-
 .../flamePropagationWithObstacles/0.org/Nv    |   2 +-
 .../flamePropagationWithObstacles/0.org/Su    |   2 +-
 .../flamePropagationWithObstacles/0.org/T     |   2 +-
 .../flamePropagationWithObstacles/0.org/Tu    |   2 +-
 .../flamePropagationWithObstacles/0.org/U     |   2 +-
 .../flamePropagationWithObstacles/0.org/Xi    |   2 +-
 .../flamePropagationWithObstacles/0.org/b     |   2 +-
 .../flamePropagationWithObstacles/0.org/betav |   2 +-
 .../0.org/epsilon                             |   2 +-
 .../flamePropagationWithObstacles/0.org/ft    |   2 +-
 .../flamePropagationWithObstacles/0.org/k     |   2 +-
 .../flamePropagationWithObstacles/0.org/k.old |   2 +-
 .../flamePropagationWithObstacles/0.org/nsv   |   2 +-
 .../flamePropagationWithObstacles/0.org/p     |   2 +-
 .../XiFoam/ras/moriyoshiHomogeneous/0/epsilon |   2 +-
 .../XiFoam/ras/moriyoshiHomogeneous/0/k       |   2 +-
 .../XiFoam/ras/moriyoshiHomogeneous/0/nut     |   2 +-
 .../constant/combustionProperties             |  16 +-
 .../constant/thermophysicalProperties         |   2 +-
 .../thermophysicalProperties.hydrogen         |   2 +-
 .../kivaTest/constant/combustionProperties    |  16 +-
 .../kivaTest/constant/engineGeometry          |  10 +-
 .../constant/thermophysicalProperties         |   2 +-
 .../constant/radiationProperties              |   6 +-
 .../biconic25-55Run35/sampleCone              |   2 +-
 .../constant/transportProperties              |   2 +-
 .../rhoPimpleFoam/ras/cavity/0/epsilon        |   2 +-
 .../rhoPimpleFoam/ras/mixerVessel2D/0/epsilon |   2 +-
 .../rhoPimpleFoam/ras/mixerVessel2D/0/k       |   2 +-
 .../constant/transportProperties              |  19 +--
 .../angledDuctImplicit/0/epsilon              |   2 +-
 .../angledDuctImplicit/0/k                    |   2 +-
 .../angledDuctImplicit/0/nut                  |   2 +-
 .../angledDuctExplicitFixedCoeff/0/epsilon    |   2 +-
 .../angledDuctExplicitFixedCoeff/0/k          |   2 +-
 .../constant/thermodynamicProperties          |   6 +-
 .../constant/transportProperties              |   2 +-
 .../dsmcFoam/freeSpacePeriodic/0/boundaryT    |   2 +-
 .../dsmcFoam/freeSpacePeriodic/0/boundaryU    |   2 +-
 .../dsmcFoam/freeSpacePeriodic/0/dsmcRhoN     |   2 +-
 .../dsmcFoam/freeSpacePeriodic/0/fD           |   2 +-
 .../dsmcFoam/freeSpacePeriodic/0/iDof         |   2 +-
 .../dsmcFoam/freeSpacePeriodic/0/internalE    |   2 +-
 .../dsmcFoam/freeSpacePeriodic/0/linearKE     |   2 +-
 .../dsmcFoam/freeSpacePeriodic/0/momentum     |   2 +-
 .../dsmcFoam/freeSpacePeriodic/0/q            |   2 +-
 .../dsmcFoam/freeSpacePeriodic/0/rhoM         |   2 +-
 .../dsmcFoam/freeSpacePeriodic/0/rhoN         |   2 +-
 .../mdEquilibrationFoam/periodicCubeArgon/0/U |   2 +-
 .../mdEquilibrationFoam/periodicCubeWater/0/U |   2 +-
 .../chargedWire/constant/physicalProperties   |   5 +-
 .../hartmann/constant/transportProperties     |   9 +-
 .../europeanCall/constant/financialProperties |  13 +-
 .../europeanCall/constant/polyMesh/boundary   |   1 +
 .../hotRoom/constant/transportProperties      |  10 +-
 .../hotRoom/constant/transportProperties      |  10 +-
 .../constant/transportProperties              |  10 +-
 .../0.org/baffle3DRegion/T                    |   2 +-
 .../0.org/baffle3DRegion/p                    |   2 +-
 .../externalCoupledCavity/externalSolver      |   2 +-
 .../constant/radiationProperties              |   6 +-
 .../multiRegionHeater/0/bottomWater/T         |   2 +-
 .../multiRegionHeater/0/bottomWater/U         |   2 +-
 .../multiRegionHeater/0/bottomWater/epsilon   |   2 +-
 .../multiRegionHeater/0/bottomWater/k         |   2 +-
 .../multiRegionHeater/0/bottomWater/p         |   2 +-
 .../multiRegionHeater/0/bottomWater/p_rgh     |   2 +-
 .../constant/heater/radiationProperties       |   6 +-
 .../constant/bottomAir/radiationProperties    |   6 +-
 .../constant/heater/radiationProperties       |   6 +-
 .../SRFPimpleFoam/rotor2D/0/epsilon           |   2 +-
 .../incompressible/SRFPimpleFoam/rotor2D/0/k  |   2 +-
 .../SRFPimpleFoam/rotor2D/0/nut               |   2 +-
 .../rotor2D/constant/transportProperties      |  19 +--
 .../incompressible/SRFSimpleFoam/mixer/0/Urel |   2 +-
 .../SRFSimpleFoam/mixer/0/epsilon             |   2 +-
 .../incompressible/SRFSimpleFoam/mixer/0/k    |   2 +-
 .../incompressible/SRFSimpleFoam/mixer/0/nut  |   2 +-
 .../SRFSimpleFoam/mixer/0/omega               |   2 +-
 .../incompressible/SRFSimpleFoam/mixer/0/p    |   2 +-
 .../mixer/constant/transportProperties        |  19 +--
 .../pitzDaily/constant/transportProperties    |   2 +-
 .../boundaryFoam/boundaryLaunderSharma/0/U    |   2 +-
 .../boundaryLaunderSharma/0/epsilon           |   2 +-
 .../boundaryFoam/boundaryLaunderSharma/0/k    |   2 +-
 .../boundaryLaunderSharma/0/nuTilda           |   2 +-
 .../constant/transportProperties              |  20 +--
 .../boundaryFoam/boundaryWallFunctions/0/U    |   2 +-
 .../boundaryWallFunctions/0/epsilon           |   2 +-
 .../boundaryFoam/boundaryWallFunctions/0/k    |   2 +-
 .../boundaryWallFunctions/0/nuTilda           |   2 +-
 .../boundaryFoam/boundaryWallFunctions/0/nut  |   2 +-
 .../constant/transportProperties              |  21 +--
 .../boundaryWallFunctionsProfile/0/U          |   2 +-
 .../boundaryWallFunctionsProfile/0/epsilon    |   2 +-
 .../boundaryWallFunctionsProfile/0/k          |   2 +-
 .../boundaryWallFunctionsProfile/0/nuTilda    |   2 +-
 .../boundaryWallFunctionsProfile/0/nut        |   2 +-
 .../boundaryWallFunctionsProfile/0/nut.k      |   2 +-
 .../0/nut.spalding                            |   2 +-
 .../boundaryWallFunctionsProfile/0/omega      |   2 +-
 .../constant/transportProperties              |   5 +-
 .../constant/transportProperties.template     |   5 +-
 .../cavity/constant/transportProperties       |   2 +-
 .../constant/transportProperties              |   2 +-
 .../cavityGrade/constant/transportProperties  |   2 +-
 .../elbow/constant/transportProperties        |   2 +-
 .../constant/transportProperties              |  19 +--
 .../pimpleDyMFoam/mixerVesselAMI2D/0/epsilon  |   2 +-
 .../pimpleDyMFoam/mixerVesselAMI2D/0/k        |   2 +-
 .../pimpleDyMFoam/mixerVesselAMI2D/0/nut      |   2 +-
 .../constant/transportProperties              |  18 +-
 .../movingCone/constant/transportProperties   |  19 +--
 .../constant/transportProperties              |   2 +-
 .../propeller/constant/transportProperties    |   2 +-
 .../constant/transportProperties              |   2 +-
 .../constant/transportProperties              |   2 +-
 .../pimpleFoam/TJunction/0/epsilon            |   2 +-
 .../incompressible/pimpleFoam/TJunction/0/k   |   2 +-
 .../incompressible/pimpleFoam/TJunction/0/nut |   2 +-
 .../TJunction/constant/transportProperties    |  19 +--
 .../TJunctionFan/constant/transportProperties |  19 +--
 .../pimpleFoam/channel395/0.org/U             |   2 +-
 .../pimpleFoam/channel395/0.org/k             |   2 +-
 .../pimpleFoam/channel395/0.org/nuTilda       |   2 +-
 .../pimpleFoam/channel395/0.org/nut           |   2 +-
 .../pimpleFoam/channel395/0.org/p             |   2 +-
 .../channel395/constant/transportProperties   |  21 +--
 .../pimpleFoam/elipsekkLOmega/0/nut           |   2 +-
 .../constant/transportProperties              |  19 +--
 .../pitzDaily/constant/transportProperties    |  19 +--
 .../pisoFoam/les/motorBike/motorBike/0.org/U  |   2 +-
 .../pisoFoam/les/motorBike/motorBike/0.org/k  |   2 +-
 .../les/motorBike/motorBike/0.org/nuTilda     |   2 +-
 .../les/motorBike/motorBike/0.org/nut         |   2 +-
 .../pisoFoam/les/motorBike/motorBike/0.org/p  |   2 +-
 .../motorBike/constant/transportProperties    |   2 +-
 .../pitzDaily/constant/transportProperties    |  19 +--
 .../constant/transportProperties              |  19 +--
 .../ras/cavity/constant/transportProperties   |  19 +--
 .../constant/transportProperties              |  19 +--
 .../angledDuctImplicit/0/epsilon              |   2 +-
 .../porousSimpleFoam/angledDuctImplicit/0/k   |   2 +-
 .../constant/transportProperties              |   2 +-
 .../straightDuctImplicit/0/epsilon            |   2 +-
 .../porousSimpleFoam/straightDuctImplicit/0/k |   2 +-
 .../constant/transportProperties              |   2 +-
 .../airFoil2D/constant/transportProperties    |  21 +--
 .../simpleFoam/mixerVessel2D/0/epsilon        |   2 +-
 .../simpleFoam/mixerVessel2D/0/k              |   2 +-
 .../simpleFoam/mixerVessel2D/0/nut            |   2 +-
 .../constant/transportProperties              |  19 +--
 .../motorBike/constant/transportProperties    |   2 +-
 .../simpleFoam/pipeCyclic/0.org/epsilon       |   2 +-
 .../simpleFoam/pipeCyclic/0.org/k             |   2 +-
 .../simpleFoam/pipeCyclic/0.org/nut           |   2 +-
 .../pipeCyclic/constant/transportProperties   |   2 +-
 .../pitzDaily/constant/transportProperties    |  19 +--
 .../constant/transportProperties              |  19 +--
 .../rotorDisk/constant/transportProperties    |   2 +-
 .../constant/transportProperties              |   2 +-
 .../constant/transportProperties              |   2 +-
 .../constant/radiationProperties              |   8 +-
 .../constant/transportProperties              |   4 +-
 .../constant/transportProperties              |   4 +-
 .../hotBoxes/patchifyObstacles                |   2 +-
 .../reactingParcelFoam/filter/0.org/G         |   2 +-
 .../reactingParcelFoam/filter/0.org/H2O       |   2 +-
 .../reactingParcelFoam/filter/0.org/N2        |   2 +-
 .../reactingParcelFoam/filter/0.org/O2        |   2 +-
 .../reactingParcelFoam/filter/0.org/T         |   2 +-
 .../reactingParcelFoam/filter/0.org/U         |   2 +-
 .../reactingParcelFoam/filter/0.org/alphat    |   2 +-
 .../reactingParcelFoam/filter/0.org/epsilon   |   2 +-
 .../reactingParcelFoam/filter/0.org/k         |   2 +-
 .../reactingParcelFoam/filter/0.org/nut       |   2 +-
 .../reactingParcelFoam/filter/0.org/p         |   2 +-
 .../lagrangian/reactingParcelFoam/filter/0/G  |   2 +-
 .../reactingParcelFoam/filter/0/H2O           |   2 +-
 .../lagrangian/reactingParcelFoam/filter/0/N2 |   2 +-
 .../lagrangian/reactingParcelFoam/filter/0/O2 |   2 +-
 .../lagrangian/reactingParcelFoam/filter/0/T  |   2 +-
 .../lagrangian/reactingParcelFoam/filter/0/U  |   2 +-
 .../reactingParcelFoam/filter/0/alphat        |   2 +-
 .../reactingParcelFoam/filter/0/epsilon       |   2 +-
 .../lagrangian/reactingParcelFoam/filter/0/k  |   2 +-
 .../reactingParcelFoam/filter/0/nut           |   2 +-
 .../lagrangian/reactingParcelFoam/filter/0/p  |   2 +-
 .../lagrangian/sprayFoam/aachenBomb/0/N2      |   2 +-
 .../lagrangian/sprayFoam/aachenBomb/0/O2      |   2 +-
 tutorials/lagrangian/sprayFoam/aachenBomb/0/T |   2 +-
 tutorials/lagrangian/sprayFoam/aachenBomb/0/U |   2 +-
 .../sprayFoam/aachenBomb/0/Ydefault           |   2 +-
 tutorials/lagrangian/sprayFoam/aachenBomb/0/p |   2 +-
 .../mixerVessel/constant/transportProperties  |  10 +-
 .../constant/transportProperties              |   2 +-
 .../throttle/constant/thermodynamicProperties |  10 +-
 .../les/throttle/constant/transportProperties |  42 +----
 .../constant/thermodynamicProperties          |  10 +-
 .../throttle3D/constant/transportProperties   |  43 +----
 .../throttle/constant/thermodynamicProperties |  11 +-
 .../ras/throttle/constant/transportProperties |  43 +----
 .../constant/thermophysicalProperties         |   4 +-
 .../constant/transportProperties              |  10 +-
 .../constant/thermophysicalProperties         |   4 +-
 .../constant/thermophysicalProperties         |   4 +-
 .../damBreak4phase/constant/polyMesh/boundary |   3 +
 .../constant/thermophysicalProperties         |   2 +-
 .../ras/DTCHull/constant/transportProperties  |  10 +-
 .../constant/transportProperties              |  40 +----
 .../constant/transportProperties              |  10 +-
 .../constant/transportProperties              |  10 +-
 .../constant/transportProperties              |  11 +-
 .../constant/transportProperties              |  10 +-
 .../constant/transportProperties              |  11 +-
 .../constant/transportProperties              |  10 +-
 .../constant/transportProperties              |  11 +-
 .../constant/transportProperties              |  10 +-
 .../constant/transportProperties              |  38 +----
 .../damBreak/constant/transportProperties     |  40 +----
 .../constant/transportProperties              |  10 +-
 .../nozzleFlow2D/constant/transportProperties |  41 +----
 .../ras/DTCHull/constant/transportProperties  |  10 +-
 .../angledDuct/constant/transportProperties   |  40 +----
 .../ras/damBreak/constant/transportProperties |  40 +----
 .../constant/transportProperties              |  40 +----
 .../waterChannel/constant/transportProperties |  10 +-
 .../weirOverflow/constant/transportProperties |  40 +----
 .../damBreak/constant/transportProperties     |  12 +-
 .../propeller/constant/transportProperties    |  14 +-
 .../constant/transportProperties              |  12 +-
 .../multiphaseEulerFoam/bubbleColumn/0/Theta  |   2 +-
 .../multiphaseEulerFoam/bubbleColumn/0/p_rgh  |   2 +-
 .../bubbleColumn/constant/transportProperties |   2 +-
 .../constant/transportProperties              |   2 +-
 .../constant/transportProperties              |   2 +-
 .../mixerVessel2D/0/epsilon                   |   2 +-
 .../multiphaseEulerFoam/mixerVessel2D/0/k     |   2 +-
 .../constant/transportProperties              |   2 +-
 .../constant/transportProperties              |  16 +-
 .../damBreak4phase/constant/polyMesh/boundary |   3 +
 .../constant/transportProperties              |  16 +-
 .../constant/transportProperties              |  16 +-
 .../constant/transportProperties              |  16 +-
 .../constant/transportProperties              |   2 +-
 .../constant/transportProperties              |   2 +-
 .../LES/bubbleColumn/0/Theta                  |   2 +-
 .../LES/bubbleColumn/0/p                      |   2 +-
 .../LES/bubbleColumn/0/p_rgh                  |   2 +-
 .../RAS/bubbleColumn/0/Theta                  |   2 +-
 .../RAS/bubbleColumn/0/p                      |   2 +-
 .../RAS/bubbleColumn/0/p_rgh                  |   2 +-
 .../RAS/bubbleColumnEvaporatingReacting/0/p   |   2 +-
 .../bubbleColumnEvaporatingReacting/0/p_rgh   |   2 +-
 .../RAS/fluidisedBed/0/Theta.particles        |   2 +-
 .../laminar/bubbleColumn/0/Theta              |   2 +-
 .../laminar/bubbleColumn/0/p                  |   2 +-
 .../laminar/bubbleColumn/0/p_rgh              |   2 +-
 .../laminar/bubbleColumnEvaporating/0/p       |   2 +-
 .../laminar/bubbleColumnEvaporating/0/p_rgh   |   2 +-
 .../bubbleColumnEvaporatingDissolving/0/p     |   2 +-
 .../bubbleColumnEvaporatingDissolving/0/p_rgh |   2 +-
 .../laminar/bubbleColumnIATE/0/Theta          |   2 +-
 .../laminar/bubbleColumnIATE/0/p              |   2 +-
 .../laminar/bubbleColumnIATE/0/p_rgh          |   2 +-
 .../laminar/fluidisedBed/0/Theta.particles    |   2 +-
 .../laminar/injection/0/p                     |   2 +-
 .../laminar/injection/0/p_rgh                 |   2 +-
 .../lockExchange/constant/transportProperties |  12 +-
 .../LES/bubbleColumn/0/Theta                  |   2 +-
 .../twoPhaseEulerFoam/LES/bubbleColumn/0/p    |   2 +-
 .../LES/bubbleColumn/0/p_rgh                  |   2 +-
 .../RAS/bubbleColumn/0/Theta                  |   2 +-
 .../twoPhaseEulerFoam/RAS/bubbleColumn/0/p    |   2 +-
 .../RAS/bubbleColumn/0/p_rgh                  |   2 +-
 .../RAS/fluidisedBed/0/Theta.particles        |   2 +-
 .../laminar/bubbleColumn/0/Theta              |   2 +-
 .../laminar/bubbleColumn/0/p                  |   2 +-
 .../laminar/bubbleColumn/0/p_rgh              |   2 +-
 .../laminar/bubbleColumnIATE/0/Theta          |   2 +-
 .../laminar/bubbleColumnIATE/0/p              |   2 +-
 .../laminar/bubbleColumnIATE/0/p_rgh          |   2 +-
 .../laminar/fluidisedBed/0/Theta.particles    |   2 +-
 .../twoPhaseEulerFoam/laminar/injection/0/p   |   2 +-
 .../laminar/injection/0/p_rgh                 |   2 +-
 .../beamEndLoad/0/D                           |   2 +-
 .../beamEndLoad/0/p                           |   2 +-
 321 files changed, 893 insertions(+), 1484 deletions(-)

diff --git a/applications/solvers/financial/financialFoam/createFields.H b/applications/solvers/financial/financialFoam/createFields.H
index dc0da4d2a3e..d9a8769d77a 100644
--- a/applications/solvers/financial/financialFoam/createFields.H
+++ b/applications/solvers/financial/financialFoam/createFields.H
@@ -1,95 +1,99 @@
-    Info<< "Reading financial properties\n" << endl;
+Info<< "Reading financial properties\n" << endl;
 
-    IOdictionary financialProperties
+IOdictionary financialProperties
+(
+    IOobject
     (
-        IOobject
-        (
-            "financialProperties",
-            runTime.constant(),
-            mesh,
-            IOobject::MUST_READ_IF_MODIFIED,
-            IOobject::NO_WRITE
-        )
-    );
+        "financialProperties",
+        runTime.constant(),
+        mesh,
+        IOobject::MUST_READ_IF_MODIFIED,
+        IOobject::NO_WRITE
+    )
+);
 
-    dimensionedScalar strike
-    (
-        financialProperties.lookup("strike")
-    );
+dimensionedScalar strike
+(
+    "strike",
+    dimLength,
+    financialProperties.lookup("strike")
+);
 
-    dimensionedScalar r
-    (
-        financialProperties.lookup("r")
-    );
+dimensionedScalar r
+(
+    "r",
+    dimless/dimTime,
+    financialProperties.lookup("r")
+);
 
-    dimensionedScalar sigma
-    (
-        financialProperties.lookup("sigma")
-    );
+dimensionedScalar sigma
+(
+    "sigma",
+    dimensionSet(0, 0, -0.5, 0, 0),
+    financialProperties.lookup("sigma")
+);
 
-    dimensionedScalar sigmaSqr = sqr(sigma);
+dimensionedScalar sigmaSqr = sqr(sigma);
 
 
-    Info<< nl << "Reading field V" << endl;
+Info<< nl << "Reading field V" << endl;
 
-    volScalarField V
+volScalarField V
+(
+    IOobject
     (
-        IOobject
-        (
-            "V",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
+        "V",
+        runTime.timeName(),
+        mesh,
+        IOobject::MUST_READ,
+        IOobject::AUTO_WRITE
+    ),
+    mesh
+);
 
 
-    surfaceVectorField Pf
+surfaceVectorField Pf
+(
+    IOobject
     (
-        IOobject
-        (
-            "Pf",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        mesh.Cf()
-    );
+        "Pf",
+        runTime.timeName(),
+        mesh,
+        IOobject::NO_READ,
+        IOobject::NO_WRITE
+    ),
+    mesh.Cf()
+);
 
 
-    volVectorField P
-    (
-        IOobject
-        (
-            "P",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        mesh.C()
-    );
-
-//-    V == max(strike - P.x(), dimensionedScalar("0", V.dimensions(), 0.0));
-    V == max
+volVectorField P
+(
+    IOobject
     (
-        P.component(Foam::vector::X) - strike,
-        dimensionedScalar("0", V.dimensions(), 0.0)
-    );
+        "P",
+        runTime.timeName(),
+        mesh,
+        IOobject::NO_READ,
+        IOobject::NO_WRITE
+    ),
+    mesh.C()
+);
 
+V == max
+(
+    P.component(Foam::vector::X) - strike,
+    dimensionedScalar("0", V.dimensions(), 0.0)
+);
 
-    volScalarField delta
+volScalarField delta
+(
+    IOobject
     (
-        IOobject
-        (
-            "delta",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        fvc::grad(V)().component(Foam::vector::X)
-    );
+        "delta",
+        runTime.timeName(),
+        mesh,
+        IOobject::NO_READ,
+        IOobject::AUTO_WRITE
+    ),
+    fvc::grad(V)().component(Foam::vector::X)
+);
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/readTransportProperties.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/readTransportProperties.H
index 82d101d8c1b..f3809377b76 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/readTransportProperties.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/readTransportProperties.H
@@ -1,13 +1,18 @@
-    singlePhaseTransportModel laminarTransport(U, phi);
+singlePhaseTransportModel laminarTransport(U, phi);
 
-    // Thermal expansion coefficient [1/K]
-    dimensionedScalar beta(laminarTransport.lookup("beta"));
+// Thermal expansion coefficient [1/K]
+dimensionedScalar beta
+(
+    "beta",
+    dimless/dimTemperature,
+    laminarTransport.lookup("beta")
+);
 
-    // Reference temperature [K]
-    dimensionedScalar TRef(laminarTransport.lookup("TRef"));
+// Reference temperature [K]
+dimensionedScalar TRef("TRef", dimTemperature, laminarTransport.lookup("TRef"));
 
-    // Laminar Prandtl number
-    dimensionedScalar Pr(laminarTransport.lookup("Pr"));
+// Laminar Prandtl number
+dimensionedScalar Pr("Pr", dimless, laminarTransport.lookup("Pr"));
 
-    // Turbulent Prandtl number
-    dimensionedScalar Prt(laminarTransport.lookup("Prt"));
+// Turbulent Prandtl number
+dimensionedScalar Prt("Prt", dimless, laminarTransport.lookup("Prt"));
diff --git a/applications/solvers/incompressible/boundaryFoam/createFields.H b/applications/solvers/incompressible/boundaryFoam/createFields.H
index f170e212a17..0554d9268aa 100644
--- a/applications/solvers/incompressible/boundaryFoam/createFields.H
+++ b/applications/solvers/incompressible/boundaryFoam/createFields.H
@@ -1,49 +1,49 @@
-    Info<< "Reading field U\n" << endl;
-    volVectorField U
+Info<< "Reading field U\n" << endl;
+volVectorField U
+(
+    IOobject
     (
-        IOobject
-        (
-            "U",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-
-    Info<< "Creating face flux\n" << endl;
-    surfaceScalarField phi
+        "U",
+        runTime.timeName(),
+        mesh,
+        IOobject::MUST_READ,
+        IOobject::AUTO_WRITE
+    ),
+    mesh
+);
+
+
+Info<< "Creating face flux\n" << endl;
+surfaceScalarField phi
+(
+    IOobject
     (
-        IOobject
-        (
-            "phi",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
+        "phi",
+        runTime.timeName(),
         mesh,
-        dimensionedScalar("zero", mesh.Sf().dimensions()*U.dimensions(), 0.0)
-    );
+        IOobject::NO_READ,
+        IOobject::NO_WRITE
+    ),
+    mesh,
+    dimensionedScalar("zero", mesh.Sf().dimensions()*U.dimensions(), 0.0)
+);
 
 
-    singlePhaseTransportModel laminarTransport(U, phi);
+singlePhaseTransportModel laminarTransport(U, phi);
 
-    autoPtr<incompressible::RASModel> turbulence
-    (
-        incompressible::RASModel::New(U, phi, laminarTransport)
-    );
+autoPtr<incompressible::RASModel> turbulence
+(
+    incompressible::RASModel::New(U, phi, laminarTransport)
+);
 
-    dimensionedVector Ubar(laminarTransport.lookup("Ubar"));
+dimensionedVector Ubar("Ubar", dimVelocity, laminarTransport.lookup("Ubar"));
 
-    vector flowDirection = (Ubar/mag(Ubar)).value();
-    tensor flowMask = sqr(flowDirection);
+vector flowDirection = (Ubar/mag(Ubar)).value();
+tensor flowMask = sqr(flowDirection);
 
-    dimensionedVector gradP
-    (
-        "gradP",
-        dimensionSet(0, 1, -2, 0, 0),
-        vector::zero
-    );
+dimensionedVector gradP
+(
+    "gradP",
+    dimensionSet(0, 1, -2, 0, 0),
+    vector::zero
+);
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
index 8c954b6a616..56b934d58ae 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
@@ -18,6 +18,8 @@
 
     dimensionedScalar rhoInfValue
     (
+        "rhoInf",
+        dimDensity,
         laminarTransport.lookup("rhoInf")
     );
 
diff --git a/applications/solvers/multiphase/cavitatingFoam/readThermodynamicProperties.H b/applications/solvers/multiphase/cavitatingFoam/readThermodynamicProperties.H
index 3740f105633..e4e0f7b8a91 100644
--- a/applications/solvers/multiphase/cavitatingFoam/readThermodynamicProperties.H
+++ b/applications/solvers/multiphase/cavitatingFoam/readThermodynamicProperties.H
@@ -1,27 +1,52 @@
-    Info<< "Reading thermodynamicProperties\n" << endl;
+Info<< "Reading thermodynamicProperties\n" << endl;
 
-    IOdictionary thermodynamicProperties
+IOdictionary thermodynamicProperties
+(
+    IOobject
     (
-        IOobject
-        (
-            "thermodynamicProperties",
-            runTime.constant(),
-            mesh,
-            IOobject::MUST_READ_IF_MODIFIED,
-            IOobject::NO_WRITE
-        )
-    );
-
-    dimensionedScalar psil(thermodynamicProperties.lookup("psil"));
-
-    dimensionedScalar rholSat(thermodynamicProperties.lookup("rholSat"));
-
-    dimensionedScalar psiv(thermodynamicProperties.lookup("psiv"));
-
-    dimensionedScalar pSat(thermodynamicProperties.lookup("pSat"));
-
-    dimensionedScalar rhovSat("rhovSat", psiv*pSat);
-
-    dimensionedScalar rhol0("rhol0", rholSat - pSat*psil);
-
-    dimensionedScalar rhoMin(thermodynamicProperties.lookup("rhoMin"));
+        "thermodynamicProperties",
+        runTime.constant(),
+        mesh,
+        IOobject::MUST_READ_IF_MODIFIED,
+        IOobject::NO_WRITE
+    )
+);
+
+dimensionedScalar psil
+(
+    "psil",
+    dimCompressibility,
+    thermodynamicProperties.lookup("psil")
+);
+
+dimensionedScalar rholSat
+(
+    "rholSat",
+    dimDensity,
+    thermodynamicProperties.lookup("rholSat")
+);
+
+dimensionedScalar psiv
+(
+    "psiv",
+    dimCompressibility,
+    thermodynamicProperties.lookup("psiv")
+);
+
+dimensionedScalar pSat
+(
+    "pSat",
+    dimPressure,
+    thermodynamicProperties.lookup("pSat")
+);
+
+dimensionedScalar rhovSat("rhovSat", psiv*pSat);
+
+dimensionedScalar rhol0("rhol0", rholSat - pSat*psil);
+
+dimensionedScalar rhoMin
+(
+    "rhoMin",
+    dimDensity,
+    thermodynamicProperties.lookup("rhoMin")
+);
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H
index ce0faac571f..4110b86e7f6 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H
@@ -46,7 +46,7 @@ volScalarField rho
     mixture.rho()
 );
 
-dimensionedScalar pMin(mixture.lookup("pMin"));
+dimensionedScalar pMin("pMin", dimPressure, mixture.lookup("pMin"));
 
 mesh.setFluxRequired(p_rgh.name());
 
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C
index 0894f3c6f36..352c85694ed 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -152,9 +152,9 @@ Foam::incompressibleThreePhaseMixture::incompressibleThreePhaseMixture
         )
     ),
 
-    rho1_(nuModel1_->viscosityProperties().lookup("rho")),
-    rho2_(nuModel2_->viscosityProperties().lookup("rho")),
-    rho3_(nuModel3_->viscosityProperties().lookup("rho"))
+    rho1_("rho", dimDensity, nuModel1_->viscosityProperties().lookup("rho")),
+    rho2_("rho", dimDensity, nuModel2_->viscosityProperties().lookup("rho")),
+    rho3_("rho", dimDensity, nuModel3_->viscosityProperties().lookup("rho"))
 {
     alpha3_ == 1.0 - alpha1_ - alpha2_;
     calcNu();
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C
index d25fbdfec9c..55752538887 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ Foam::phaseChangeTwoPhaseMixture::phaseChangeTwoPhaseMixture
 :
     incompressibleTwoPhaseMixture(U, phi),
     phaseChangeTwoPhaseMixtureCoeffs_(subDict(type + "Coeffs")),
-    pSat_(lookup("pSat"))
+    pSat_("pSat", dimPressure, lookup("pSat"))
 {}
 
 
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C
index 08e7c0b0430..85954554f70 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,7 +59,7 @@ Foam::phase::phase
             phi
         )
     ),
-    rho_(phaseDict_.lookup("rho"))
+    rho_("rho", dimDensity, phaseDict_.lookup("rho"))
 {}
 
 
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H b/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
index 9fc3bcbbbe5..c52c897b3fe 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
@@ -37,10 +37,10 @@ volScalarField& alpha2(mixture.alpha2());
 const dimensionedScalar& rho1 = mixture.rho1();
 const dimensionedScalar& rho2 = mixture.rho2();
 
-dimensionedScalar Dab(mixture.lookup("Dab"));
+dimensionedScalar Dab("Dab", dimViscosity, mixture.lookup("Dab"));
 
 // Read the reciprocal of the turbulent Schmidt number
-dimensionedScalar alphatab(mixture.lookup("alphatab"));
+dimensionedScalar alphatab("alphatab", dimless, mixture.lookup("alphatab"));
 
 // Need to store rho for ddt(rho, U)
 volScalarField rho("rho", alpha1*rho1 + alpha2*rho2);
diff --git a/etc/templates/axisymmetricJet/constant/transportProperties b/etc/templates/axisymmetricJet/constant/transportProperties
index 9671f7a865f..455ea9b0bfb 100644
--- a/etc/templates/axisymmetricJet/constant/transportProperties
+++ b/etc/templates/axisymmetricJet/constant/transportProperties
@@ -16,38 +16,38 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1.5e-05;
+nu              [0 2 -1 0 0 0 0] 1.5e-05;
 
 BirdCarreauCoeffs
 {
-    nu0             nu0   [ 0 2 -1 0 0 0 0 ] 1e-03;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-05;
-    m               m     [ 0 0  1 0 0 0 0 ] 1;
-    n               n     [ 0 0  0 0 0 0 0 ] 0.5;
+    nu0             [0 2 -1 0 0 0 0] 1e-03;
+    nuInf           [0 2 -1 0 0 0 0] 1e-05;
+    m               [0 0  1 0 0 0 0] 1;
+    n               [0 0  0 0 0 0 0] 0.5;
 }
 
 CrossPowerLawCoeffs
 {
-    nu0             nu0   [ 0 2 -1 0 0 0 0 ] 1e-03;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-05;
-    m               m     [ 0 0  1 0 0 0 0 ] 1;
-    n               n     [ 0 0  0 0 0 0 0 ] 0.5;
+    nu0             [0 2 -1 0 0 0 0] 1e-03;
+    nuInf           [0 2 -1 0 0 0 0] 1e-05;
+    m               [0 0  1 0 0 0 0] 1;
+    n               [0 0  0 0 0 0 0] 0.5;
 }
 
 powerLawCoeffs
 {
-    nuMax           nuMax [ 0 2 -1 0 0 0 0 ] 1e-03;
-    nuMin           nuMin [ 0 2 -1 0 0 0 0 ] 1e-05;
-    k               k     [ 0 2 -1 0 0 0 0 ] 1e-05;
-    n               n     [ 0 0  0 0 0 0 0 ] 1;
+    nuMax           [0 2 -1 0 0 0 0] 1e-03;
+    nuMin           [0 2 -1 0 0 0 0] 1e-05;
+    k               [0 2 -1 0 0 0 0] 1e-05;
+    n               [0 0  0 0 0 0 0] 1;
 }
 
 HerschelBulkleyCoeffs
 {
-    nu0             nu0   [ 0 2 -1 0 0 0 0 ] 1e-03;
-    tau0            tau0  [ 0 2 -2 0 0 0 0 ] 1;
-    k               k     [ 0 2 -1 0 0 0 0 ] 1e-05;
-    n               n     [ 0 0  0 0 0 0 0 ] 1;
+    nu0             [0 2 -1 0 0 0 0] 1e-03;
+    tau0            [0 2 -2 0 0 0 0] 1;
+    k               [0 2 -1 0 0 0 0] 1e-05;
+    n               [0 0  0 0 0 0 0] 1;
 }
 
 // ************************************************************************* //
diff --git a/etc/templates/closedVolumeRotating/constant/transportProperties b/etc/templates/closedVolumeRotating/constant/transportProperties
index 9671f7a865f..455ea9b0bfb 100644
--- a/etc/templates/closedVolumeRotating/constant/transportProperties
+++ b/etc/templates/closedVolumeRotating/constant/transportProperties
@@ -16,38 +16,38 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1.5e-05;
+nu              [0 2 -1 0 0 0 0] 1.5e-05;
 
 BirdCarreauCoeffs
 {
-    nu0             nu0   [ 0 2 -1 0 0 0 0 ] 1e-03;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-05;
-    m               m     [ 0 0  1 0 0 0 0 ] 1;
-    n               n     [ 0 0  0 0 0 0 0 ] 0.5;
+    nu0             [0 2 -1 0 0 0 0] 1e-03;
+    nuInf           [0 2 -1 0 0 0 0] 1e-05;
+    m               [0 0  1 0 0 0 0] 1;
+    n               [0 0  0 0 0 0 0] 0.5;
 }
 
 CrossPowerLawCoeffs
 {
-    nu0             nu0   [ 0 2 -1 0 0 0 0 ] 1e-03;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-05;
-    m               m     [ 0 0  1 0 0 0 0 ] 1;
-    n               n     [ 0 0  0 0 0 0 0 ] 0.5;
+    nu0             [0 2 -1 0 0 0 0] 1e-03;
+    nuInf           [0 2 -1 0 0 0 0] 1e-05;
+    m               [0 0  1 0 0 0 0] 1;
+    n               [0 0  0 0 0 0 0] 0.5;
 }
 
 powerLawCoeffs
 {
-    nuMax           nuMax [ 0 2 -1 0 0 0 0 ] 1e-03;
-    nuMin           nuMin [ 0 2 -1 0 0 0 0 ] 1e-05;
-    k               k     [ 0 2 -1 0 0 0 0 ] 1e-05;
-    n               n     [ 0 0  0 0 0 0 0 ] 1;
+    nuMax           [0 2 -1 0 0 0 0] 1e-03;
+    nuMin           [0 2 -1 0 0 0 0] 1e-05;
+    k               [0 2 -1 0 0 0 0] 1e-05;
+    n               [0 0  0 0 0 0 0] 1;
 }
 
 HerschelBulkleyCoeffs
 {
-    nu0             nu0   [ 0 2 -1 0 0 0 0 ] 1e-03;
-    tau0            tau0  [ 0 2 -2 0 0 0 0 ] 1;
-    k               k     [ 0 2 -1 0 0 0 0 ] 1e-05;
-    n               n     [ 0 0  0 0 0 0 0 ] 1;
+    nu0             [0 2 -1 0 0 0 0] 1e-03;
+    tau0            [0 2 -2 0 0 0 0] 1;
+    k               [0 2 -1 0 0 0 0] 1e-05;
+    n               [0 0  0 0 0 0 0] 1;
 }
 
 // ************************************************************************* //
diff --git a/etc/templates/inflowOutflow/constant/transportProperties b/etc/templates/inflowOutflow/constant/transportProperties
index 9671f7a865f..455ea9b0bfb 100644
--- a/etc/templates/inflowOutflow/constant/transportProperties
+++ b/etc/templates/inflowOutflow/constant/transportProperties
@@ -16,38 +16,38 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1.5e-05;
+nu              [0 2 -1 0 0 0 0] 1.5e-05;
 
 BirdCarreauCoeffs
 {
-    nu0             nu0   [ 0 2 -1 0 0 0 0 ] 1e-03;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-05;
-    m               m     [ 0 0  1 0 0 0 0 ] 1;
-    n               n     [ 0 0  0 0 0 0 0 ] 0.5;
+    nu0             [0 2 -1 0 0 0 0] 1e-03;
+    nuInf           [0 2 -1 0 0 0 0] 1e-05;
+    m               [0 0  1 0 0 0 0] 1;
+    n               [0 0  0 0 0 0 0] 0.5;
 }
 
 CrossPowerLawCoeffs
 {
-    nu0             nu0   [ 0 2 -1 0 0 0 0 ] 1e-03;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-05;
-    m               m     [ 0 0  1 0 0 0 0 ] 1;
-    n               n     [ 0 0  0 0 0 0 0 ] 0.5;
+    nu0             [0 2 -1 0 0 0 0] 1e-03;
+    nuInf           [0 2 -1 0 0 0 0] 1e-05;
+    m               [0 0  1 0 0 0 0] 1;
+    n               [0 0  0 0 0 0 0] 0.5;
 }
 
 powerLawCoeffs
 {
-    nuMax           nuMax [ 0 2 -1 0 0 0 0 ] 1e-03;
-    nuMin           nuMin [ 0 2 -1 0 0 0 0 ] 1e-05;
-    k               k     [ 0 2 -1 0 0 0 0 ] 1e-05;
-    n               n     [ 0 0  0 0 0 0 0 ] 1;
+    nuMax           [0 2 -1 0 0 0 0] 1e-03;
+    nuMin           [0 2 -1 0 0 0 0] 1e-05;
+    k               [0 2 -1 0 0 0 0] 1e-05;
+    n               [0 0  0 0 0 0 0] 1;
 }
 
 HerschelBulkleyCoeffs
 {
-    nu0             nu0   [ 0 2 -1 0 0 0 0 ] 1e-03;
-    tau0            tau0  [ 0 2 -2 0 0 0 0 ] 1;
-    k               k     [ 0 2 -1 0 0 0 0 ] 1e-05;
-    n               n     [ 0 0  0 0 0 0 0 ] 1;
+    nu0             [0 2 -1 0 0 0 0] 1e-03;
+    tau0            [0 2 -2 0 0 0 0] 1;
+    k               [0 2 -1 0 0 0 0] 1e-05;
+    n               [0 0  0 0 0 0 0] 1;
 }
 
 // ************************************************************************* //
diff --git a/etc/templates/inflowOutflowRotating/constant/transportProperties b/etc/templates/inflowOutflowRotating/constant/transportProperties
index 9671f7a865f..455ea9b0bfb 100644
--- a/etc/templates/inflowOutflowRotating/constant/transportProperties
+++ b/etc/templates/inflowOutflowRotating/constant/transportProperties
@@ -16,38 +16,38 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1.5e-05;
+nu              [0 2 -1 0 0 0 0] 1.5e-05;
 
 BirdCarreauCoeffs
 {
-    nu0             nu0   [ 0 2 -1 0 0 0 0 ] 1e-03;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-05;
-    m               m     [ 0 0  1 0 0 0 0 ] 1;
-    n               n     [ 0 0  0 0 0 0 0 ] 0.5;
+    nu0             [0 2 -1 0 0 0 0] 1e-03;
+    nuInf           [0 2 -1 0 0 0 0] 1e-05;
+    m               [0 0  1 0 0 0 0] 1;
+    n               [0 0  0 0 0 0 0] 0.5;
 }
 
 CrossPowerLawCoeffs
 {
-    nu0             nu0   [ 0 2 -1 0 0 0 0 ] 1e-03;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-05;
-    m               m     [ 0 0  1 0 0 0 0 ] 1;
-    n               n     [ 0 0  0 0 0 0 0 ] 0.5;
+    nu0             [0 2 -1 0 0 0 0] 1e-03;
+    nuInf           [0 2 -1 0 0 0 0] 1e-05;
+    m               [0 0  1 0 0 0 0] 1;
+    n               [0 0  0 0 0 0 0] 0.5;
 }
 
 powerLawCoeffs
 {
-    nuMax           nuMax [ 0 2 -1 0 0 0 0 ] 1e-03;
-    nuMin           nuMin [ 0 2 -1 0 0 0 0 ] 1e-05;
-    k               k     [ 0 2 -1 0 0 0 0 ] 1e-05;
-    n               n     [ 0 0  0 0 0 0 0 ] 1;
+    nuMax           [0 2 -1 0 0 0 0] 1e-03;
+    nuMin           [0 2 -1 0 0 0 0] 1e-05;
+    k               [0 2 -1 0 0 0 0] 1e-05;
+    n               [0 0  0 0 0 0 0] 1;
 }
 
 HerschelBulkleyCoeffs
 {
-    nu0             nu0   [ 0 2 -1 0 0 0 0 ] 1e-03;
-    tau0            tau0  [ 0 2 -2 0 0 0 0 ] 1;
-    k               k     [ 0 2 -1 0 0 0 0 ] 1e-05;
-    n               n     [ 0 0  0 0 0 0 0 ] 1;
+    nu0             [0 2 -1 0 0 0 0] 1e-03;
+    tau0            [0 2 -2 0 0 0 0] 1;
+    k               [0 2 -1 0 0 0 0] 1e-05;
+    n               [0 0  0 0 0 0 0] 1;
 }
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/dimensionSet/dimensionSets.C b/src/OpenFOAM/dimensionSet/dimensionSets.C
index a858f4cb291..dde9d170827 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSets.C
+++ b/src/OpenFOAM/dimensionSet/dimensionSets.C
@@ -193,6 +193,7 @@ const dimensionSet dimEnergy(dimForce*dimLength);
 const dimensionSet dimPower(dimEnergy/dimTime);
 
 const dimensionSet dimPressure(dimForce/dimArea);
+const dimensionSet dimCompressibility(dimDensity/dimPressure);
 const dimensionSet dimGasConstant(dimEnergy/dimMass/dimTemperature);
 const dimensionSet dimSpecificHeatCapacity(dimGasConstant);
 const dimensionSet dimViscosity(dimArea/dimTime);
diff --git a/src/OpenFOAM/dimensionSet/dimensionSets.H b/src/OpenFOAM/dimensionSet/dimensionSets.H
index a2273176ae2..cf74ae85b40 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSets.H
+++ b/src/OpenFOAM/dimensionSet/dimensionSets.H
@@ -69,6 +69,7 @@ extern const dimensionSet dimPower;
 extern const dimensionSet dimVelocity;
 extern const dimensionSet dimAcceleration;
 extern const dimensionSet dimPressure;
+extern const dimensionSet dimCompressibility;
 extern const dimensionSet dimGasConstant;
 extern const dimensionSet dimSpecificHeatCapacity;
 extern const dimensionSet dimViscosity;
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
index 3e5e056ecba..46a3eb55a7b 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
@@ -226,7 +226,12 @@ void alphatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs()
     // Molecular Prandtl number
     const scalar Pr
     (
-        dimensionedScalar(transportProperties.lookup("Pr")).value()
+        dimensionedScalar
+        (
+            "Pr",
+            dimless,
+            transportProperties.lookup("Pr")
+        ).value()
     );
 
     // Populate boundary values
diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.C b/src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.C
index 586070a2fb2..3c626b94ec4 100644
--- a/src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.C
+++ b/src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,10 +52,30 @@ Foam::compressibilityModels::Chung::Chung
 )
 :
     barotropicCompressibilityModel(compressibilityProperties, gamma, psiName),
-    psiv_(compressibilityProperties_.lookup("psiv")),
-    psil_(compressibilityProperties_.lookup("psil")),
-    rhovSat_(compressibilityProperties_.lookup("rhovSat")),
-    rholSat_(compressibilityProperties_.lookup("rholSat"))
+    psiv_
+    (
+        "psiv",
+        dimCompressibility,
+        compressibilityProperties_.lookup("psiv")
+    ),
+    psil_
+    (
+        "psil",
+        dimCompressibility,
+        compressibilityProperties_.lookup("psil")
+    ),
+    rhovSat_
+    (
+        "rhovSat",
+        dimDensity,
+        compressibilityProperties_.lookup("rhovSat")
+    ),
+    rholSat_
+    (
+        "rholSat",
+        dimDensity,
+        compressibilityProperties_.lookup("rholSat")
+    )
 {
     correct();
 }
diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.C b/src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.C
index 3aa468840cf..4717c5b0a7d 100644
--- a/src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.C
+++ b/src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,10 +52,30 @@ Foam::compressibilityModels::Wallis::Wallis
 )
 :
     barotropicCompressibilityModel(compressibilityProperties, gamma, psiName),
-    psiv_(compressibilityProperties_.lookup("psiv")),
-    psil_(compressibilityProperties_.lookup("psil")),
-    rhovSat_(compressibilityProperties_.lookup("rhovSat")),
-    rholSat_(compressibilityProperties_.lookup("rholSat"))
+    psiv_
+    (
+        "psiv",
+        dimCompressibility,
+        compressibilityProperties_.lookup("psiv")
+    ),
+    psil_
+    (
+        "psil",
+        dimCompressibility,
+        compressibilityProperties_.lookup("psil")
+    ),
+    rhovSat_
+    (
+        "rhovSat",
+        dimDensity,
+        compressibilityProperties_.lookup("rhovSat")
+    ),
+    rholSat_
+    (
+        "rholSat",
+        dimDensity,
+        compressibilityProperties_.lookup("rholSat")
+    )
 {
     correct();
 }
diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/linear/linear.C b/src/thermophysicalModels/barotropicCompressibilityModel/linear/linear.C
index ad7dccef0aa..6edaad6ebdc 100644
--- a/src/thermophysicalModels/barotropicCompressibilityModel/linear/linear.C
+++ b/src/thermophysicalModels/barotropicCompressibilityModel/linear/linear.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,8 +52,18 @@ Foam::compressibilityModels::linear::linear
 )
 :
     barotropicCompressibilityModel(compressibilityProperties, gamma, psiName),
-    psiv_(compressibilityProperties_.lookup("psiv")),
-    psil_(compressibilityProperties_.lookup("psil"))
+    psiv_
+    (
+        "psiv",
+        dimCompressibility,
+        compressibilityProperties_.lookup("psiv")
+    ),
+    psil_
+    (
+        "psil",
+        dimCompressibility,
+        compressibilityProperties_.lookup("psil")
+    )
 {
     correct();
     psi_.oldTime();
diff --git a/src/transportModels/incompressible/viscosityModels/BirdCarreau/BirdCarreau.C b/src/transportModels/incompressible/viscosityModels/BirdCarreau/BirdCarreau.C
index 0f2213b686b..3deb2a66c99 100644
--- a/src/transportModels/incompressible/viscosityModels/BirdCarreau/BirdCarreau.C
+++ b/src/transportModels/incompressible/viscosityModels/BirdCarreau/BirdCarreau.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,10 +68,10 @@ Foam::viscosityModels::BirdCarreau::BirdCarreau
 :
     viscosityModel(name, viscosityProperties, U, phi),
     BirdCarreauCoeffs_(viscosityProperties.subDict(typeName + "Coeffs")),
-    nu0_(BirdCarreauCoeffs_.lookup("nu0")),
-    nuInf_(BirdCarreauCoeffs_.lookup("nuInf")),
-    k_(BirdCarreauCoeffs_.lookup("k")),
-    n_(BirdCarreauCoeffs_.lookup("n")),
+    nu0_("nu0", dimViscosity, BirdCarreauCoeffs_.lookup("nu0")),
+    nuInf_("nuInf", dimViscosity, BirdCarreauCoeffs_.lookup("nuInf")),
+    k_("k", dimTime, BirdCarreauCoeffs_.lookup("k")),
+    n_("n", dimless, BirdCarreauCoeffs_.lookup("n")),
     a_
     (
         BirdCarreauCoeffs_.lookupOrDefault
diff --git a/src/transportModels/incompressible/viscosityModels/CrossPowerLaw/CrossPowerLaw.C b/src/transportModels/incompressible/viscosityModels/CrossPowerLaw/CrossPowerLaw.C
index 3e87a3b8f6b..1201dbb4aaa 100644
--- a/src/transportModels/incompressible/viscosityModels/CrossPowerLaw/CrossPowerLaw.C
+++ b/src/transportModels/incompressible/viscosityModels/CrossPowerLaw/CrossPowerLaw.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,10 +66,10 @@ Foam::viscosityModels::CrossPowerLaw::CrossPowerLaw
 :
     viscosityModel(name, viscosityProperties, U, phi),
     CrossPowerLawCoeffs_(viscosityProperties.subDict(typeName + "Coeffs")),
-    nu0_(CrossPowerLawCoeffs_.lookup("nu0")),
-    nuInf_(CrossPowerLawCoeffs_.lookup("nuInf")),
-    m_(CrossPowerLawCoeffs_.lookup("m")),
-    n_(CrossPowerLawCoeffs_.lookup("n")),
+    nu0_("nu0", dimViscosity, CrossPowerLawCoeffs_.lookup("nu0")),
+    nuInf_("nuInf", dimViscosity, CrossPowerLawCoeffs_.lookup("nuInf")),
+    m_("m", dimTime, CrossPowerLawCoeffs_.lookup("m")),
+    n_("n", dimless, CrossPowerLawCoeffs_.lookup("n")),
     nu_
     (
         IOobject
diff --git a/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.C b/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.C
index 019b549e6b2..eb41da76fdd 100644
--- a/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.C
+++ b/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,16 +55,6 @@ Foam::viscosityModels::HerschelBulkley::calcNu() const
 
     tmp<volScalarField> sr(strainRate());
 
- // return
- // (
- //     min
- //     (
- //         nu0_,
- //         (tau0_ + k_*rtone*(pow(tone*sr(), n_) - pow(tone*tau0_/nu0_, n_)))
- //        /max(sr(), dimensionedScalar("VSMALL", dimless/dimTime, VSMALL))
- //     )
- // );
-
     return
     (
         min
@@ -89,10 +79,10 @@ Foam::viscosityModels::HerschelBulkley::HerschelBulkley
 :
     viscosityModel(name, viscosityProperties, U, phi),
     HerschelBulkleyCoeffs_(viscosityProperties.subDict(typeName + "Coeffs")),
-    k_(HerschelBulkleyCoeffs_.lookup("k")),
-    n_(HerschelBulkleyCoeffs_.lookup("n")),
-    tau0_(HerschelBulkleyCoeffs_.lookup("tau0")),
-    nu0_(HerschelBulkleyCoeffs_.lookup("nu0")),
+    k_("k", dimViscosity, HerschelBulkleyCoeffs_.lookup("k")),
+    n_("n", dimless, HerschelBulkleyCoeffs_.lookup("n")),
+    tau0_("tau0", dimViscosity/dimTime, HerschelBulkleyCoeffs_.lookup("tau0")),
+    nu0_("nu0", dimViscosity, HerschelBulkleyCoeffs_.lookup("nu0")),
     nu_
     (
         IOobject
diff --git a/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.C b/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.C
index 071ac622310..afd5b000a9c 100644
--- a/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.C
+++ b/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,10 +82,10 @@ Foam::viscosityModels::powerLaw::powerLaw
 :
     viscosityModel(name, viscosityProperties, U, phi),
     powerLawCoeffs_(viscosityProperties.subDict(typeName + "Coeffs")),
-    k_(powerLawCoeffs_.lookup("k")),
-    n_(powerLawCoeffs_.lookup("n")),
-    nuMin_(powerLawCoeffs_.lookup("nuMin")),
-    nuMax_(powerLawCoeffs_.lookup("nuMax")),
+    k_("k", dimViscosity, powerLawCoeffs_.lookup("k")),
+    n_("n", dimless, powerLawCoeffs_.lookup("n")),
+    nuMin_("nuMin", dimViscosity, powerLawCoeffs_.lookup("nuMin")),
+    nuMax_("nuMax", dimViscosity, powerLawCoeffs_.lookup("nuMax")),
     nu_
     (
         IOobject
diff --git a/src/transportModels/interfaceProperties/interfaceProperties.C b/src/transportModels/interfaceProperties/interfaceProperties.C
index 0091aeee8f1..81718a32d7a 100644
--- a/src/transportModels/interfaceProperties/interfaceProperties.C
+++ b/src/transportModels/interfaceProperties/interfaceProperties.C
@@ -167,7 +167,7 @@ Foam::interfaceProperties::interfaceProperties
             alpha1.mesh().solverDict(alpha1.name()).lookup("cAlpha")
         )
     ),
-    sigma_(dict.lookup("sigma")),
+    sigma_("sigma", dimensionSet(1, 0, -2, 0, 0), dict.lookup("sigma")),
 
     deltaN_
     (
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/0/p b/tutorials/DNS/dnsFoam/boxTurb16/0/p
index c794185b349..9d7f24f8de6 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/0/p
+++ b/tutorials/DNS/dnsFoam/boxTurb16/0/p
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/constant/transportProperties b/tutorials/DNS/dnsFoam/boxTurb16/constant/transportProperties
index 504a5e1e473..1a7e14495a3 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/constant/transportProperties
+++ b/tutorials/DNS/dnsFoam/boxTurb16/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 0.025;
+nu              [0 2 -1 0 0 0 0] 0.025;
 
 
 // ************************************************************************* //
diff --git a/tutorials/basic/laplacianFoam/flange/constant/transportProperties b/tutorials/basic/laplacianFoam/flange/constant/transportProperties
index c0acc95e58f..2a2806fb243 100644
--- a/tutorials/basic/laplacianFoam/flange/constant/transportProperties
+++ b/tutorials/basic/laplacianFoam/flange/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-DT              DT [ 0 2 -1 0 0 0 0 ] 4e-05;
+DT              DT [0 2 -1 0 0 0 0] 4e-05;
 
 
 // ************************************************************************* //
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/constant/transportProperties b/tutorials/basic/scalarTransportFoam/pitzDaily/constant/transportProperties
index 62bcc46028f..ee7c5e45e70 100644
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/constant/transportProperties
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-DT              DT [ 0 2 -1 0 0 0 0 ] 0.01;
+DT              DT [0 2 -1 0 0 0 0] 0.01;
 
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Aw b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Aw
index ebfddffa10c..9e587306db3 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Aw
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Aw
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 -1 0 0 0 0 0 ];
+dimensions      [0 -1 0 0 0 0 0];
 
 internalField   nonuniform List<scalar>
 8025
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/B b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/B
index 035bd2bac10..8a430bb0565 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/B
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/B
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 0 0 0 0 0 0 ];
+dimensions      [0 0 0 0 0 0 0];
 
 internalField   nonuniform List<symmTensor>
 8025
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/CR b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/CR
index 61ebec7a6ea..9076af2173d 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/CR
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/CR
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 -1 0 0 0 0 0 ];
+dimensions      [0 -1 0 0 0 0 0];
 
 internalField   nonuniform List<symmTensor>
 8025
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/CT b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/CT
index 51505ae127b..fcb9f43e114 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/CT
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/CT
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 -1 0 0 0 0 0 ];
+dimensions      [0 -1 0 0 0 0 0];
 
 internalField   nonuniform List<symmTensor>
 8025
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Lobs b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Lobs
index b33c7bd7ec0..82ef44f36b2 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Lobs
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Lobs
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 1 0 0 0 0 0 ];
+dimensions      [0 1 0 0 0 0 0];
 
 internalField   nonuniform List<scalar>
 8025
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Nv b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Nv
index d7a0451e7e9..d1b228459a1 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Nv
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Nv
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 0 0 0 0 0 0 ];
+dimensions      [0 0 0 0 0 0 0];
 
 internalField   nonuniform List<scalar>
 8025
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Su b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Su
index 2776c4cd1fd..e7ac33c7fe9 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Su
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Su
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 1 -1 0 0 0 0 ];
+dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform 0.5;
 
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/T b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/T
index 9280aeafb23..a508662b3fe 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/T
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/T
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 0 0 1 0 0 0 ];
+dimensions      [0 0 0 1 0 0 0];
 
 internalField   uniform 300;
 
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Tu b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Tu
index 802612268cd..c72df6e214d 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Tu
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Tu
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 0 0 1 0 0 0 ];
+dimensions      [0 0 0 1 0 0 0];
 
 internalField   uniform 300;
 
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/U b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/U
index c13c56c121b..d80165816ac 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/U
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/U
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 1 -1 0 0 0 0 ];
+dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform ( 0 0 0 );
 
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Xi b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Xi
index 0ba04cf8fae..53d36f4c5b6 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Xi
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Xi
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 0 0 0 0 0 0 ];
+dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 1;
 
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/b b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/b
index 9a4f7880ffd..43ad33228e6 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/b
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/b
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 0 0 0 0 0 0 ];
+dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 1;
 
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/betav b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/betav
index 8c1e73d089c..4a719759e63 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/betav
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/betav
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 0 0 0 0 0 0 ];
+dimensions      [0 0 0 0 0 0 0];
 
 internalField   nonuniform List<scalar>
 8025
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/epsilon b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/epsilon
index 26ca09c49a4..b5c06f18c3d 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/epsilon
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/epsilon
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -3 0 0 0 0 ];
+dimensions      [0 2 -3 0 0 0 0];
 
 internalField   uniform 0.1;
 
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/ft b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/ft
index 634eeeb1e1d..af3c6a8bb59 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/ft
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/ft
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 0 0 0 0 0 0 ];
+dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0.0623;
 
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k
index a9ff01787fb..e6c8fe0ee9f 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 1.5;
 
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k.old b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k.old
index a9ff01787fb..e6c8fe0ee9f 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k.old
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k.old
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 1.5;
 
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/nsv b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/nsv
index 9bd26827fee..f46f287c673 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/nsv
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/nsv
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 0 0 0 0 0 0 ];
+dimensions      [0 0 0 0 0 0 0];
 
 internalField   nonuniform List<symmTensor>
 8025
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/p b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/p
index 39eec312887..5d0efb0b2c4 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/p
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/p
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 1 -1 -2 0 0 0 0 ];
+dimensions      [1 -1 -2 0 0 0 0];
 
 internalField   uniform 100000;
 
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/epsilon b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/epsilon
index 57a9ae53721..18300060a6e 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/epsilon
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/epsilon
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -3 0 0 0 0 ];
+dimensions      [0 2 -3 0 0 0 0];
 
 internalField   uniform 375;
 
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/k b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/k
index 603093e6e38..f5f843e5973 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/k
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/k
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 1.5;
 
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/nut b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/nut
index 113acd86c3e..e39fcccf879 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/nut
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/0/nut
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -1 0 0 0 0 ];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/combustionProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/combustionProperties
index ca17b8af4e6..b1a20cd21f4 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/combustionProperties
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/combustionProperties
@@ -19,21 +19,21 @@ laminarFlameSpeedCorrelation Gulders;
 
 fuel            Propane;
 
-Su              Su [ 0 1 -1 0 0 0 0 ] 0.434;
+Su              Su [0 1 -1 0 0 0 0] 0.434;
 
 SuModel         unstrained;
 
-equivalenceRatio equivalenceRatio [ 0 0 0 0 0 0 0 ] 1;
+equivalenceRatio equivalenceRatio [0 0 0 0 0 0 0] 1;
 
-sigmaExt        sigmaExt [ 0 0 -1 0 0 0 0 ] 100000;
+sigmaExt        sigmaExt [0 0 -1 0 0 0 0] 100000;
 
 XiModel         transport;
 
-XiCoef          XiCoef [ 0 0 0 0 0 0 0 ] 0.62;
+XiCoef          XiCoef [0 0 0 0 0 0 0] 0.62;
 
-XiShapeCoef     XiShapeCoef [ 0 0 0 0 0 0 0 ] 1;
+XiShapeCoef     XiShapeCoef [0 0 0 0 0 0 0] 1;
 
-uPrimeCoef      uPrimeCoef [ 0 0 0 0 0 0 0 ] 1;
+uPrimeCoef      uPrimeCoef [0 0 0 0 0 0 0] 1;
 
 GuldersCoeffs
 {
@@ -113,11 +113,11 @@ ignitionSites
 
 ignitionSphereFraction 1;
 
-ignitionThickness ignitionThickness [ 0 1 0 0 0 0 0 ] 0.001;
+ignitionThickness ignitionThickness [0 1 0 0 0 0 0] 0.001;
 
 ignitionCircleFraction 0.5;
 
-ignitionKernelArea ignitionKernelArea [ 0 2 0 0 0 0 0 ] 0.001;
+ignitionKernelArea ignitionKernelArea [0 2 0 0 0 0 0] 0.001;
 
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties
index 83a58901207..e6e3ab3a222 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties
@@ -26,7 +26,7 @@ thermoType
     energy          absoluteEnthalpy;
 }
 
-stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.675;
+stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.675;
 
 reactants
 {
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties.hydrogen b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties.hydrogen
index 8d4aff1e160..397d6345d01 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties.hydrogen
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties.hydrogen
@@ -26,7 +26,7 @@ thermoType
     energy          absoluteEnthalpy;
 }
 
-stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 34.074;
+stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 34.074;
 
 reactants
 {
diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/combustionProperties b/tutorials/combustion/engineFoam/kivaTest/constant/combustionProperties
index 27f323c02e5..c0de6fda5d3 100644
--- a/tutorials/combustion/engineFoam/kivaTest/constant/combustionProperties
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/combustionProperties
@@ -19,21 +19,21 @@ laminarFlameSpeedCorrelation Gulders;
 
 fuel            IsoOctane;
 
-Su              Su [ 0 1 -1 0 0 0 0 ] 0;
+Su              Su [0 1 -1 0 0 0 0] 0;
 
 SuModel         unstrained;
 
-equivalenceRatio equivalenceRatio [ 0 0 0 0 0 0 0 ] 1;
+equivalenceRatio equivalenceRatio [0 0 0 0 0 0 0] 1;
 
-sigmaExt        sigmaExt [ 0 0 -1 0 0 0 0 ] 100000;
+sigmaExt        sigmaExt [0 0 -1 0 0 0 0] 100000;
 
 XiModel         transport;
 
-XiCoef          XiCoef [ 0 0 0 0 0 0 0 ] 0.62;
+XiCoef          XiCoef [0 0 0 0 0 0 0] 0.62;
 
-XiShapeCoef     XiShapeCoef [ 0 0 0 0 0 0 0 ] 1;
+XiShapeCoef     XiShapeCoef [0 0 0 0 0 0 0] 1;
 
-uPrimeCoef      uPrimeCoef [ 0 0 0 0 0 0 0 ] 1;
+uPrimeCoef      uPrimeCoef [0 0 0 0 0 0 0] 1;
 
 GuldersCoeffs
 {
@@ -83,11 +83,11 @@ ignitionSites
 
 ignitionSphereFraction 1;
 
-ignitionThickness ignitionThickness [ 0 1 0 0 0 0 0 ] 0;
+ignitionThickness ignitionThickness [0 1 0 0 0 0 0] 0;
 
 ignitionCircleFraction 1;
 
-ignitionKernelArea ignitionKernelArea [ 0 2 0 0 0 0 0 ] 0;
+ignitionKernelArea ignitionKernelArea [0 2 0 0 0 0 0] 0;
 
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/engineGeometry b/tutorials/combustion/engineFoam/kivaTest/constant/engineGeometry
index 246934deb59..1c21d87a307 100644
--- a/tutorials/combustion/engineFoam/kivaTest/constant/engineGeometry
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/engineGeometry
@@ -17,15 +17,15 @@ FoamFile
 
 engineMesh      layered;
 
-conRodLength    conRodLength [ 0 1 0 0 0 0 0 ] 0.147;
+conRodLength    conRodLength [0 1 0 0 0 0 0] 0.147;
 
-bore            bore [ 0 1 0 0 0 0 0 ] 0.092;
+bore            bore [0 1 0 0 0 0 0] 0.092;
 
-stroke          stroke [ 0 1 0 0 0 0 0 ] 0.08423;
+stroke          stroke [0 1 0 0 0 0 0] 0.08423;
 
-clearance       clearance [ 0 1 0 0 0 0 0 ] 0.00115;
+clearance       clearance [0 1 0 0 0 0 0] 0.00115;
 
-rpm             rpm [ 0 0 -1 0 0 0 0 ] 1500;
+rpm             rpm [0 0 -1 0 0 0 0] 1500;
 
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
index b7c4847d5b5..863152a970a 100644
--- a/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
@@ -27,7 +27,7 @@ thermoType
     //energy          absoluteInternalEnergy;
 }
 
-stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.0336;
+stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.0336;
 
 fuel
 {
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/radiationProperties b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/radiationProperties
index 6ce48dc3fe1..242c5aace45 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/radiationProperties
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/constant/radiationProperties
@@ -36,9 +36,9 @@ absorptionEmissionModel constantAbsorptionEmission;
 
 constantAbsorptionEmissionCoeffs
 {
-    absorptivity    absorptivity [ 0 -1 0 0 0 0 0 ] 0.1;
-    emissivity      emissivity [ 0 -1 0 0 0 0 0 ] 0.1;
-    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+    absorptivity    absorptivity [0 -1 0 0 0 0 0] 0.1;
+    emissivity      emissivity [0 -1 0 0 0 0 0] 0.1;
+    E               E [1 -1 -3 0 0 0 0] 0;
 }
 
 greyMeanAbsorptionEmissionSootCoeffs
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/sampleCone b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/sampleCone
index 8c37c147347..0c23675f65f 100755
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/sampleCone
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/sampleCone
@@ -25,7 +25,7 @@ USAGE
 unset timeOpt
 
 # parse options
-while [ "$#" -gt 0 ]
+while [ "$#" -gt 0]
 do
     case "$1" in
     -h | -help)
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/transportProperties b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/transportProperties
index 3558155d096..587f6acbd92 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/transportProperties
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/transportProperties
@@ -17,6 +17,6 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1.0e-6;
+nu              [0 2 -1 0 0 0 0] 1.0e-6;
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/epsilon b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/epsilon
index cfc9a229b56..fdcaf9c1370 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/epsilon
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/0/epsilon
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -3 0 0 0 0 ];
+dimensions      [0 2 -3 0 0 0 0];
 
 internalField   uniform 0.000765;
 
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/epsilon b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/epsilon
index 07e4effd344..3b5704561a0 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/epsilon
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/epsilon
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -3 0 0 0 0 ];
+dimensions      [0 2 -3 0 0 0 0];
 
 internalField   uniform 20;
 
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/k b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/k
index 60208ba1315..74be565a854 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/k
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/0/k
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 1;
 
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/transportProperties b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/transportProperties
index b40b7d66cd8..401efe90835 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/transportProperties
+++ b/tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/constant/transportProperties
@@ -17,23 +17,6 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1e-05;
-
-CrossPowerLawCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    m               m [ 0 0 1 0 0 0 0 ] 1;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
-BirdCarreauCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    k               k [ 0 0 1 0 0 0 0 ] 0;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
+nu              [0 2 -1 0 0 0 0] 1e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon
index 21b1e98ef91..dc27e2fcffb 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -3 0 0 0 0 ];
+dimensions      [0 2 -3 0 0 0 0];
 
 internalField   uniform 200;
 
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k
index cd7aa310966..2b39c9a2cd8 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 1;
 
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/nut b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/nut
index 4362a65a8dc..fcb2bc9b008 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/nut
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/nut
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -1 0 0 0 0 ];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/epsilon b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/epsilon
index 21b1e98ef91..dc27e2fcffb 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/epsilon
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/epsilon
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -3 0 0 0 0 ];
+dimensions      [0 2 -3 0 0 0 0];
 
 internalField   uniform 200;
 
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/k b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/k
index cd7aa310966..2b39c9a2cd8 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/k
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/0/k
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 1;
 
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/thermodynamicProperties b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/thermodynamicProperties
index bb5efe78970..93c3dbbd464 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/thermodynamicProperties
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/thermodynamicProperties
@@ -15,11 +15,11 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-rho0            rho0 [ 1 -3 0 0 0 0 0 ] 1000;
+rho0            rho0 [1 -3 0 0 0 0 0] 1000;
 
-p0              p0 [ 1 -1 -2 0 0 0 0 ] 100000;
+p0              p0 [1 -1 -2 0 0 0 0] 100000;
 
-psi             psi [ 0 -2 2 0 0 0 0 ] 4.54e-07;
+psi             psi [0 -2 2 0 0 0 0] 4.54e-07;
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/transportProperties b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/transportProperties
index 21ee6987d63..ae4876ed069 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/transportProperties
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-mu              mu [ 1 -1 -1 0 0 0 0 ] 0.001;
+mu              mu [1 -1 -1 0 0 0 0] 0.001;
 
 
 // ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryT b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryT
index ece1ab678bf..3a1827546e0 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryT
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryT
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 0 0 1 0 0 0 ];
+dimensions      [0 0 0 1 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryU b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryU
index c75e5506a6f..4fca314b249 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryU
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryU
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 1 -1 0 0 0 0 ];
+dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform ( 0 0 0 );
 
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/dsmcRhoN b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/dsmcRhoN
index 2494f1643f1..b3de99a728d 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/dsmcRhoN
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/dsmcRhoN
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 -3 0 0 0 0 0 ];
+dimensions      [0 -3 0 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/fD b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/fD
index bcc188d7b5a..fd5ad5452da 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/fD
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/fD
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 1 -1 -2 0 0 0 0 ];
+dimensions      [1 -1 -2 0 0 0 0];
 
 internalField   uniform ( 0 0 0 );
 
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/iDof b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/iDof
index 1dd93605f14..4c20820399c 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/iDof
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/iDof
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 -3 0 0 0 0 0 ];
+dimensions      [0 -3 0 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/internalE b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/internalE
index b5e11bb7385..c3647d56f6d 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/internalE
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/internalE
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 1 -1 -2 0 0 0 0 ];
+dimensions      [1 -1 -2 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/linearKE b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/linearKE
index 4edb0c49dcb..b7c7278bb3a 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/linearKE
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/linearKE
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 1 -1 -2 0 0 0 0 ];
+dimensions      [1 -1 -2 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/momentum b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/momentum
index 1b17cb300b1..72e71e8c2c4 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/momentum
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/momentum
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 1 -2 -1 0 0 0 0 ];
+dimensions      [1 -2 -1 0 0 0 0];
 
 internalField   uniform ( 0 0 0 );
 
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/q b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/q
index e4cb992d829..efc71c530a4 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/q
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/q
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 1 0 -3 0 0 0 0 ];
+dimensions      [1 0 -3 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoM b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoM
index 2eb277f9c6a..527596874ec 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoM
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoM
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 1 -3 0 0 0 0 0 ];
+dimensions      [1 -3 0 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoN b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoN
index 7d6a6991986..688e05647f9 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoN
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoN
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 -3 0 0 0 0 0 ];
+dimensions      [0 -3 0 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0/U b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0/U
index 59bf5a53e33..5a6fca1d9ff 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0/U
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0/U
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 1 -1 0 0 0 0 ];
+dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform ( 0 0 0 );
 
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0/U b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0/U
index 59bf5a53e33..5a6fca1d9ff 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0/U
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0/U
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 1 -1 0 0 0 0 ];
+dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform ( 0 0 0 );
 
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/physicalProperties b/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/physicalProperties
index 4f5f33d8dcb..db3d16a1048 100644
--- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/physicalProperties
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/physicalProperties
@@ -15,9 +15,8 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-epsilon0        epsilon0 [ -1 -3 4 0 0 2 0 ] 8.85419e-12;
-
-k               k [ -1 0 2 0 0 1 0 ] 0.00016;
+epsilon0        epsilon0 [-1 -3 4 0 0 2 0] 8.85419e-12;
 
+k               k [-1 0 2 0 0 1 0] 0.00016;
 
 // ************************************************************************* //
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/constant/transportProperties b/tutorials/electromagnetics/mhdFoam/hartmann/constant/transportProperties
index 94e7bd07947..703d83b4dce 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/constant/transportProperties
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/constant/transportProperties
@@ -15,13 +15,12 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-rho             rho [ 1 -3 0 0 0 0 0 ] 1;
+rho             [1 -3 0 0 0 0 0] 1;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1;
+nu              [0 2 -1 0 0 0 0] 1;
 
-mu              mu [ 1 1 -2 0 0 -2 0 ] 1;
-
-sigma           sigma [ -1 -3 3 0 0 2 0 ] 1;
+mu              [1 1 -2 0 0 -2 0] 1;
 
+sigma           [-1 -3 3 0 0 2 0] 1;
 
 // ************************************************************************* //
diff --git a/tutorials/financial/financialFoam/europeanCall/constant/financialProperties b/tutorials/financial/financialFoam/europeanCall/constant/financialProperties
index 5d7b3ac78fa..98fdad00a98 100644
--- a/tutorials/financial/financialFoam/europeanCall/constant/financialProperties
+++ b/tutorials/financial/financialFoam/europeanCall/constant/financialProperties
@@ -15,17 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-strike          strike [ 0 1 0 0 0 0 0 ] 40;
+strike          [0 1 0 0 0 0 0] 40;
 
-r               r [ 0 0 -1 0 0 0 0 ] 0.1;
+r               [0 0 -1 0 0 0 0] 0.1;
 
-sigma           sigma [ 0 0 -0.5 0 0 0 0 ] 0.2;
+sigma           [0 0 -0.5 0 0 0 0] 0.2;
 
-s               s [ 0 0 -1 0 0 0 0 ] 0;
+s               [0 0 -1 0 0 0 0] 0;
 
-xi              xi [ 0 0 -0.5 0 0 0 0 ] 0.1;
-
-eta             eta [ 0 0 0 0 0 0 0 ] 0;
+xi              [0 0 -0.5 0 0 0 0] 0.1;
 
+eta             [0 0 0 0 0 0 0] 0;
 
 // ************************************************************************* //
diff --git a/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/boundary b/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/boundary
index b2d00fdb820..a4b4e113721 100644
--- a/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/boundary
+++ b/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/boundary
@@ -32,6 +32,7 @@ FoamFile
     defaultFaces
     {
         type            empty;
+        inGroups        1(empty);
         nFaces          2000;
         startFace       501;
     }
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/transportProperties b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/transportProperties
index 674b7e0d4e4..ce09e521083 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/transportProperties
+++ b/tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/transportProperties
@@ -18,18 +18,18 @@ FoamFile
 transportModel Newtonian;
 
 // Laminar viscosity
-nu              nu [0 2 -1 0 0 0 0] 1e-05;
+nu              [0 2 -1 0 0 0 0] 1e-05;
 
 // Thermal expansion coefficient
-beta            beta [0 0 0 -1 0 0 0] 3e-03;
+beta            [0 0 0 -1 0 0 0] 3e-03;
 
 // Reference temperature
-TRef            TRef [0 0 0 1 0 0 0] 300;
+TRef            [0 0 0 1 0 0 0] 300;
 
 // Laminar Prandtl number
-Pr              Pr [0 0 0 0 0 0 0] 0.9;
+Pr              [0 0 0 0 0 0 0] 0.9;
 
 // Turbulent Prandtl number
-Prt             Prt [0 0 0 0 0 0 0] 0.7;
+Prt             [0 0 0 0 0 0 0] 0.7;
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/transportProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/transportProperties
index 674b7e0d4e4..ce09e521083 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/transportProperties
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/transportProperties
@@ -18,18 +18,18 @@ FoamFile
 transportModel Newtonian;
 
 // Laminar viscosity
-nu              nu [0 2 -1 0 0 0 0] 1e-05;
+nu              [0 2 -1 0 0 0 0] 1e-05;
 
 // Thermal expansion coefficient
-beta            beta [0 0 0 -1 0 0 0] 3e-03;
+beta            [0 0 0 -1 0 0 0] 3e-03;
 
 // Reference temperature
-TRef            TRef [0 0 0 1 0 0 0] 300;
+TRef            [0 0 0 1 0 0 0] 300;
 
 // Laminar Prandtl number
-Pr              Pr [0 0 0 0 0 0 0] 0.9;
+Pr              [0 0 0 0 0 0 0] 0.9;
 
 // Turbulent Prandtl number
-Prt             Prt [0 0 0 0 0 0 0] 0.7;
+Prt             [0 0 0 0 0 0 0] 0.7;
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/transportProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/transportProperties
index 674b7e0d4e4..ce09e521083 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/transportProperties
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/transportProperties
@@ -18,18 +18,18 @@ FoamFile
 transportModel Newtonian;
 
 // Laminar viscosity
-nu              nu [0 2 -1 0 0 0 0] 1e-05;
+nu              [0 2 -1 0 0 0 0] 1e-05;
 
 // Thermal expansion coefficient
-beta            beta [0 0 0 -1 0 0 0] 3e-03;
+beta            [0 0 0 -1 0 0 0] 3e-03;
 
 // Reference temperature
-TRef            TRef [0 0 0 1 0 0 0] 300;
+TRef            [0 0 0 1 0 0 0] 300;
 
 // Laminar Prandtl number
-Pr              Pr [0 0 0 0 0 0 0] 0.9;
+Pr              [0 0 0 0 0 0 0] 0.9;
 
 // Turbulent Prandtl number
-Prt             Prt [0 0 0 0 0 0 0] 0.7;
+Prt             [0 0 0 0 0 0 0] 0.7;
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/baffle3DRegion/T b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/baffle3DRegion/T
index 656062e8a95..ea17f0ac0be 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/baffle3DRegion/T
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/baffle3DRegion/T
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 0 0 1 0 0 0 ];
+dimensions      [0 0 0 1 0 0 0];
 
 internalField   uniform 300;
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/baffle3DRegion/p b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/baffle3DRegion/p
index 38b55712793..7db4668cb7b 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/baffle3DRegion/p
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/baffle3DRegion/p
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 1 -1 -2 0 0 0 0 ];
+dimensions      [1 -1 -2 0 0 0 0];
 
 internalField   uniform 1e6;
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/externalSolver b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/externalSolver
index 2ec1a436d0b..406d2199d55 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/externalSolver
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/externalSolver
@@ -51,7 +51,7 @@ init
 
 totalWait=0
 step=0
-while [ 1 ]; do
+while [1 ]; do
     if [ -f $lockFile ]; then
         log "found lock file ${lockFile} - waiting"
         totalWait=$(expr $totalWait + $waitSec)
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/radiationProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/radiationProperties
index 6f84aac5bcb..7ac310e5423 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/radiationProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/radiationProperties
@@ -26,9 +26,9 @@ absorptionEmissionModel constantAbsorptionEmission;
 
 constantAbsorptionEmissionCoeffs
 {
-    absorptivity    absorptivity    [ 0 -1 0 0 0 0 0 ] 0.5;
-    emissivity      emissivity      [ 0 -1 0 0 0 0 0 ] 0.5;
-    E               E               [ 1 -1 -3 0 0 0 0 ] 0;
+    absorptivity    absorptivity    [0 -1 0 0 0 0 0] 0.5;
+    emissivity      emissivity      [0 -1 0 0 0 0 0] 0.5;
+    E               E               [1 -1 -3 0 0 0 0] 0;
 }
 
 scatterModel    none;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/T b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/T
index 995ea65f2e0..95a8ab24193 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/T
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 0 0 1 0 0 0 ];
+dimensions      [0 0 0 1 0 0 0];
 
 internalField   uniform 300;
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/U b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/U
index 4fac3136550..a8271081ed4 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/U
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/U
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 1 -1 0 0 0 0 ];
+dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform ( 0.001 0 0 );
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/epsilon b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/epsilon
index f8b893353b7..d411f9233d1 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/epsilon
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/epsilon
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -3 0 0 0 0 ];
+dimensions      [0 2 -3 0 0 0 0];
 
 internalField   uniform 0.01;
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/k b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/k
index 2558d1e2e9d..c5017c9401d 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/k
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/k
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 0.1;
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/p b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/p
index 2f81b33af44..a3a5ab71428 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/p
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/p
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 1 -1 -2 0 0 0 0 ];
+dimensions      [1 -1 -2 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/p_rgh b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/p_rgh
index 9c703030390..104dee8a6ab 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/p_rgh
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/p_rgh
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 1 -1 -2 0 0 0 0 ];
+dimensions      [1 -1 -2 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/radiationProperties
index 67ab26120ba..09c45f4749d 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/radiationProperties
@@ -24,9 +24,9 @@ absorptionEmissionModel constantAbsorptionEmission;
 
 constantAbsorptionEmissionCoeffs
 {
-    absorptivity    absorptivity [ 0 -1 0 0 0 0 0 ] 0.0;  //opaque
-    emissivity      emissivity [ 0 -1 0 0 0 0 0 ] 0.1;
-    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+    absorptivity    absorptivity [0 -1 0 0 0 0 0] 0.0;  //opaque
+    emissivity      emissivity [0 -1 0 0 0 0 0] 0.1;
+    E               E [1 -1 -3 0 0 0 0] 0;
 }
 
 scatterModel    none;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/radiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/radiationProperties
index 504cce231e5..79034a694b6 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/radiationProperties
@@ -33,9 +33,9 @@ absorptionEmissionModel constantAbsorptionEmission;
 
 constantAbsorptionEmissionCoeffs
 {
-    absorptivity    absorptivity    [ 0 -1 0 0 0 0 0 ] 0.01;
-    emissivity      emissivity      [ 0 -1 0 0 0 0 0 ] 0.01;
-    E               E               [ 1 -1 -3 0 0 0 0 ] 0;
+    absorptivity    absorptivity    [0 -1 0 0 0 0 0] 0.01;
+    emissivity      emissivity      [0 -1 0 0 0 0 0] 0.01;
+    E               E               [1 -1 -3 0 0 0 0] 0;
 }
 
 scatterModel    none;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/radiationProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/radiationProperties
index 25123622269..90c8ed58286 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/radiationProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/radiationProperties
@@ -24,9 +24,9 @@ absorptionEmissionModel constantAbsorptionEmission;
 
 constantAbsorptionEmissionCoeffs
 {
-    absorptivity    absorptivity [ 0 -1 0 0 0 0 0 ] 0.0;  //opaque
-    emissivity      emissivity [ 0 -1 0 0 0 0 0 ] 0.1;
-    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+    absorptivity    absorptivity [0 -1 0 0 0 0 0] 0.0;  //opaque
+    emissivity      emissivity [0 -1 0 0 0 0 0] 0.1;
+    E               E [1 -1 -3 0 0 0 0] 0;
 }
 
 scatterModel    none;
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/epsilon b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/epsilon
index 3ce2f9e22e0..0c718a49740 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/epsilon
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/epsilon
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -3 0 0 0 0 ];
+dimensions      [0 2 -3 0 0 0 0];
 
 internalField   uniform 3.75e-4;
 
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/k b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/k
index 5269b3150e4..4136dc38072 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/k
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/k
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 3.75e-3;
 
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/nut b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/nut
index fa5d09d4f63..3db0d49a1ad 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/nut
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/0/nut
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -1 0 0 0 0 ];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/transportProperties b/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/transportProperties
index b40b7d66cd8..401efe90835 100644
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/transportProperties
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/transportProperties
@@ -17,23 +17,6 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1e-05;
-
-CrossPowerLawCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    m               m [ 0 0 1 0 0 0 0 ] 1;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
-BirdCarreauCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    k               k [ 0 0 1 0 0 0 0 ] 0;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
+nu              [0 2 -1 0 0 0 0] 1e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/0/Urel b/tutorials/incompressible/SRFSimpleFoam/mixer/0/Urel
index 0353535f09c..f2fe72f4ecb 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/0/Urel
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/0/Urel
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 1 -1 0 0 0 0 ];
+dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform ( 0 0 0 );
 
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/0/epsilon b/tutorials/incompressible/SRFSimpleFoam/mixer/0/epsilon
index 047ac1cbcd1..c86f27af06e 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/0/epsilon
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/0/epsilon
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -3 0 0 0 0 ];
+dimensions      [0 2 -3 0 0 0 0];
 
 internalField   uniform 14.855;
 
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/0/k b/tutorials/incompressible/SRFSimpleFoam/mixer/0/k
index 1055f405ba7..1abbc25b718 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/0/k
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/0/k
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 0.375;
 
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/0/nut b/tutorials/incompressible/SRFSimpleFoam/mixer/0/nut
index 7ed2af3079a..07b4439977d 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/0/nut
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/0/nut
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -1 0 0 0 0 ];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/0/omega b/tutorials/incompressible/SRFSimpleFoam/mixer/0/omega
index 0d3adc0859c..21dc2662dfd 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/0/omega
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/0/omega
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 0 -1 0 0 0 0 ];
+dimensions      [0 0 -1 0 0 0 0];
 
 internalField   uniform 3.5;
 
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/0/p b/tutorials/incompressible/SRFSimpleFoam/mixer/0/p
index 207b4528ee5..32fe7135fd3 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/0/p
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/0/p
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/constant/transportProperties b/tutorials/incompressible/SRFSimpleFoam/mixer/constant/transportProperties
index 489cefb1d1e..ee68cad641c 100644
--- a/tutorials/incompressible/SRFSimpleFoam/mixer/constant/transportProperties
+++ b/tutorials/incompressible/SRFSimpleFoam/mixer/constant/transportProperties
@@ -17,23 +17,6 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1.5e-05;
-
-CrossPowerLawCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    m               m [ 0 0 1 0 0 0 0 ] 1;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
-BirdCarreauCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    k               k [ 0 0 1 0 0 0 0 ] 0;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
+nu              [0 2 -1 0 0 0 0] 1.5e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/transportProperties b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/transportProperties
index 53fd54c2ff0..f2c42dfc29f 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/transportProperties
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/transportProperties
@@ -17,7 +17,7 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [0 2 -1 0 0 0 0] 1e-5;
+nu              [0 2 -1 0 0 0 0] 1e-5;
 
 lambda          lambda   [0 -2 1 0 0 0 0] 1e5;
 alphaMax        alphaMax [0 0 -1 0 0 0 0] 200.0;
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/U b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/U
index 0a2b3b58a7b..572ecdcc48d 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/U
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/U
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 1 -1 0 0 0 0 ];
+dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform ( 10 0 0 );
 
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/epsilon b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/epsilon
index 50a0eef121f..11e676bc081 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/epsilon
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/epsilon
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -3 0 0 0 0 ];
+dimensions      [0 2 -3 0 0 0 0];
 
 internalField   uniform 10;
 
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/k b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/k
index 751ffd13b84..4579dd76ff0 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/k
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/k
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 0.1;
 
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/nuTilda b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/nuTilda
index 34964aa0652..5048e273ad7 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/nuTilda
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/0/nuTilda
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -1 0 0 0 0 ];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/transportProperties b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/transportProperties
index 483ab330128..b5b39c12978 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/transportProperties
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/transportProperties
@@ -15,27 +15,11 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Ubar            Ubar [ 0 1 -1 0 0 0 0 ] ( 10 0 0 );
+Ubar            [0 1 -1 0 0 0 0] (10 0 0);
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1e-05;
-
-CrossPowerLawCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    m               m [ 0 0 1 0 0 0 0 ] 1;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
-BirdCarreauCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    k               k [ 0 0 1 0 0 0 0 ] 0;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
+nu              [0 2 -1 0 0 0 0] 1e-05;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/U b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/U
index 9bd552a68a7..e896e899920 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/U
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/U
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 1 -1 0 0 0 0 ];
+dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform ( 0 0 0 );
 
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/epsilon b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/epsilon
index d2d9900782a..e03063b0fec 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/epsilon
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/epsilon
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -3 0 0 0 0 ];
+dimensions      [0 2 -3 0 0 0 0];
 
 internalField   uniform 1e-08;
 
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/k b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/k
index 6c8f70a789d..5bac915cad4 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/k
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/k
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 1e-10;
 
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nuTilda b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nuTilda
index 3650a0ba269..7068537e931 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nuTilda
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nuTilda
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -1 0 0 0 0 ];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nut b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nut
index ecdb3d27330..357138e2849 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nut
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/0/nut
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -1 0 0 0 0 ];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/transportProperties b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/transportProperties
index 483ab330128..72455ddff40 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/transportProperties
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/transportProperties
@@ -15,27 +15,10 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Ubar            Ubar [ 0 1 -1 0 0 0 0 ] ( 10 0 0 );
+Ubar            [0 1 -1 0 0 0 0] (10 0 0);
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1e-05;
-
-CrossPowerLawCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    m               m [ 0 0 1 0 0 0 0 ] 1;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
-BirdCarreauCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    k               k [ 0 0 1 0 0 0 0 ] 0;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
+nu              [0 2 -1 0 0 0 0] 1e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/U b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/U
index 1607a6113fa..377a03ac510 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/U
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/U
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 1 -1 0 0 0 0 ];
+dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform ( 1 0 0 );
 
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/epsilon b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/epsilon
index ac692bb7f2b..316b143c199 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/epsilon
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/epsilon
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -3 0 0 0 0 ];
+dimensions      [0 2 -3 0 0 0 0];
 
 internalField   uniform 1e-08;
 
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/k b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/k
index 1c9826aebd4..55761ee96d6 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/k
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/k
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 1e-09;
 
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nuTilda b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nuTilda
index 3650a0ba269..7068537e931 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nuTilda
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nuTilda
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -1 0 0 0 0 ];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut
index c9cc1c5b79c..348b9ed37d7 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -1 0 0 0 0 ];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.k b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.k
index 7d7ba9f7201..21c2ddb4e82 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.k
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.k
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -1 0 0 0 0 ];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.spalding b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.spalding
index 4b988ac9abb..762b0ac7ee9 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.spalding
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/nut.spalding
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -1 0 0 0 0 ];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/omega b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/omega
index 8cc512ab341..b540b6d446e 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/omega
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/0/omega
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 0 -1 0 0 0 0 ];
+dimensions      [0 0 -1 0 0 0 0];
 
 internalField   uniform 1111.11;
 
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties
index f4e64506c6c..9b3fd54ef6a 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties
@@ -15,11 +15,10 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Ubar            Ubar [ 0 1 -1 0 0 0 0 ] ( 10 0 0 );
+Ubar            [0 1 -1 0 0 0 0] (10 0 0);
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1e-8;
-
+nu              [0 2 -1 0 0 0 0] 1e-8;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties.template b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties.template
index 03d9dabacf1..a9a119b1fbc 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties.template
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/transportProperties.template
@@ -15,11 +15,10 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Ubar            Ubar [ 0 1 -1 0 0 0 0 ] ( 10 0 0 );
+Ubar            [0 1 -1 0 0 0 0] (10 0 0);
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1e-XXX;
-
+nu              [0 2 -1 0 0 0 0] 1e-XXX;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/icoFoam/cavity/constant/transportProperties b/tutorials/incompressible/icoFoam/cavity/constant/transportProperties
index fa1c1ca0b14..91dd7510249 100644
--- a/tutorials/incompressible/icoFoam/cavity/constant/transportProperties
+++ b/tutorials/incompressible/icoFoam/cavity/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 0.01;
+nu              [0 2 -1 0 0 0 0] 0.01;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/constant/transportProperties b/tutorials/incompressible/icoFoam/cavityClipped/constant/transportProperties
index fa1c1ca0b14..91dd7510249 100644
--- a/tutorials/incompressible/icoFoam/cavityClipped/constant/transportProperties
+++ b/tutorials/incompressible/icoFoam/cavityClipped/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 0.01;
+nu              [0 2 -1 0 0 0 0] 0.01;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/constant/transportProperties b/tutorials/incompressible/icoFoam/cavityGrade/constant/transportProperties
index fa1c1ca0b14..91dd7510249 100644
--- a/tutorials/incompressible/icoFoam/cavityGrade/constant/transportProperties
+++ b/tutorials/incompressible/icoFoam/cavityGrade/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 0.01;
+nu              [0 2 -1 0 0 0 0] 0.01;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/icoFoam/elbow/constant/transportProperties b/tutorials/incompressible/icoFoam/elbow/constant/transportProperties
index fa1c1ca0b14..91dd7510249 100644
--- a/tutorials/incompressible/icoFoam/elbow/constant/transportProperties
+++ b/tutorials/incompressible/icoFoam/elbow/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 0.01;
+nu              [0 2 -1 0 0 0 0] 0.01;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/transportProperties b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/transportProperties
index 6ec6cffa1c6..c1222a182cf 100644
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/transportProperties
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/transportProperties
@@ -17,23 +17,20 @@ FoamFile
 
 transportModel  CrossPowerLaw;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1;
-
 CrossPowerLawCoeffs
 {
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 0.01;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 10;
-    m               m [ 0 0 1 0 0 0 0 ] 0.4;
-    n               n [ 0 0 0 0 0 0 0 ] 3;
+    nu0         [0 2 -1 0 0 0 0]  0.01;
+    nuInf       [0 2 -1 0 0 0 0]  10;
+    m           [0 0 1 0 0 0 0]   0.4;
+    n           [0 0 0 0 0 0 0]   3;
 }
 
 BirdCarreauCoeffs
 {
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    k               k [ 0 0 1 0 0 0 0 ] 0;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
+    nu0         [0 2 -1 0 0 0 0]  1e-06;
+    nuInf       [0 2 -1 0 0 0 0]  1e-06;
+    k           [0 0 1 0 0 0 0]   0;
+    n           [0 0 0 0 0 0 0]   1;
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/epsilon b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/epsilon
index 7413e6a02ec..20f7d6d6699 100644
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/epsilon
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/epsilon
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -3 0 0 0 0 ];
+dimensions      [0 2 -3 0 0 0 0];
 
 internalField   uniform 20;
 
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/k b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/k
index 722a31a7502..1414ac92082 100644
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/k
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/k
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 1;
 
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/nut b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/nut
index 7976d3f70ea..cfb43ebe076 100644
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/nut
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/0/nut
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -1 0 0 0 0 ];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/transportProperties b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/transportProperties
index b40b7d66cd8..f572eff8111 100644
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/transportProperties
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/transportProperties
@@ -17,23 +17,7 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1e-05;
-
-CrossPowerLawCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    m               m [ 0 0 1 0 0 0 0 ] 1;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
-BirdCarreauCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    k               k [ 0 0 1 0 0 0 0 ] 0;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
+nu              [0 2 -1 0 0 0 0] 1e-05;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/transportProperties b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/transportProperties
index b40b7d66cd8..401efe90835 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/transportProperties
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/transportProperties
@@ -17,23 +17,6 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1e-05;
-
-CrossPowerLawCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    m               m [ 0 0 1 0 0 0 0 ] 1;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
-BirdCarreauCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    k               k [ 0 0 1 0 0 0 0 ] 0;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
+nu              [0 2 -1 0 0 0 0] 1e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/transportProperties b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/transportProperties
index 5f2e87ebefb..96b2b749ad9 100644
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/transportProperties
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/constant/transportProperties
@@ -17,6 +17,6 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1e-6;
+nu              [0 2 -1 0 0 0 0] 1e-6;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/constant/transportProperties b/tutorials/incompressible/pimpleDyMFoam/propeller/constant/transportProperties
index 5f2e87ebefb..96b2b749ad9 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/constant/transportProperties
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/constant/transportProperties
@@ -17,6 +17,6 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1e-6;
+nu              [0 2 -1 0 0 0 0] 1e-6;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/transportProperties b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/transportProperties
index d4e4b455f6b..7cdb62d172f 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/transportProperties
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/transportProperties
@@ -17,6 +17,6 @@ FoamFile
 
 transportModel Newtonian;
 
-nu              nu [0 2 -1 0 0 0 0] 1e-05;
+nu              [0 2 -1 0 0 0 0] 1e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/transportProperties b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/transportProperties
index d4e4b455f6b..7cdb62d172f 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/transportProperties
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/transportProperties
@@ -17,6 +17,6 @@ FoamFile
 
 transportModel Newtonian;
 
-nu              nu [0 2 -1 0 0 0 0] 1e-05;
+nu              [0 2 -1 0 0 0 0] 1e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/0/epsilon b/tutorials/incompressible/pimpleFoam/TJunction/0/epsilon
index 00cbd4d30bf..1d8307f461e 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/0/epsilon
+++ b/tutorials/incompressible/pimpleFoam/TJunction/0/epsilon
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -3 0 0 0 0 ];
+dimensions      [0 2 -3 0 0 0 0];
 
 internalField   uniform 200;
 
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/0/k b/tutorials/incompressible/pimpleFoam/TJunction/0/k
index 125a20e930d..12fc09d659a 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/0/k
+++ b/tutorials/incompressible/pimpleFoam/TJunction/0/k
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 0.2;
 
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/0/nut b/tutorials/incompressible/pimpleFoam/TJunction/0/nut
index e360ed60a2d..9f68c55f67d 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/0/nut
+++ b/tutorials/incompressible/pimpleFoam/TJunction/0/nut
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -1 0 0 0 0 ];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/constant/transportProperties b/tutorials/incompressible/pimpleFoam/TJunction/constant/transportProperties
index b40b7d66cd8..401efe90835 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/TJunction/constant/transportProperties
@@ -17,23 +17,6 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1e-05;
-
-CrossPowerLawCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    m               m [ 0 0 1 0 0 0 0 ] 1;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
-BirdCarreauCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    k               k [ 0 0 1 0 0 0 0 ] 0;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
+nu              [0 2 -1 0 0 0 0] 1e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/transportProperties b/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/transportProperties
index b40b7d66cd8..401efe90835 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/constant/transportProperties
@@ -17,23 +17,6 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1e-05;
-
-CrossPowerLawCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    m               m [ 0 0 1 0 0 0 0 ] 1;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
-BirdCarreauCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    k               k [ 0 0 1 0 0 0 0 ] 0;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
+nu              [0 2 -1 0 0 0 0] 1e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/channel395/0.org/U b/tutorials/incompressible/pimpleFoam/channel395/0.org/U
index 1b416b9fc23..10436b99766 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/0.org/U
+++ b/tutorials/incompressible/pimpleFoam/channel395/0.org/U
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 1 -1 0 0 0 0 ];
+dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform ( 0.1335 0 0 );
 
diff --git a/tutorials/incompressible/pimpleFoam/channel395/0.org/k b/tutorials/incompressible/pimpleFoam/channel395/0.org/k
index 2ca4ff44c68..1246beed093 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/0.org/k
+++ b/tutorials/incompressible/pimpleFoam/channel395/0.org/k
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/incompressible/pimpleFoam/channel395/0.org/nuTilda b/tutorials/incompressible/pimpleFoam/channel395/0.org/nuTilda
index 5e43346c505..6d172d79d1b 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/0.org/nuTilda
+++ b/tutorials/incompressible/pimpleFoam/channel395/0.org/nuTilda
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -1 0 0 0 0 ];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/incompressible/pimpleFoam/channel395/0.org/nut b/tutorials/incompressible/pimpleFoam/channel395/0.org/nut
index df3efc1518b..5c2f99d6ec3 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/0.org/nut
+++ b/tutorials/incompressible/pimpleFoam/channel395/0.org/nut
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -1 0 0 0 0 ];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/incompressible/pimpleFoam/channel395/0.org/p b/tutorials/incompressible/pimpleFoam/channel395/0.org/p
index 8ea4b303504..fb4ce87850d 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/0.org/p
+++ b/tutorials/incompressible/pimpleFoam/channel395/0.org/p
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/incompressible/pimpleFoam/channel395/constant/transportProperties b/tutorials/incompressible/pimpleFoam/channel395/constant/transportProperties
index 1c959d2fb0d..fa0218b01ae 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/channel395/constant/transportProperties
@@ -15,27 +15,10 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Ubar            Ubar [ 0 1 -1 0 0 0 0 ] ( 0.1335 0 0 );
+Ubar            [0 1 -1 0 0 0 0] (0.1335 0 0);
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 2e-05;
-
-CrossPowerLawCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    m               m [ 0 0 1 0 0 0 0 ] 1;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
-BirdCarreauCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    k               k [ 0 0 1 0 0 0 0 ] 0;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
+nu              [0 2 -1 0 0 0 0] 2e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/nut b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/nut
index 435c96ce84a..ed303c8e962 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/nut
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/0/nut
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -1 0 0 0 0 ];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/transportProperties b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/transportProperties
index 8b877028016..610a08bc7de 100644
--- a/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/elipsekkLOmega/constant/transportProperties
@@ -17,23 +17,6 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1.86e-05;
-
-CrossPowerLawCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    m               m [ 0 0 1 0 0 0 0 ] 1;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
-BirdCarreauCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    k               k [ 0 0 1 0 0 0 0 ] 0;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
+nu              [0 2 -1 0 0 0 0] 1.86e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/pitzDaily/constant/transportProperties b/tutorials/incompressible/pimpleFoam/pitzDaily/constant/transportProperties
index b40b7d66cd8..401efe90835 100644
--- a/tutorials/incompressible/pimpleFoam/pitzDaily/constant/transportProperties
+++ b/tutorials/incompressible/pimpleFoam/pitzDaily/constant/transportProperties
@@ -17,23 +17,6 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1e-05;
-
-CrossPowerLawCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    m               m [ 0 0 1 0 0 0 0 ] 1;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
-BirdCarreauCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    k               k [ 0 0 1 0 0 0 0 ] 0;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
+nu              [0 2 -1 0 0 0 0] 1e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/U b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/U
index cee307a730f..ce0679c53ec 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/U
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/U
@@ -23,7 +23,7 @@ turbulentKE     0.24;
 
 turbulentOmega  1.78;
 
-dimensions      [ 0 1 -1 0 0 0 0 ];
+dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform ( 20 0 0 );
 
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/k b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/k
index b4cd87638c3..8e61ee9e54d 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/k
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/k
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 0.24;
 
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/nuTilda b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/nuTilda
index 41461e67111..7b24b274738 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/nuTilda
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/nuTilda
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -1 0 0 0 0 ];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0.05;
 
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/nut b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/nut
index 915f16d2257..38155ce79c3 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/nut
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/nut
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -1 0 0 0 0 ];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/p b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/p
index f85ce77a8ce..ac663ce37e7 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/p
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/0.org/p
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/transportProperties b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/transportProperties
index 9b417918864..9acbd4a5074 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/transportProperties
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/constant/transportProperties
@@ -16,6 +16,6 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [0 2 -1 0 0 0 0] 1.5e-05;
+nu              [0 2 -1 0 0 0 0] 1.5e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/transportProperties b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/transportProperties
index b40b7d66cd8..401efe90835 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/transportProperties
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/transportProperties
@@ -17,23 +17,6 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1e-05;
-
-CrossPowerLawCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    m               m [ 0 0 1 0 0 0 0 ] 1;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
-BirdCarreauCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    k               k [ 0 0 1 0 0 0 0 ] 0;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
+nu              [0 2 -1 0 0 0 0] 1e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/constant/transportProperties b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/constant/transportProperties
index b40b7d66cd8..401efe90835 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/constant/transportProperties
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/constant/transportProperties
@@ -17,23 +17,6 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1e-05;
-
-CrossPowerLawCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    m               m [ 0 0 1 0 0 0 0 ] 1;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
-BirdCarreauCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    k               k [ 0 0 1 0 0 0 0 ] 0;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
+nu              [0 2 -1 0 0 0 0] 1e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/constant/transportProperties b/tutorials/incompressible/pisoFoam/ras/cavity/constant/transportProperties
index b40b7d66cd8..401efe90835 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/constant/transportProperties
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/constant/transportProperties
@@ -17,23 +17,6 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1e-05;
-
-CrossPowerLawCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    m               m [ 0 0 1 0 0 0 0 ] 1;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
-BirdCarreauCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    k               k [ 0 0 1 0 0 0 0 ] 0;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
+nu              [0 2 -1 0 0 0 0] 1e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/constant/transportProperties b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/constant/transportProperties
index b40b7d66cd8..401efe90835 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/constant/transportProperties
+++ b/tutorials/incompressible/pisoFoam/ras/cavityCoupledU/constant/transportProperties
@@ -17,23 +17,6 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1e-05;
-
-CrossPowerLawCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    m               m [ 0 0 1 0 0 0 0 ] 1;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
-BirdCarreauCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    k               k [ 0 0 1 0 0 0 0 ] 0;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
+nu              [0 2 -1 0 0 0 0] 1e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/epsilon b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/epsilon
index 21b1e98ef91..dc27e2fcffb 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/epsilon
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/epsilon
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -3 0 0 0 0 ];
+dimensions      [0 2 -3 0 0 0 0];
 
 internalField   uniform 200;
 
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/k b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/k
index cd7aa310966..2b39c9a2cd8 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/k
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/k
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 1;
 
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/transportProperties b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/transportProperties
index 9b417918864..9acbd4a5074 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/transportProperties
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/transportProperties
@@ -16,6 +16,6 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [0 2 -1 0 0 0 0] 1.5e-05;
+nu              [0 2 -1 0 0 0 0] 1.5e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/epsilon b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/epsilon
index 044bd80abe0..8eac570f52b 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/epsilon
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/epsilon
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -3 0 0 0 0 ];
+dimensions      [0 2 -3 0 0 0 0];
 
 internalField   uniform 200;
 
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/k b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/k
index 9b5e379a4cb..7b491926d06 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/k
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/0/k
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 1;
 
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/transportProperties b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/transportProperties
index 9b417918864..9acbd4a5074 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/transportProperties
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/transportProperties
@@ -16,6 +16,6 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [0 2 -1 0 0 0 0] 1.5e-05;
+nu              [0 2 -1 0 0 0 0] 1.5e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/constant/transportProperties b/tutorials/incompressible/simpleFoam/airFoil2D/constant/transportProperties
index e0405ef2f0d..7fcac0b62d1 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/transportProperties
@@ -17,25 +17,8 @@ FoamFile
 
 transportModel  Newtonian;
 
-rho             rho [ 1 -3 0 0 0 0 0 ] 1;
-
-nu              nu [ 0 2 -1 0 0 0 0 ] 1e-05;
-
-CrossPowerLawCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    m               m [ 0 0 1 0 0 0 0 ] 1;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
-BirdCarreauCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    k               k [ 0 0 1 0 0 0 0 ] 0;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
+rho             [1 -3 0 0 0 0 0] 1;
 
+nu              [0 2 -1 0 0 0 0] 1e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/0/epsilon b/tutorials/incompressible/simpleFoam/mixerVessel2D/0/epsilon
index 84f822890ea..8adf5680877 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/0/epsilon
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/0/epsilon
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -3 0 0 0 0 ];
+dimensions      [0 2 -3 0 0 0 0];
 
 internalField   uniform 20;
 
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/0/k b/tutorials/incompressible/simpleFoam/mixerVessel2D/0/k
index 60208ba1315..74be565a854 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/0/k
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/0/k
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 1;
 
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/0/nut b/tutorials/incompressible/simpleFoam/mixerVessel2D/0/nut
index 309360d6a96..6ca6d3aef64 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/0/nut
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/0/nut
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -1 0 0 0 0 ];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/transportProperties b/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/transportProperties
index b40b7d66cd8..401efe90835 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/transportProperties
@@ -17,23 +17,6 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1e-05;
-
-CrossPowerLawCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    m               m [ 0 0 1 0 0 0 0 ] 1;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
-BirdCarreauCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    k               k [ 0 0 1 0 0 0 0 ] 0;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
+nu              [0 2 -1 0 0 0 0] 1e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/transportProperties b/tutorials/incompressible/simpleFoam/motorBike/constant/transportProperties
index 9b417918864..9acbd4a5074 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/motorBike/constant/transportProperties
@@ -16,6 +16,6 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [0 2 -1 0 0 0 0] 1.5e-05;
+nu              [0 2 -1 0 0 0 0] 1.5e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/epsilon b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/epsilon
index ea5df05656a..73f9d7fa510 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/epsilon
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/epsilon
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -3 0 0 0 0 ];
+dimensions      [0 2 -3 0 0 0 0];
 
 internalField   uniform 1;
 
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/k b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/k
index dd90e1e55a7..777c1a96c0d 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/k
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/k
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 1;
 
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nut b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nut
index d397953c1d2..d749dfae0b4 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nut
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.org/nut
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -1 0 0 0 0 ];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/constant/transportProperties b/tutorials/incompressible/simpleFoam/pipeCyclic/constant/transportProperties
index ab12b49567e..af89ac5fe9c 100644
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/constant/transportProperties
@@ -17,7 +17,7 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
+nu              [0 2 -1 0 0 0 0] 1e-06;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/constant/transportProperties b/tutorials/incompressible/simpleFoam/pitzDaily/constant/transportProperties
index b40b7d66cd8..401efe90835 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/constant/transportProperties
@@ -17,23 +17,6 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1e-05;
-
-CrossPowerLawCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    m               m [ 0 0 1 0 0 0 0 ] 1;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
-BirdCarreauCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    k               k [ 0 0 1 0 0 0 0 ] 0;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
+nu              [0 2 -1 0 0 0 0] 1e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/transportProperties b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/transportProperties
index b40b7d66cd8..401efe90835 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/transportProperties
@@ -17,23 +17,6 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1e-05;
-
-CrossPowerLawCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    m               m [ 0 0 1 0 0 0 0 ] 1;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
-BirdCarreauCoeffs
-{
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-    k               k [ 0 0 1 0 0 0 0 ] 0;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
-}
-
+nu              [0 2 -1 0 0 0 0] 1e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/constant/transportProperties b/tutorials/incompressible/simpleFoam/rotorDisk/constant/transportProperties
index 59110123306..9acbd4a5074 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/constant/transportProperties
@@ -16,6 +16,6 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1.5e-05;
+nu              [0 2 -1 0 0 0 0] 1.5e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/constant/transportProperties b/tutorials/incompressible/simpleFoam/turbineSiting/constant/transportProperties
index 9b417918864..9acbd4a5074 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/constant/transportProperties
@@ -16,6 +16,6 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [0 2 -1 0 0 0 0] 1.5e-05;
+nu              [0 2 -1 0 0 0 0] 1.5e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/transportProperties b/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/transportProperties
index 59110123306..9acbd4a5074 100644
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/transportProperties
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/transportProperties
@@ -16,6 +16,6 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1.5e-05;
+nu              [0 2 -1 0 0 0 0] 1.5e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties
index 1776b357e94..979d92116cc 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties
@@ -21,7 +21,7 @@ radiationModel  P1;
 
 P1Coeffs
 {
-    C               C [ 0 0 0 0 0 0 0 ] 0;
+    C               C [0 0 0 0 0 0 0] 0;
 }
 
 absorptionEmissionModel binaryAbsorptionEmission;
@@ -33,9 +33,9 @@ binaryAbsorptionEmissionCoeffs
         absorptionEmissionModel constantAbsorptionEmission;
         constantAbsorptionEmissionCoeffs
         {
-            absorptivity    absorptivity    [ 0 -1 0 0 0 0 0 ] 0.5;
-            emissivity      emissivity      [ 0 -1 0 0 0 0 0 ] 0.5;
-            E               E   [ 1 -1 -3 0 0 0 0 ] 0;
+            absorptivity    absorptivity    [0 -1 0 0 0 0 0] 0.5;
+            emissivity      emissivity      [0 -1 0 0 0 0 0] 0.5;
+            E               E   [1 -1 -3 0 0 0 0] 0;
         }
     }
     model2
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/transportProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/transportProperties
index f223c6abbb4..dbbab9e9f0a 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/transportProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/transportProperties
@@ -15,10 +15,10 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-rhoInf          rhoInf [ 1 -3 0 0 0 0 0 ] 1.2;
+rhoInf          [1 -3 0 0 0 0 0] 1.2;
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1e-05;
+nu              [0 2 -1 0 0 0 0] 1e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/transportProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/transportProperties
index f223c6abbb4..dbbab9e9f0a 100644
--- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/transportProperties
+++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/transportProperties
@@ -15,10 +15,10 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-rhoInf          rhoInf [ 1 -3 0 0 0 0 0 ] 1.2;
+rhoInf          [1 -3 0 0 0 0 0] 1.2;
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1e-05;
+nu              [0 2 -1 0 0 0 0] 1e-05;
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/patchifyObstacles b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/patchifyObstacles
index e184c4dbb57..e375202c3bb 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/patchifyObstacles
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/patchifyObstacles
@@ -71,7 +71,7 @@ for xi in $(seq 1 1 $nx); do
            echo "processing cube $n"
 
            pad=""
-           if [ $n -lt 10 ]; then
+           if [ $n -lt 10]; then
                pad="0"
            fi
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/G b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/G
index 5bfc6d00916..6fea3040488 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/G
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/G
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 1 0 -3 0 0 0 0 ];
+dimensions      [1 0 -3 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/H2O b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/H2O
index 615f83b6225..6cee312c8b3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/H2O
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 0 0 0 0 0 0 ];
+dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/N2 b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/N2
index 46857fe937b..e0b994958ae 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/N2
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/N2
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 0 0 0 0 0 0 ];
+dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0.79;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/O2 b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/O2
index 20654933447..afd5664eeea 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/O2
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/O2
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 0 0 0 0 0 0 ];
+dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0.21;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/T b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/T
index 3fb56a7a7b0..9aa18b3fcb1 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/T
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/T
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 0 0 1 0 0 0 ];
+dimensions      [0 0 0 1 0 0 0];
 
 internalField   uniform 350;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/U b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/U
index bac859d6245..8cd60750d47 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/U
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/U
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 1 -1 0 0 0 0 ];
+dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform ( 0 0 0 );
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/alphat b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/alphat
index 62d54f2cbeb..edaab89a8bf 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/alphat
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/alphat
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 1 -1 -1 0 0 0 0 ];
+dimensions      [1 -1 -1 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/epsilon b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/epsilon
index 448a7a08583..92a339181e3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/epsilon
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/epsilon
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -3 0 0 0 0 ];
+dimensions      [0 2 -3 0 0 0 0];
 
 internalField   uniform 0.0449;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/k b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/k
index 7d79256b2a2..e81f9772af2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/k
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/k
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 0.0938;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/nut b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/nut
index c0334a14120..5f9535f8816 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/nut
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/nut
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -1 0 0 0 0 ];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/p b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/p
index 3ebd756ac38..ab56d7d4fbc 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.org/p
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.org/p
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 1 -1 -2 0 0 0 0 ];
+dimensions      [1 -1 -2 0 0 0 0];
 
 internalField   uniform 100000;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/G b/tutorials/lagrangian/reactingParcelFoam/filter/0/G
index 5bfc6d00916..6fea3040488 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0/G
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0/G
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 1 0 -3 0 0 0 0 ];
+dimensions      [1 0 -3 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/H2O b/tutorials/lagrangian/reactingParcelFoam/filter/0/H2O
index 615f83b6225..6cee312c8b3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0/H2O
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0/H2O
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 0 0 0 0 0 0 ];
+dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/N2 b/tutorials/lagrangian/reactingParcelFoam/filter/0/N2
index 46857fe937b..e0b994958ae 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0/N2
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0/N2
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 0 0 0 0 0 0 ];
+dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0.79;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/O2 b/tutorials/lagrangian/reactingParcelFoam/filter/0/O2
index 20654933447..afd5664eeea 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0/O2
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0/O2
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 0 0 0 0 0 0 ];
+dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0.21;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/T b/tutorials/lagrangian/reactingParcelFoam/filter/0/T
index 3fb56a7a7b0..9aa18b3fcb1 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0/T
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0/T
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 0 0 1 0 0 0 ];
+dimensions      [0 0 0 1 0 0 0];
 
 internalField   uniform 350;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/U b/tutorials/lagrangian/reactingParcelFoam/filter/0/U
index bac859d6245..8cd60750d47 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0/U
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0/U
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 1 -1 0 0 0 0 ];
+dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform ( 0 0 0 );
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/alphat b/tutorials/lagrangian/reactingParcelFoam/filter/0/alphat
index 62d54f2cbeb..edaab89a8bf 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0/alphat
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0/alphat
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 1 -1 -1 0 0 0 0 ];
+dimensions      [1 -1 -1 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/epsilon b/tutorials/lagrangian/reactingParcelFoam/filter/0/epsilon
index 448a7a08583..92a339181e3 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0/epsilon
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0/epsilon
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -3 0 0 0 0 ];
+dimensions      [0 2 -3 0 0 0 0];
 
 internalField   uniform 0.0449;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/k b/tutorials/lagrangian/reactingParcelFoam/filter/0/k
index 7d79256b2a2..e81f9772af2 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0/k
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0/k
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 0.0938;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/nut b/tutorials/lagrangian/reactingParcelFoam/filter/0/nut
index c0334a14120..5f9535f8816 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0/nut
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0/nut
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -1 0 0 0 0 ];
+dimensions      [0 2 -1 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/p b/tutorials/lagrangian/reactingParcelFoam/filter/0/p
index 3ebd756ac38..ab56d7d4fbc 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0/p
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0/p
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 1 -1 -2 0 0 0 0 ];
+dimensions      [1 -1 -2 0 0 0 0];
 
 internalField   uniform 100000;
 
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/N2 b/tutorials/lagrangian/sprayFoam/aachenBomb/0/N2
index d312f16988c..41c2e092906 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/N2
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/N2
@@ -14,7 +14,7 @@ FoamFile
 }
 // ************************************************************************* //
 
-dimensions          [ 0 0 0 0 0 0 0 ];
+dimensions          [0 0 0 0 0 0 0];
 
 internalField       uniform 0.766;
 
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/O2 b/tutorials/lagrangian/sprayFoam/aachenBomb/0/O2
index e085980998e..b8e040eeb52 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/O2
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/O2
@@ -14,7 +14,7 @@ FoamFile
 }
 // ************************************************************************* //
 
-dimensions          [ 0 0 0 0 0 0 0 ];
+dimensions          [0 0 0 0 0 0 0];
 
 internalField       uniform 0.234;
 
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/T b/tutorials/lagrangian/sprayFoam/aachenBomb/0/T
index da07d97019b..b2849112d5e 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/T
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/T
@@ -14,7 +14,7 @@ FoamFile
 }
 // ************************************************************************* //
 
-dimensions          [ 0 0 0 1 0 0 0 ];
+dimensions          [0 0 0 1 0 0 0];
 
 internalField       uniform 800;
 
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/U b/tutorials/lagrangian/sprayFoam/aachenBomb/0/U
index 8abc3ee9fa3..ea7d4e0e91a 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/U
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/U
@@ -14,7 +14,7 @@ FoamFile
 }
 // ************************************************************************* //
 
-dimensions          [ 0 1 -1 0 0 0 0 ];
+dimensions          [0 1 -1 0 0 0 0];
 
 internalField       uniform ( 0 0 0 );
 
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/Ydefault b/tutorials/lagrangian/sprayFoam/aachenBomb/0/Ydefault
index 97d3b3fc77c..6d98e56617a 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/Ydefault
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/Ydefault
@@ -14,7 +14,7 @@ FoamFile
 }
 // ************************************************************************* //
 
-dimensions          [ 0 0 0 0 0 0 0 ];
+dimensions          [0 0 0 0 0 0 0];
 
 internalField       uniform 0;
 
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/0/p b/tutorials/lagrangian/sprayFoam/aachenBomb/0/p
index c13a0c26af8..8366736d089 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/0/p
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/0/p
@@ -14,7 +14,7 @@ FoamFile
 }
 // ************************************************************************* //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 5e+06;
 
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/transportProperties b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/transportProperties
index 572195459a6..a1b5e037da4 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/transportProperties
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/transportProperties
@@ -20,17 +20,17 @@ phases (phase1 phase2);
 phase1
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 300;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
+    rho             [1 -3 0 0 0 0 0] 300;
 }
 
 phase2
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-6;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1027;
+    nu              [0 2 -1 0 0 0 0] 1e-6;
+    rho             [1 -3 0 0 0 0 0] 1027;
 }
 
-sigma           sigma [ 1 0 -2 0 0 0 0 ] 0.07;
+sigma           [1 0 -2 0 0 0 0] 0.07;
 
 // ************************************************************************* //
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/transportProperties b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/transportProperties
index f6969a00e61..91dd7510249 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/transportProperties
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-nu              nu [0 2 -1 0 0 0 0] 0.01;
+nu              [0 2 -1 0 0 0 0] 0.01;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties
index fc5c6d92116..69abb4a4ba3 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties
@@ -17,15 +17,15 @@ FoamFile
 
 barotropicCompressibilityModel linear;
 
-psiv            psiv [ 0 -2 2 0 0 ] 2.5e-06;
+psiv            [0 -2 2 0 0] 2.5e-06;
 
-rholSat         rholSat [ 1 -3 0 0 0 ] 830;
+rholSat         [1 -3 0 0 0] 830;
 
-psil            psil [ 0 -2 2 0 0 ] 5e-07;
+psil            [0 -2 2 0 0] 5e-07;
 
-pSat            pSat [ 1 -1 -2 0 0 ] 4500;
+pSat            [1 -1 -2 0 0] 4500;
 
-rhoMin          rhoMin [ 1 -3 0 0 0 ] 0.001;
+rhoMin          [1 -3 0 0 0] 0.001;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties
index c5ea29f7a5d..2891ba9e2cf 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties
@@ -15,54 +15,24 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-mul             mul [ 1 -1 -1 0 0 ] 0.0065;
+mul             [1 -1 -1 0 0] 0.0065;
 
-muv             muv [ 1 -1 -1 0 0 ] 5.953e-06;
+muv             [1 -1 -1 0 0] 5.953e-06;
 
 phases (vapour water);
 
 water
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 7.831e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 830;
-    CrossPowerLawCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] -999;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] -999;
-        m               m [ 0 0 1 0 0 0 0 ] -999;
-        n               n [ 0 0 0 0 0 0 0 ] -999;
-    }
-
-    BirdCarreauCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] -999;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] -999;
-        k               k [ 0 0 1 0 0 0 0 ] -999;
-        n               n [ 0 0 0 0 0 0 0 ] -999;
-    }
+    nu              [0 2 -1 0 0 0 0] 7.831e-06;
+    rho             [1 -3 0 0 0 0 0] 830;
 }
 
 vapour
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 4.252e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 0.14;
-    CrossPowerLawCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] -999;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] -999;
-        m               m [ 0 0 1 0 0 0 0 ] -999;
-        n               n [ 0 0 0 0 0 0 0 ] -999;
-    }
-
-    BirdCarreauCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] -999;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] -999;
-        k               k [ 0 0 1 0 0 0 0 ] -999;
-        n               n [ 0 0 0 0 0 0 0 ] -999;
-    }
+    nu              [0 2 -1 0 0 0 0] 4.252e-05;
+    rho             [1 -3 0 0 0 0 0] 0.14;
 }
 
 
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties
index fc5c6d92116..69abb4a4ba3 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties
@@ -17,15 +17,15 @@ FoamFile
 
 barotropicCompressibilityModel linear;
 
-psiv            psiv [ 0 -2 2 0 0 ] 2.5e-06;
+psiv            [0 -2 2 0 0] 2.5e-06;
 
-rholSat         rholSat [ 1 -3 0 0 0 ] 830;
+rholSat         [1 -3 0 0 0] 830;
 
-psil            psil [ 0 -2 2 0 0 ] 5e-07;
+psil            [0 -2 2 0 0] 5e-07;
 
-pSat            pSat [ 1 -1 -2 0 0 ] 4500;
+pSat            [1 -1 -2 0 0] 4500;
 
-rhoMin          rhoMin [ 1 -3 0 0 0 ] 0.001;
+rhoMin          [1 -3 0 0 0] 0.001;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties
index c5ea29f7a5d..af76643fd0b 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties
@@ -15,55 +15,24 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-mul             mul [ 1 -1 -1 0 0 ] 0.0065;
+mul             [1 -1 -1 0 0] 0.0065;
 
-muv             muv [ 1 -1 -1 0 0 ] 5.953e-06;
+muv             [1 -1 -1 0 0] 5.953e-06;
 
 phases (vapour water);
 
 water
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 7.831e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 830;
-    CrossPowerLawCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] -999;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] -999;
-        m               m [ 0 0 1 0 0 0 0 ] -999;
-        n               n [ 0 0 0 0 0 0 0 ] -999;
-    }
-
-    BirdCarreauCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] -999;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] -999;
-        k               k [ 0 0 1 0 0 0 0 ] -999;
-        n               n [ 0 0 0 0 0 0 0 ] -999;
-    }
+    nu              [0 2 -1 0 0 0 0] 7.831e-06;
+    rho             [1 -3 0 0 0 0 0] 830;
 }
 
 vapour
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 4.252e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 0.14;
-    CrossPowerLawCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] -999;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] -999;
-        m               m [ 0 0 1 0 0 0 0 ] -999;
-        n               n [ 0 0 0 0 0 0 0 ] -999;
-    }
-
-    BirdCarreauCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] -999;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] -999;
-        k               k [ 0 0 1 0 0 0 0 ] -999;
-        n               n [ 0 0 0 0 0 0 0 ] -999;
-    }
+    nu              [0 2 -1 0 0 0 0] 4.252e-05;
+    rho             [1 -3 0 0 0 0 0] 0.14;
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/thermodynamicProperties
index fc5c6d92116..ff3b881184a 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/thermodynamicProperties
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/thermodynamicProperties
@@ -17,15 +17,14 @@ FoamFile
 
 barotropicCompressibilityModel linear;
 
-psiv            psiv [ 0 -2 2 0 0 ] 2.5e-06;
+psiv            [0 -2 2 0 0] 2.5e-06;
 
-rholSat         rholSat [ 1 -3 0 0 0 ] 830;
+rholSat         [1 -3 0 0 0] 830;
 
-psil            psil [ 0 -2 2 0 0 ] 5e-07;
+psil            [0 -2 2 0 0] 5e-07;
 
-pSat            pSat [ 1 -1 -2 0 0 ] 4500;
-
-rhoMin          rhoMin [ 1 -3 0 0 0 ] 0.001;
+pSat            [1 -1 -2 0 0] 4500;
 
+rhoMin          [1 -3 0 0 0] 0.001;
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties
index c5ea29f7a5d..af76643fd0b 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties
@@ -15,55 +15,24 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-mul             mul [ 1 -1 -1 0 0 ] 0.0065;
+mul             [1 -1 -1 0 0] 0.0065;
 
-muv             muv [ 1 -1 -1 0 0 ] 5.953e-06;
+muv             [1 -1 -1 0 0] 5.953e-06;
 
 phases (vapour water);
 
 water
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 7.831e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 830;
-    CrossPowerLawCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] -999;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] -999;
-        m               m [ 0 0 1 0 0 0 0 ] -999;
-        n               n [ 0 0 0 0 0 0 0 ] -999;
-    }
-
-    BirdCarreauCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] -999;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] -999;
-        k               k [ 0 0 1 0 0 0 0 ] -999;
-        n               n [ 0 0 0 0 0 0 0 ] -999;
-    }
+    nu              [0 2 -1 0 0 0 0] 7.831e-06;
+    rho             [1 -3 0 0 0 0 0] 830;
 }
 
 vapour
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 4.252e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 0.14;
-    CrossPowerLawCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] -999;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] -999;
-        m               m [ 0 0 1 0 0 0 0 ] -999;
-        n               n [ 0 0 0 0 0 0 0 ] -999;
-    }
-
-    BirdCarreauCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] -999;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] -999;
-        k               k [ 0 0 1 0 0 0 0 ] -999;
-        n               n [ 0 0 0 0 0 0 0 ] -999;
-    }
+    nu              [0 2 -1 0 0 0 0] 4.252e-05;
+    rho             [1 -3 0 0 0 0 0] 0.14;
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/thermophysicalProperties
index ad67959d02f..eb43806c074 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/thermophysicalProperties
@@ -17,8 +17,8 @@ FoamFile
 
 phases (water air);
 
-pMin            pMin [ 1 -1 -2 0 0 0 0 ] 1000;
+pMin            [1 -1 -2 0 0 0 0] 1000;
 
-sigma           sigma [ 1 0 -2 0 0 0 0 ] 0;
+sigma           [1 0 -2 0 0 0 0] 0;
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/transportProperties b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/transportProperties
index 3729fc7648b..f746c067998 100644
--- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/transportProperties
+++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/constant/transportProperties
@@ -20,18 +20,18 @@ phases (water air);
 water
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 998.2;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
+    rho             [1 -3 0 0 0 0 0] 998.2;
 }
 
 air
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
+    rho             [1 -3 0 0 0 0 0] 1;
 }
 
-sigma           sigma [ 1 0 -2 0 0 0 0 ] 0;
+sigma           [1 0 -2 0 0 0 0] 0;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties
index 9c14314414d..8506bd51f34 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties
@@ -17,8 +17,8 @@ FoamFile
 
 phases (water air);
 
-pMin            pMin [ 1 -1 -2 0 0 0 0 ] 10000;
+pMin            [1 -1 -2 0 0 0 0] 10000;
 
-sigma           sigma [ 1 0 -2 0 0 0 0 ] 0.07;
+sigma           [1 0 -2 0 0 0 0] 0.07;
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties
index 9c14314414d..8506bd51f34 100644
--- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties
@@ -17,8 +17,8 @@ FoamFile
 
 phases (water air);
 
-pMin            pMin [ 1 -1 -2 0 0 0 0 ] 10000;
+pMin            [1 -1 -2 0 0 0 0] 10000;
 
-sigma           sigma [ 1 0 -2 0 0 0 0 ] 0.07;
+sigma           [1 0 -2 0 0 0 0] 0.07;
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary
index 1b4dbb60aae..79ef3a79e11 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary
@@ -20,18 +20,21 @@ FoamFile
     leftWall
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          50;
         startFace       4432;
     }
     rightWall
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          50;
         startFace       4482;
     }
     lowerWall
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          62;
         startFace       4532;
     }
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties
index 129c3a278ec..69dc3521df6 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 phases (water oil mercury air);
 
-pMin            pMin [ 1 -1 -2 0 0 0 0 ] 10000;
+pMin            [1 -1 -2 0 0 0 0] 10000;
 
 sigmas
 (
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/transportProperties
index 0bfa2f19b96..7e4c459f6a2 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/constant/transportProperties
@@ -20,17 +20,17 @@ phases (water air);
 water
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ]  1.09e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 998.8;
+    nu              [0 2 -1 0 0 0 0]  1.09e-06;
+    rho             [1 -3 0 0 0 0 0] 998.8;
 }
 
 air
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ]  1.48e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
+    nu              [0 2 -1 0 0 0 0]  1.48e-05;
+    rho             [1 -3 0 0 0 0 0] 1;
 }
 
-sigma           sigma [ 1 0 -2 0 0 0 0 ] 0;
+sigma           [1 0 -2 0 0 0 0] 0;
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/transportProperties
index 81106f5ea4c..577be61a90e 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/transportProperties
@@ -20,48 +20,18 @@ phases (water air);
 water
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1000;
-    CrossPowerLawCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        m               m [ 0 0 1 0 0 0 0 ] 1;
-        n               n [ 0 0 0 0 0 0 0 ] 0;
-    }
-
-    BirdCarreauCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        k               k [ 0 0 1 0 0 0 0 ] 99.6;
-        n               n [ 0 0 0 0 0 0 0 ] 0.1003;
-    }
+    nu              [0 2 -1 0 0 0 0] 1e-06;
+    rho             [1 -3 0 0 0 0 0] 1000;
 }
 
 air
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
-    CrossPowerLawCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        m               m [ 0 0 1 0 0 0 0 ] 1;
-        n               n [ 0 0 0 0 0 0 0 ] 0;
-    }
-
-    BirdCarreauCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        k               k [ 0 0 1 0 0 0 0 ] 99.6;
-        n               n [ 0 0 0 0 0 0 0 ] 0.1003;
-    }
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
+    rho             [1 -3 0 0 0 0 0] 1;
 }
 
-sigma           sigma [ 1 0 -2 0 0 0 0 ] 0.07;
+sigma           [1 0 -2 0 0 0 0] 0.07;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/transportProperties
index 3729fc7648b..f746c067998 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/transportProperties
@@ -20,18 +20,18 @@ phases (water air);
 water
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 998.2;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
+    rho             [1 -3 0 0 0 0 0] 998.2;
 }
 
 air
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
+    rho             [1 -3 0 0 0 0 0] 1;
 }
 
-sigma           sigma [ 1 0 -2 0 0 0 0 ] 0;
+sigma           [1 0 -2 0 0 0 0] 0;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/transportProperties
index 0d7bbe9e603..35763b23e72 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/constant/transportProperties
@@ -20,17 +20,17 @@ phases (water air);
 water
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 300;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
+    rho             [1 -3 0 0 0 0 0] 300;
 }
 
 air
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-6;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1027;
+    nu              [0 2 -1 0 0 0 0] 1e-6;
+    rho             [1 -3 0 0 0 0 0] 1027;
 }
 
-sigma           sigma [ 1 0 -2 0 0 0 0 ] 0.07;
+sigma           [1 0 -2 0 0 0 0] 0.07;
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/transportProperties
index 3729fc7648b..e0fdefd56e4 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/transportProperties
@@ -20,18 +20,17 @@ phases (water air);
 water
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 998.2;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
+    rho             [1 -3 0 0 0 0 0] 998.2;
 }
 
 air
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
+    rho             [1 -3 0 0 0 0 0] 1;
 }
 
-sigma           sigma [ 1 0 -2 0 0 0 0 ] 0;
-
+sigma           [1 0 -2 0 0 0 0] 0;
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/transportProperties
index 3729fc7648b..f746c067998 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/transportProperties
@@ -20,18 +20,18 @@ phases (water air);
 water
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 998.2;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
+    rho             [1 -3 0 0 0 0 0] 998.2;
 }
 
 air
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
+    rho             [1 -3 0 0 0 0 0] 1;
 }
 
-sigma           sigma [ 1 0 -2 0 0 0 0 ] 0;
+sigma           [1 0 -2 0 0 0 0] 0;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/transportProperties
index 3729fc7648b..e0fdefd56e4 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/transportProperties
@@ -20,18 +20,17 @@ phases (water air);
 water
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 998.2;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
+    rho             [1 -3 0 0 0 0 0] 998.2;
 }
 
 air
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
+    rho             [1 -3 0 0 0 0 0] 1;
 }
 
-sigma           sigma [ 1 0 -2 0 0 0 0 ] 0;
-
+sigma           [1 0 -2 0 0 0 0] 0;
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/transportProperties
index 3729fc7648b..f746c067998 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/transportProperties
@@ -20,18 +20,18 @@ phases (water air);
 water
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 998.2;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
+    rho             [1 -3 0 0 0 0 0] 998.2;
 }
 
 air
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
+    rho             [1 -3 0 0 0 0 0] 1;
 }
 
-sigma           sigma [ 1 0 -2 0 0 0 0 ] 0;
+sigma           [1 0 -2 0 0 0 0] 0;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/transportProperties
index 3729fc7648b..e0fdefd56e4 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/transportProperties
@@ -20,18 +20,17 @@ phases (water air);
 water
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 998.2;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
+    rho             [1 -3 0 0 0 0 0] 998.2;
 }
 
 air
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
+    rho             [1 -3 0 0 0 0 0] 1;
 }
 
-sigma           sigma [ 1 0 -2 0 0 0 0 ] 0;
-
+sigma           [1 0 -2 0 0 0 0] 0;
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/transportProperties b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/transportProperties
index 3729fc7648b..f746c067998 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/transportProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/constant/transportProperties
@@ -20,18 +20,18 @@ phases (water air);
 water
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 998.2;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
+    rho             [1 -3 0 0 0 0 0] 998.2;
 }
 
 air
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
+    rho             [1 -3 0 0 0 0 0] 1;
 }
 
-sigma           sigma [ 1 0 -2 0 0 0 0 ] 0;
+sigma           [1 0 -2 0 0 0 0] 0;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties
index 73d4778c971..5d558910509 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties
@@ -20,46 +20,18 @@ phases (water air);
 water
 {
     transportModel  Newtonian;
-    nu              nu [0 2 -1 0 0 0 0] 1e-06;
-    rho             rho [1 -3 0 0 0 0 0] 1000;
-    CrossPowerLawCoeffs
-    {
-        nu0             nu0 [0 2 -1 0 0 0 0] 1e-06;
-        nuInf           nuInf [0 2 -1 0 0 0 0] 1e-06;
-        m               m [0 0 1 0 0 0 0] 1;
-        n               n [0 0 0 0 0 0 0] 0;
-    }
-    BirdCarreauCoeffs
-    {
-        nu0             nu0 [0 2 -1 0 0 0 0] 0.0142515;
-        nuInf           nuInf [0 2 -1 0 0 0 0] 1e-06;
-        k               k [0 0 1 0 0 0 0] 99.6;
-        n               n [0 0 0 0 0 0 0] 0.1003;
-    }
+    nu              [0 2 -1 0 0 0 0] 1e-06;
+    rho             [1 -3 0 0 0 0 0] 1000;
 }
 
 air
 {
     transportModel  Newtonian;
-    nu              nu [0 2 -1 0 0 0 0] 1.48e-05;
-    rho             rho [1 -3 0 0 0 0 0] 1;
-    CrossPowerLawCoeffs
-    {
-        nu0             nu0 [0 2 -1 0 0 0 0] 1e-06;
-        nuInf           nuInf [0 2 -1 0 0 0 0] 1e-06;
-        m               m [0 0 1 0 0 0 0] 1;
-        n               n [0 0 0 0 0 0 0] 0;
-    }
-    BirdCarreauCoeffs
-    {
-        nu0             nu0 [0 2 -1 0 0 0 0] 0.0142515;
-        nuInf           nuInf [0 2 -1 0 0 0 0] 1e-06;
-        k               k [0 0 1 0 0 0 0] 99.6;
-        n               n [0 0 0 0 0 0 0] 0.1003;
-    }
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
+    rho             [1 -3 0 0 0 0 0] 1;
 }
 
-sigma           sigma [1 0 -2 0 0 0 0] 0.0707106;
+sigma           [1 0 -2 0 0 0 0] 0.0707106;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/damBreak/constant/transportProperties
index 81106f5ea4c..577be61a90e 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/constant/transportProperties
@@ -20,48 +20,18 @@ phases (water air);
 water
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1000;
-    CrossPowerLawCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        m               m [ 0 0 1 0 0 0 0 ] 1;
-        n               n [ 0 0 0 0 0 0 0 ] 0;
-    }
-
-    BirdCarreauCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        k               k [ 0 0 1 0 0 0 0 ] 99.6;
-        n               n [ 0 0 0 0 0 0 0 ] 0.1003;
-    }
+    nu              [0 2 -1 0 0 0 0] 1e-06;
+    rho             [1 -3 0 0 0 0 0] 1000;
 }
 
 air
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
-    CrossPowerLawCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        m               m [ 0 0 1 0 0 0 0 ] 1;
-        n               n [ 0 0 0 0 0 0 0 ] 0;
-    }
-
-    BirdCarreauCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        k               k [ 0 0 1 0 0 0 0 ] 99.6;
-        n               n [ 0 0 0 0 0 0 0 ] 0.1003;
-    }
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
+    rho             [1 -3 0 0 0 0 0] 1;
 }
 
-sigma           sigma [ 1 0 -2 0 0 0 0 ] 0.07;
+sigma           [1 0 -2 0 0 0 0] 0.07;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/transportProperties
index 15e0e327a49..63f9f40e967 100644
--- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/transportProperties
@@ -20,18 +20,18 @@ phases (water oir);
 water
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-4;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1000;
+    nu              [0 2 -1 0 0 0 0] 1e-4;
+    rho             [1 -3 0 0 0 0 0] 1000;
 }
 
 oir
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-4;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 500;
+    nu              [0 2 -1 0 0 0 0] 1e-4;
+    rho             [1 -3 0 0 0 0 0] 500;
 }
 
-sigma           sigma [ 1 0 -2 0 0 0 0 ] 0.05;
+sigma           [1 0 -2 0 0 0 0] 0.05;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/transportProperties b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/transportProperties
index c74376aa3f2..d3ee304bc3d 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/transportProperties
@@ -20,48 +20,17 @@ phases (fuel air);
 fuel
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 5.952e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 840;
-    CrossPowerLawCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        m               m [ 0 0 1 0 0 0 0 ] 1;
-        n               n [ 0 0 0 0 0 0 0 ] 0;
-    }
-
-    BirdCarreauCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        k               k [ 0 0 1 0 0 0 0 ] 99.6;
-        n               n [ 0 0 0 0 0 0 0 ] 0.1003;
-    }
+    nu              [0 2 -1 0 0 0 0] 5.952e-06;
+    rho             [1 -3 0 0 0 0 0] 840;
 }
 
 air
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 8.5e-07;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 20;
-    CrossPowerLawCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        m               m [ 0 0 1 0 0 0 0 ] 1;
-        n               n [ 0 0 0 0 0 0 0 ] 0;
-    }
-
-    BirdCarreauCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        k               k [ 0 0 1 0 0 0 0 ] 99.6;
-        n               n [ 0 0 0 0 0 0 0 ] 0.1003;
-    }
+    nu              [0 2 -1 0 0 0 0] 8.5e-07;
+    rho             [1 -3 0 0 0 0 0] 20;
 }
 
-sigma           sigma [ 1 0 -2 0 0 0 0 ] 0.0261;
-
+sigma           [1 0 -2 0 0 0 0] 0.0261;
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/constant/transportProperties b/tutorials/multiphase/interFoam/ras/DTCHull/constant/transportProperties
index 0bfa2f19b96..7e4c459f6a2 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/constant/transportProperties
@@ -20,17 +20,17 @@ phases (water air);
 water
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ]  1.09e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 998.8;
+    nu              [0 2 -1 0 0 0 0]  1.09e-06;
+    rho             [1 -3 0 0 0 0 0] 998.8;
 }
 
 air
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ]  1.48e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
+    nu              [0 2 -1 0 0 0 0]  1.48e-05;
+    rho             [1 -3 0 0 0 0 0] 1;
 }
 
-sigma           sigma [ 1 0 -2 0 0 0 0 ] 0;
+sigma           [1 0 -2 0 0 0 0] 0;
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/angledDuct/constant/transportProperties b/tutorials/multiphase/interFoam/ras/angledDuct/constant/transportProperties
index 81106f5ea4c..577be61a90e 100644
--- a/tutorials/multiphase/interFoam/ras/angledDuct/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/ras/angledDuct/constant/transportProperties
@@ -20,48 +20,18 @@ phases (water air);
 water
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1000;
-    CrossPowerLawCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        m               m [ 0 0 1 0 0 0 0 ] 1;
-        n               n [ 0 0 0 0 0 0 0 ] 0;
-    }
-
-    BirdCarreauCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        k               k [ 0 0 1 0 0 0 0 ] 99.6;
-        n               n [ 0 0 0 0 0 0 0 ] 0.1003;
-    }
+    nu              [0 2 -1 0 0 0 0] 1e-06;
+    rho             [1 -3 0 0 0 0 0] 1000;
 }
 
 air
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
-    CrossPowerLawCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        m               m [ 0 0 1 0 0 0 0 ] 1;
-        n               n [ 0 0 0 0 0 0 0 ] 0;
-    }
-
-    BirdCarreauCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        k               k [ 0 0 1 0 0 0 0 ] 99.6;
-        n               n [ 0 0 0 0 0 0 0 ] 0.1003;
-    }
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
+    rho             [1 -3 0 0 0 0 0] 1;
 }
 
-sigma           sigma [ 1 0 -2 0 0 0 0 ] 0.07;
+sigma           [1 0 -2 0 0 0 0] 0.07;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/transportProperties b/tutorials/multiphase/interFoam/ras/damBreak/constant/transportProperties
index 81106f5ea4c..577be61a90e 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/ras/damBreak/constant/transportProperties
@@ -20,48 +20,18 @@ phases (water air);
 water
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1000;
-    CrossPowerLawCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        m               m [ 0 0 1 0 0 0 0 ] 1;
-        n               n [ 0 0 0 0 0 0 0 ] 0;
-    }
-
-    BirdCarreauCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        k               k [ 0 0 1 0 0 0 0 ] 99.6;
-        n               n [ 0 0 0 0 0 0 0 ] 0.1003;
-    }
+    nu              [0 2 -1 0 0 0 0] 1e-06;
+    rho             [1 -3 0 0 0 0 0] 1000;
 }
 
 air
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
-    CrossPowerLawCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        m               m [ 0 0 1 0 0 0 0 ] 1;
-        n               n [ 0 0 0 0 0 0 0 ] 0;
-    }
-
-    BirdCarreauCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        k               k [ 0 0 1 0 0 0 0 ] 99.6;
-        n               n [ 0 0 0 0 0 0 0 ] 0.1003;
-    }
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
+    rho             [1 -3 0 0 0 0 0] 1;
 }
 
-sigma           sigma [ 1 0 -2 0 0 0 0 ] 0.07;
+sigma           [1 0 -2 0 0 0 0] 0.07;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/transportProperties b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/transportProperties
index 81106f5ea4c..577be61a90e 100644
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/transportProperties
@@ -20,48 +20,18 @@ phases (water air);
 water
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1000;
-    CrossPowerLawCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        m               m [ 0 0 1 0 0 0 0 ] 1;
-        n               n [ 0 0 0 0 0 0 0 ] 0;
-    }
-
-    BirdCarreauCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        k               k [ 0 0 1 0 0 0 0 ] 99.6;
-        n               n [ 0 0 0 0 0 0 0 ] 0.1003;
-    }
+    nu              [0 2 -1 0 0 0 0] 1e-06;
+    rho             [1 -3 0 0 0 0 0] 1000;
 }
 
 air
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
-    CrossPowerLawCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        m               m [ 0 0 1 0 0 0 0 ] 1;
-        n               n [ 0 0 0 0 0 0 0 ] 0;
-    }
-
-    BirdCarreauCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        k               k [ 0 0 1 0 0 0 0 ] 99.6;
-        n               n [ 0 0 0 0 0 0 0 ] 0.1003;
-    }
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
+    rho             [1 -3 0 0 0 0 0] 1;
 }
 
-sigma           sigma [ 1 0 -2 0 0 0 0 ] 0.07;
+sigma           [1 0 -2 0 0 0 0] 0.07;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/constant/transportProperties b/tutorials/multiphase/interFoam/ras/waterChannel/constant/transportProperties
index b86717bf8d7..4c569fe731c 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/constant/transportProperties
@@ -20,18 +20,18 @@ phases (water air);
 water
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ]  1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1000;
+    nu              [0 2 -1 0 0 0 0]  1e-06;
+    rho             [1 -3 0 0 0 0 0] 1000;
 }
 
 air
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ]  1.48e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
+    nu              [0 2 -1 0 0 0 0]  1.48e-05;
+    rho             [1 -3 0 0 0 0 0] 1;
 }
 
-sigma           sigma [ 1 0 -2 0 0 0 0 ] 0.07;
+sigma           [1 0 -2 0 0 0 0] 0.07;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/transportProperties b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/transportProperties
index 81106f5ea4c..577be61a90e 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/transportProperties
@@ -20,48 +20,18 @@ phases (water air);
 water
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1000;
-    CrossPowerLawCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        m               m [ 0 0 1 0 0 0 0 ] 1;
-        n               n [ 0 0 0 0 0 0 0 ] 0;
-    }
-
-    BirdCarreauCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        k               k [ 0 0 1 0 0 0 0 ] 99.6;
-        n               n [ 0 0 0 0 0 0 0 ] 0.1003;
-    }
+    nu              [0 2 -1 0 0 0 0] 1e-06;
+    rho             [1 -3 0 0 0 0 0] 1000;
 }
 
 air
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
-    CrossPowerLawCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        m               m [ 0 0 1 0 0 0 0 ] 1;
-        n               n [ 0 0 0 0 0 0 0 ] 0;
-    }
-
-    BirdCarreauCoeffs
-    {
-        nu0             nu0 [ 0 2 -1 0 0 0 0 ] 0.0142515;
-        nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
-        k               k [ 0 0 1 0 0 0 0 ] 99.6;
-        n               n [ 0 0 0 0 0 0 0 ] 0.1003;
-    }
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
+    rho             [1 -3 0 0 0 0 0] 1;
 }
 
-sigma           sigma [ 1 0 -2 0 0 0 0 ] 0.07;
+sigma           [1 0 -2 0 0 0 0] 0.07;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/transportProperties b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/transportProperties
index 83c4643a5ae..307bc1aba94 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/transportProperties
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/transportProperties
@@ -20,22 +20,22 @@ phases (air other water);
 air
 {
     transportModel  Newtonian;
-    nu              nu [0 2 -1 0 0 0 0] 1.48e-05;
-    rho             rho [1 -3 0 0 0 0 0] 1;
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
+    rho             [1 -3 0 0 0 0 0] 1;
 }
 
 other
 {
     transportModel  Newtonian;
-    nu              nu [0 2 -1 0 0 0 0]  1e-6;
-    rho             rho [1 -3 0 0 0 0 0] 1010;
+    nu              [0 2 -1 0 0 0 0]  1e-6;
+    rho             [1 -3 0 0 0 0 0] 1010;
 }
 
 water
 {
     transportModel  Newtonian;
-    nu              nu [0 2 -1 0 0 0 0]  1e-6;
-    rho             rho [1 -3 0 0 0 0 0] 1000;
+    nu              [0 2 -1 0 0 0 0]  1e-6;
+    rho             [1 -3 0 0 0 0 0] 1000;
 }
 
 // Surface tension coefficients
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties
index be3d97f20ac..d3523579d45 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties
@@ -19,22 +19,22 @@ phases (water vapour);
 
 phaseChangeTwoPhaseMixture SchnerrSauer;
 
-pSat             pSat       [1 -1 -2 0 0]    2300;   // saturation pressure
+pSat            [1 -1 -2 0 0 0 0] 2300;   // Saturation pressure
 
-sigma           sigma [1 0 -2 0 0 0 0] 0.07;
+sigma           [1 0 -2 0 0 0 0]  0.07;
 
 water
 {
-    transportModel Newtonian;
-    nu              nu [0 2 -1 0 0 0 0] 9e-07;
-    rho             rho [1 -3 0 0 0 0 0] 1000;
+    transportModel  Newtonian;
+    nu              [0 2 -1 0 0 0 0] 9e-07;
+    rho             [1 -3 0 0 0 0 0] 1000;
 }
 
 vapour
 {
     transportModel Newtonian;
-    nu              nu [0 2 -1 0 0 0 0] 4.273e-04;
-    rho             rho [1 -3 0 0 0 0 0] 0.02308;
+    nu              [0 2 -1 0 0 0 0] 4.273e-04;
+    rho             [1 -3 0 0 0 0 0] 0.02308;
 }
 
 KunzCoeffs
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties
index a9e6e6525d1..e5342b55c66 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties
@@ -18,22 +18,22 @@ phases (water vapour);
 
 phaseChangeTwoPhaseMixture SchnerrSauer;
 
-pSat             pSat       [1 -1 -2 0 0]    2300;   // saturation pressure
+pSat            [1 -1 -2 0 0 0 0] 2300;   // Saturation pressure
 
-sigma           sigma [1 0 -2 0 0 0 0] 0.07;
+sigma           [1 0 -2 0 0 0 0]  0.07;
 
 water
 {
     transportModel Newtonian;
-    nu              nu [0 2 -1 0 0 0 0] 9e-07;
-    rho             rho [1 -3 0 0 0 0 0] 1000;
+    nu              [0 2 -1 0 0 0 0] 9e-07;
+    rho             [1 -3 0 0 0 0 0] 1000;
 }
 
 vapour
 {
     transportModel Newtonian;
-    nu              nu [0 2 -1 0 0 0 0] 4.273e-04;
-    rho             rho [1 -3 0 0 0 0 0] 0.02308;
+    nu              [0 2 -1 0 0 0 0] 4.273e-04;
+    rho             [1 -3 0 0 0 0 0] 0.02308;
 }
 
 KunzCoeffs
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/Theta b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/Theta
index e45304b8346..4cfbc0bbea6 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/Theta
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/Theta
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 0 2 -2 0 0 0 0 ];
+dimensions          [0 2 -2 0 0 0 0];
 
 internalField   uniform 0.0;
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/p_rgh
index 73510043119..ade3f71b27e 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/p_rgh
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/p_rgh
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 0;
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/transportProperties b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/transportProperties
index bb819c4d0aa..49a895f4e92 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/transportProperties
@@ -88,7 +88,7 @@ drag
 
 // This is a dummy to support the Smagorinsky model
 transportModel  Newtonian;
-nu              nu [ 0 2 -1 0 0 0 0 ] 0;
+nu              [0 2 -1 0 0 0 0] 0;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/transportProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/transportProperties
index 9ee595eb134..c74003969a9 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/transportProperties
@@ -230,7 +230,7 @@ drag
 
 // This is a dummy to support the Smagorinsky model
 transportModel  Newtonian;
-nu              nu [ 0 2 -1 0 0 0 0 ] 0;
+nu              [0 2 -1 0 0 0 0] 0;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/transportProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/transportProperties
index 9ee595eb134..c74003969a9 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/transportProperties
@@ -230,7 +230,7 @@ drag
 
 // This is a dummy to support the Smagorinsky model
 transportModel  Newtonian;
-nu              nu [ 0 2 -1 0 0 0 0 ] 0;
+nu              [0 2 -1 0 0 0 0] 0;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/epsilon b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/epsilon
index 3f507afed8e..753f6303ef6 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/epsilon
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/epsilon
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -3 0 0 0 0 ];
+dimensions      [0 2 -3 0 0 0 0];
 
 internalField   uniform 20;
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/k b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/k
index 4704b49c838..d611571ca1d 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/k
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/k
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [ 0 2 -2 0 0 0 0 ];
+dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform 0;
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/transportProperties
index 5cefec5d5a9..80369847029 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/transportProperties
@@ -242,7 +242,7 @@ drag
 
 // This is a dummy to support the Smagorinsky model
 transportModel  Newtonian;
-nu              nu [ 0 2 -1 0 0 0 0 ] 0;
+nu              [0 2 -1 0 0 0 0] 0;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/transportProperties b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/transportProperties
index 3cfdbabfaf9..fc103cc620d 100644
--- a/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/constant/transportProperties
@@ -20,29 +20,29 @@ phases
      water
      {
          transportModel Newtonian;
-         nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-         rho rho [ 1 -3 0 0 0 0 0 ] 1000;
+         nu [0 2 -1 0 0 0 0] 1e-06;
+         rho [1 -3 0 0 0 0 0] 1000;
      }
 
      oil
      {
          transportModel Newtonian;
-         nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-         rho rho [ 1 -3 0 0 0 0 0 ] 500;
+         nu [0 2 -1 0 0 0 0] 1e-06;
+         rho [1 -3 0 0 0 0 0] 500;
      }
 
      mercury
      {
          transportModel Newtonian;
-         nu nu [ 0 2 -1 0 0 0 0 ] 1.125e-07;
-         rho rho [ 1 -3 0 0 0 0 0 ] 13529;
+         nu [0 2 -1 0 0 0 0] 1.125e-07;
+         rho [1 -3 0 0 0 0 0] 13529;
      }
 
      air
      {
          transportModel Newtonian;
-         nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
-         rho rho [ 1 -3 0 0 0 0 0 ] 1;
+         nu [0 2 -1 0 0 0 0] 1.48e-05;
+         rho [1 -3 0 0 0 0 0] 1;
      }
 );
 
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary
index 1b4dbb60aae..79ef3a79e11 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary
@@ -20,18 +20,21 @@ FoamFile
     leftWall
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          50;
         startFace       4432;
     }
     rightWall
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          50;
         startFace       4482;
     }
     lowerWall
     {
         type            wall;
+        inGroups        1(wall);
         nFaces          62;
         startFace       4532;
     }
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties
index 3cfdbabfaf9..fc103cc620d 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties
@@ -20,29 +20,29 @@ phases
      water
      {
          transportModel Newtonian;
-         nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-         rho rho [ 1 -3 0 0 0 0 0 ] 1000;
+         nu [0 2 -1 0 0 0 0] 1e-06;
+         rho [1 -3 0 0 0 0 0] 1000;
      }
 
      oil
      {
          transportModel Newtonian;
-         nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-         rho rho [ 1 -3 0 0 0 0 0 ] 500;
+         nu [0 2 -1 0 0 0 0] 1e-06;
+         rho [1 -3 0 0 0 0 0] 500;
      }
 
      mercury
      {
          transportModel Newtonian;
-         nu nu [ 0 2 -1 0 0 0 0 ] 1.125e-07;
-         rho rho [ 1 -3 0 0 0 0 0 ] 13529;
+         nu [0 2 -1 0 0 0 0] 1.125e-07;
+         rho [1 -3 0 0 0 0 0] 13529;
      }
 
      air
      {
          transportModel Newtonian;
-         nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
-         rho rho [ 1 -3 0 0 0 0 0 ] 1;
+         nu [0 2 -1 0 0 0 0] 1.48e-05;
+         rho [1 -3 0 0 0 0 0] 1;
      }
 );
 
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties
index 3cfdbabfaf9..fc103cc620d 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties
@@ -20,29 +20,29 @@ phases
      water
      {
          transportModel Newtonian;
-         nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-         rho rho [ 1 -3 0 0 0 0 0 ] 1000;
+         nu [0 2 -1 0 0 0 0] 1e-06;
+         rho [1 -3 0 0 0 0 0] 1000;
      }
 
      oil
      {
          transportModel Newtonian;
-         nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-         rho rho [ 1 -3 0 0 0 0 0 ] 500;
+         nu [0 2 -1 0 0 0 0] 1e-06;
+         rho [1 -3 0 0 0 0 0] 500;
      }
 
      mercury
      {
          transportModel Newtonian;
-         nu nu [ 0 2 -1 0 0 0 0 ] 1.125e-07;
-         rho rho [ 1 -3 0 0 0 0 0 ] 13529;
+         nu [0 2 -1 0 0 0 0] 1.125e-07;
+         rho [1 -3 0 0 0 0 0] 13529;
      }
 
      air
      {
          transportModel Newtonian;
-         nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
-         rho rho [ 1 -3 0 0 0 0 0 ] 1;
+         nu [0 2 -1 0 0 0 0] 1.48e-05;
+         rho [1 -3 0 0 0 0 0] 1;
      }
 );
 
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/transportProperties
index 3cfdbabfaf9..fc103cc620d 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/transportProperties
@@ -20,29 +20,29 @@ phases
      water
      {
          transportModel Newtonian;
-         nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-         rho rho [ 1 -3 0 0 0 0 0 ] 1000;
+         nu [0 2 -1 0 0 0 0] 1e-06;
+         rho [1 -3 0 0 0 0 0] 1000;
      }
 
      oil
      {
          transportModel Newtonian;
-         nu nu [ 0 2 -1 0 0 0 0 ] 1e-06;
-         rho rho [ 1 -3 0 0 0 0 0 ] 500;
+         nu [0 2 -1 0 0 0 0] 1e-06;
+         rho [1 -3 0 0 0 0 0] 500;
      }
 
      mercury
      {
          transportModel Newtonian;
-         nu nu [ 0 2 -1 0 0 0 0 ] 1.125e-07;
-         rho rho [ 1 -3 0 0 0 0 0 ] 13529;
+         nu [0 2 -1 0 0 0 0] 1.125e-07;
+         rho [1 -3 0 0 0 0 0] 13529;
      }
 
      air
      {
          transportModel Newtonian;
-         nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
-         rho rho [ 1 -3 0 0 0 0 0 ] 1;
+         nu [0 2 -1 0 0 0 0] 1.48e-05;
+         rho [1 -3 0 0 0 0 0] 1;
      }
 );
 
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/transportProperties b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/transportProperties
index cc69c6944b4..6455cd8dfdd 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/transportProperties
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/transportProperties
@@ -16,7 +16,7 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [0 2 -1 0 0 0 0] 1e-06;
+nu              [0 2 -1 0 0 0 0] 1e-06;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/transportProperties b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/transportProperties
index cc69c6944b4..6455cd8dfdd 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/transportProperties
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/transportProperties
@@ -16,7 +16,7 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [0 2 -1 0 0 0 0] 1e-06;
+nu              [0 2 -1 0 0 0 0] 1e-06;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/Theta b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/Theta
index e45304b8346..4cfbc0bbea6 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/Theta
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/Theta
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 0 2 -2 0 0 0 0 ];
+dimensions          [0 2 -2 0 0 0 0];
 
 internalField   uniform 0.0;
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/p
index 961771c7279..0af317df792 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/p
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 1e5;
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/p_rgh
index 201275d8273..de5ac9e4379 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0/p_rgh
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 1e5;
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/Theta b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/Theta
index e45304b8346..4cfbc0bbea6 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/Theta
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/Theta
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 0 2 -2 0 0 0 0 ];
+dimensions          [0 2 -2 0 0 0 0];
 
 internalField   uniform 0.0;
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/p
index 961771c7279..0af317df792 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/p
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 1e5;
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/p_rgh
index 201275d8273..de5ac9e4379 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0/p_rgh
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 1e5;
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/p
index b7dd1c38648..ce57d661535 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/p
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 10e5;
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/p_rgh
index 0efd9743e0c..4b8924f06fa 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0/p_rgh
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 10e5;
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/Theta.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/Theta.particles
index c9b385ccd8b..f417c38e3ad 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/Theta.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0/Theta.particles
@@ -14,7 +14,7 @@ FoamFile
 }
 // ************************************************************************* //
 
-dimensions          [ 0 2 -2 0 0 0 0 ];
+dimensions          [0 2 -2 0 0 0 0];
 
 internalField       uniform 0;
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/Theta b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/Theta
index e45304b8346..4cfbc0bbea6 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/Theta
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/Theta
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 0 2 -2 0 0 0 0 ];
+dimensions          [0 2 -2 0 0 0 0];
 
 internalField   uniform 0.0;
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/p
index 961771c7279..0af317df792 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/p
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 1e5;
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/p_rgh
index 201275d8273..de5ac9e4379 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0/p_rgh
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 1e5;
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/p
index 961771c7279..0af317df792 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/p
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 1e5;
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/p_rgh
index 201275d8273..de5ac9e4379 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0/p_rgh
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 1e5;
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/p
index 961771c7279..0af317df792 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/p
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 1e5;
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/p_rgh
index 201275d8273..de5ac9e4379 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0/p_rgh
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 1e5;
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/Theta b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/Theta
index e45304b8346..4cfbc0bbea6 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/Theta
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/Theta
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 0 2 -2 0 0 0 0 ];
+dimensions          [0 2 -2 0 0 0 0];
 
 internalField   uniform 0.0;
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p
index 961771c7279..0af317df792 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 1e5;
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p_rgh
index 201275d8273..de5ac9e4379 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p_rgh
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 1e5;
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/Theta.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/Theta.particles
index c9b385ccd8b..f417c38e3ad 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/Theta.particles
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0/Theta.particles
@@ -14,7 +14,7 @@ FoamFile
 }
 // ************************************************************************* //
 
-dimensions          [ 0 2 -2 0 0 0 0 ];
+dimensions          [0 2 -2 0 0 0 0];
 
 internalField       uniform 0;
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/p
index ae586321875..84126539db9 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/p
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/p
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 1e5;
 
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/p_rgh
index 6723bb6a1e7..3659b453ff8 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/p_rgh
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0/p_rgh
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 1e5;
 
diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties
index 5c4f2ad6c66..38345834ae9 100644
--- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties
+++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties
@@ -15,23 +15,23 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Dab           Dab [0 2 -1 0 0 0 0]     1e-06;
-alphatab      alphatab [0 0 0 0 0 0 0] 1;
+Dab           [0 2 -1 0 0 0 0]    1e-06;
+alphatab      [0 0 0 0 0 0 0]     1;
 
 phases (sludge water);
 
 sludge
 {
     transportModel  Newtonian;
-    nu              nu [0 2 -1 0 0 0 0] 1e-06;
-    rho             rho [1 -3 0 0 0 0 0] 1000;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
+    rho             [1 -3 0 0 0 0 0] 1000;
 }
 
 water
 {
     transportModel  Newtonian;
-    nu              nu [0 2 -1 0 0 0 0] 1e-06;
-    rho             rho [1 -3 0 0 0 0 0] 990;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
+    rho             [1 -3 0 0 0 0 0] 990;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/Theta b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/Theta
index e45304b8346..4cfbc0bbea6 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/Theta
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/Theta
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 0 2 -2 0 0 0 0 ];
+dimensions          [0 2 -2 0 0 0 0];
 
 internalField   uniform 0.0;
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/p b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/p
index 961771c7279..0af317df792 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/p
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 1e5;
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/p_rgh
index 071e58a3951..9b695bbaa05 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0/p_rgh
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 1e5;
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/Theta b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/Theta
index e45304b8346..4cfbc0bbea6 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/Theta
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/Theta
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 0 2 -2 0 0 0 0 ];
+dimensions          [0 2 -2 0 0 0 0];
 
 internalField   uniform 0.0;
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/p b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/p
index 961771c7279..0af317df792 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/p
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 1e5;
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/p_rgh
index 071e58a3951..9b695bbaa05 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0/p_rgh
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 1e5;
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/Theta.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/Theta.particles
index c9b385ccd8b..f417c38e3ad 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/Theta.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0/Theta.particles
@@ -14,7 +14,7 @@ FoamFile
 }
 // ************************************************************************* //
 
-dimensions          [ 0 2 -2 0 0 0 0 ];
+dimensions          [0 2 -2 0 0 0 0];
 
 internalField       uniform 0;
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/Theta b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/Theta
index e45304b8346..4cfbc0bbea6 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/Theta
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/Theta
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 0 2 -2 0 0 0 0 ];
+dimensions          [0 2 -2 0 0 0 0];
 
 internalField   uniform 0.0;
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/p b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/p
index 961771c7279..0af317df792 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/p
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 1e5;
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/p_rgh
index 071e58a3951..9b695bbaa05 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0/p_rgh
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 1e5;
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/Theta b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/Theta
index e45304b8346..4cfbc0bbea6 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/Theta
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/Theta
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 0 2 -2 0 0 0 0 ];
+dimensions          [0 2 -2 0 0 0 0];
 
 internalField   uniform 0.0;
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p
index 961771c7279..0af317df792 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 1e5;
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p_rgh
index 071e58a3951..9b695bbaa05 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0/p_rgh
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 1e5;
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/Theta.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/Theta.particles
index c9b385ccd8b..f417c38e3ad 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/Theta.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0/Theta.particles
@@ -14,7 +14,7 @@ FoamFile
 }
 // ************************************************************************* //
 
-dimensions          [ 0 2 -2 0 0 0 0 ];
+dimensions          [0 2 -2 0 0 0 0];
 
 internalField       uniform 0;
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/p b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/p
index ae586321875..84126539db9 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/p
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 1e5;
 
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/p_rgh
index 6723bb6a1e7..3659b453ff8 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0/p_rgh
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 1e5;
 
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/D b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/D
index f1de6620b35..2faf71aca74 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/D
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/D
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 0 1 0 0 0 0 0 ];
+dimensions          [0 1 0 0 0 0 0];
 
 internalField       uniform ( 0 0 0 );
 
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/p b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/p
index c7a6d901f6f..98c43c54500 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/p
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/0/p
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [ 1 -1 -2 0 0 0 0 ];
+dimensions          [1 -1 -2 0 0 0 0];
 
 internalField       uniform 0;
 
-- 
GitLab