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.

applications/solvers/financial/financialFoam/createFields.H

@@ -14,16 +14,22 @@
 
 dimensionedScalar strike
 (
+    "strike",
+    dimLength,
     financialProperties.lookup("strike")
 );
 
 dimensionedScalar r
 (
+    "r",
+    dimless/dimTime,
     financialProperties.lookup("r")
 );
 
 dimensionedScalar sigma
 (
+    "sigma",
+    dimensionSet(0, 0, -0.5, 0, 0),
     financialProperties.lookup("sigma")
 );
 
@@ -73,14 +79,12 @@
     mesh.C()
 );
 
-//-    V == max(strike - P.x(), dimensionedScalar("0", V.dimensions(), 0.0));
 V == max
 (
     P.component(Foam::vector::X) - strike,
     dimensionedScalar("0", V.dimensions(), 0.0)
 );
 
-
 volScalarField delta
 (
     IOobject

applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/readTransportProperties.H

@@ -1,13 +1,18 @@
 singlePhaseTransportModel laminarTransport(U, phi);
 
 // Thermal expansion coefficient [1/K]
-    dimensionedScalar beta(laminarTransport.lookup("beta"));
+dimensionedScalar beta
+(
+    "beta",
+    dimless/dimTemperature,
+    laminarTransport.lookup("beta")
+);
 
 // Reference temperature [K]
-    dimensionedScalar TRef(laminarTransport.lookup("TRef"));
+dimensionedScalar TRef("TRef", dimTemperature, laminarTransport.lookup("TRef"));
 
 // Laminar Prandtl number
-    dimensionedScalar Pr(laminarTransport.lookup("Pr"));
+dimensionedScalar Pr("Pr", dimless, laminarTransport.lookup("Pr"));
 
 // Turbulent Prandtl number
-    dimensionedScalar Prt(laminarTransport.lookup("Prt"));
+dimensionedScalar Prt("Prt", dimless, laminarTransport.lookup("Prt"));

applications/solvers/incompressible/boundaryFoam/createFields.H

@@ -36,7 +36,7 @@
     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);

applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H

@@ -18,6 +18,8 @@
 
     dimensionedScalar rhoInfValue
     (
+        "rhoInf",
+        dimDensity,
         laminarTransport.lookup("rhoInf")
     );
 

applications/solvers/multiphase/cavitatingFoam/readThermodynamicProperties.H

@@ -12,16 +12,41 @@
     )
 );
 
-    dimensionedScalar psil(thermodynamicProperties.lookup("psil"));
+dimensionedScalar psil
+(
+    "psil",
+    dimCompressibility,
+    thermodynamicProperties.lookup("psil")
+);
 
-    dimensionedScalar rholSat(thermodynamicProperties.lookup("rholSat"));
+dimensionedScalar rholSat
+(
+    "rholSat",
+    dimDensity,
+    thermodynamicProperties.lookup("rholSat")
+);
 
-    dimensionedScalar psiv(thermodynamicProperties.lookup("psiv"));
+dimensionedScalar psiv
+(
+    "psiv",
+    dimCompressibility,
+    thermodynamicProperties.lookup("psiv")
+);
 
-    dimensionedScalar pSat(thermodynamicProperties.lookup("pSat"));
+dimensionedScalar pSat
+(
+    "pSat",
+    dimPressure,
+    thermodynamicProperties.lookup("pSat")
+);
 
 dimensionedScalar rhovSat("rhovSat", psiv*pSat);
 
 dimensionedScalar rhol0("rhol0", rholSat - pSat*psil);
 
-    dimensionedScalar rhoMin(thermodynamicProperties.lookup("rhoMin"));
+dimensionedScalar rhoMin
+(
+    "rhoMin",
+    dimDensity,
+    thermodynamicProperties.lookup("rhoMin")
+);

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());
 

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")),
+    rho1_("rho", dimDensity, nuModel1_->viscosityProperties().lookup("rho")),
-    rho2_(nuModel2_->viscosityProperties().lookup("rho")),
+    rho2_("rho", dimDensity, nuModel2_->viscosityProperties().lookup("rho")),
-    rho3_(nuModel3_->viscosityProperties().lookup("rho"))
+    rho3_("rho", dimDensity, nuModel3_->viscosityProperties().lookup("rho"))
 {
     alpha3_ == 1.0 - alpha1_ - alpha2_;
     calcNu();

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"))
 {}
 
 

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"))
 {}
 
 

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);

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;
+    nu0             [0 2 -1 0 0 0 0] 1e-03;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-05;
+    nuInf           [0 2 -1 0 0 0 0] 1e-05;
-    m               m     [ 0 0  1 0 0 0 0 ] 1;
+    m               [0 0  1 0 0 0 0] 1;
-    n               n     [ 0 0  0 0 0 0 0 ] 0.5;
+    n               [0 0  0 0 0 0 0] 0.5;
 }
 
 CrossPowerLawCoeffs
 {
-    nu0             nu0   [ 0 2 -1 0 0 0 0 ] 1e-03;
+    nu0             [0 2 -1 0 0 0 0] 1e-03;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-05;
+    nuInf           [0 2 -1 0 0 0 0] 1e-05;
-    m               m     [ 0 0  1 0 0 0 0 ] 1;
+    m               [0 0  1 0 0 0 0] 1;
-    n               n     [ 0 0  0 0 0 0 0 ] 0.5;
+    n               [0 0  0 0 0 0 0] 0.5;
 }
 
 powerLawCoeffs
 {
-    nuMax           nuMax [ 0 2 -1 0 0 0 0 ] 1e-03;
+    nuMax           [0 2 -1 0 0 0 0] 1e-03;
-    nuMin           nuMin [ 0 2 -1 0 0 0 0 ] 1e-05;
+    nuMin           [0 2 -1 0 0 0 0] 1e-05;
-    k               k     [ 0 2 -1 0 0 0 0 ] 1e-05;
+    k               [0 2 -1 0 0 0 0] 1e-05;
-    n               n     [ 0 0  0 0 0 0 0 ] 1;
+    n               [0 0  0 0 0 0 0] 1;
 }
 
 HerschelBulkleyCoeffs
 {
-    nu0             nu0   [ 0 2 -1 0 0 0 0 ] 1e-03;
+    nu0             [0 2 -1 0 0 0 0] 1e-03;
-    tau0            tau0  [ 0 2 -2 0 0 0 0 ] 1;
+    tau0            [0 2 -2 0 0 0 0] 1;
-    k               k     [ 0 2 -1 0 0 0 0 ] 1e-05;
+    k               [0 2 -1 0 0 0 0] 1e-05;
-    n               n     [ 0 0  0 0 0 0 0 ] 1;
+    n               [0 0  0 0 0 0 0] 1;
 }
 
 // ************************************************************************* //

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;
+    nu0             [0 2 -1 0 0 0 0] 1e-03;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-05;
+    nuInf           [0 2 -1 0 0 0 0] 1e-05;
-    m               m     [ 0 0  1 0 0 0 0 ] 1;
+    m               [0 0  1 0 0 0 0] 1;
-    n               n     [ 0 0  0 0 0 0 0 ] 0.5;
+    n               [0 0  0 0 0 0 0] 0.5;
 }
 
 CrossPowerLawCoeffs
 {
-    nu0             nu0   [ 0 2 -1 0 0 0 0 ] 1e-03;
+    nu0             [0 2 -1 0 0 0 0] 1e-03;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-05;
+    nuInf           [0 2 -1 0 0 0 0] 1e-05;
-    m               m     [ 0 0  1 0 0 0 0 ] 1;
+    m               [0 0  1 0 0 0 0] 1;
-    n               n     [ 0 0  0 0 0 0 0 ] 0.5;
+    n               [0 0  0 0 0 0 0] 0.5;
 }
 
 powerLawCoeffs
 {
-    nuMax           nuMax [ 0 2 -1 0 0 0 0 ] 1e-03;
+    nuMax           [0 2 -1 0 0 0 0] 1e-03;
-    nuMin           nuMin [ 0 2 -1 0 0 0 0 ] 1e-05;
+    nuMin           [0 2 -1 0 0 0 0] 1e-05;
-    k               k     [ 0 2 -1 0 0 0 0 ] 1e-05;
+    k               [0 2 -1 0 0 0 0] 1e-05;
-    n               n     [ 0 0  0 0 0 0 0 ] 1;
+    n               [0 0  0 0 0 0 0] 1;
 }
 
 HerschelBulkleyCoeffs
 {
-    nu0             nu0   [ 0 2 -1 0 0 0 0 ] 1e-03;
+    nu0             [0 2 -1 0 0 0 0] 1e-03;
-    tau0            tau0  [ 0 2 -2 0 0 0 0 ] 1;
+    tau0            [0 2 -2 0 0 0 0] 1;
-    k               k     [ 0 2 -1 0 0 0 0 ] 1e-05;
+    k               [0 2 -1 0 0 0 0] 1e-05;
-    n               n     [ 0 0  0 0 0 0 0 ] 1;
+    n               [0 0  0 0 0 0 0] 1;
 }
 
 // ************************************************************************* //

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;
+    nu0             [0 2 -1 0 0 0 0] 1e-03;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-05;
+    nuInf           [0 2 -1 0 0 0 0] 1e-05;
-    m               m     [ 0 0  1 0 0 0 0 ] 1;
+    m               [0 0  1 0 0 0 0] 1;
-    n               n     [ 0 0  0 0 0 0 0 ] 0.5;
+    n               [0 0  0 0 0 0 0] 0.5;
 }
 
 CrossPowerLawCoeffs
 {
-    nu0             nu0   [ 0 2 -1 0 0 0 0 ] 1e-03;
+    nu0             [0 2 -1 0 0 0 0] 1e-03;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-05;
+    nuInf           [0 2 -1 0 0 0 0] 1e-05;
-    m               m     [ 0 0  1 0 0 0 0 ] 1;
+    m               [0 0  1 0 0 0 0] 1;
-    n               n     [ 0 0  0 0 0 0 0 ] 0.5;
+    n               [0 0  0 0 0 0 0] 0.5;
 }
 
 powerLawCoeffs
 {
-    nuMax           nuMax [ 0 2 -1 0 0 0 0 ] 1e-03;
+    nuMax           [0 2 -1 0 0 0 0] 1e-03;
-    nuMin           nuMin [ 0 2 -1 0 0 0 0 ] 1e-05;
+    nuMin           [0 2 -1 0 0 0 0] 1e-05;
-    k               k     [ 0 2 -1 0 0 0 0 ] 1e-05;
+    k               [0 2 -1 0 0 0 0] 1e-05;
-    n               n     [ 0 0  0 0 0 0 0 ] 1;
+    n               [0 0  0 0 0 0 0] 1;
 }
 
 HerschelBulkleyCoeffs
 {
-    nu0             nu0   [ 0 2 -1 0 0 0 0 ] 1e-03;
+    nu0             [0 2 -1 0 0 0 0] 1e-03;
-    tau0            tau0  [ 0 2 -2 0 0 0 0 ] 1;
+    tau0            [0 2 -2 0 0 0 0] 1;
-    k               k     [ 0 2 -1 0 0 0 0 ] 1e-05;
+    k               [0 2 -1 0 0 0 0] 1e-05;
-    n               n     [ 0 0  0 0 0 0 0 ] 1;
+    n               [0 0  0 0 0 0 0] 1;
 }
 
 // ************************************************************************* //

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;
+    nu0             [0 2 -1 0 0 0 0] 1e-03;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-05;
+    nuInf           [0 2 -1 0 0 0 0] 1e-05;
-    m               m     [ 0 0  1 0 0 0 0 ] 1;
+    m               [0 0  1 0 0 0 0] 1;
-    n               n     [ 0 0  0 0 0 0 0 ] 0.5;
+    n               [0 0  0 0 0 0 0] 0.5;
 }
 
 CrossPowerLawCoeffs
 {
-    nu0             nu0   [ 0 2 -1 0 0 0 0 ] 1e-03;
+    nu0             [0 2 -1 0 0 0 0] 1e-03;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-05;
+    nuInf           [0 2 -1 0 0 0 0] 1e-05;
-    m               m     [ 0 0  1 0 0 0 0 ] 1;
+    m               [0 0  1 0 0 0 0] 1;
-    n               n     [ 0 0  0 0 0 0 0 ] 0.5;
+    n               [0 0  0 0 0 0 0] 0.5;
 }
 
 powerLawCoeffs
 {
-    nuMax           nuMax [ 0 2 -1 0 0 0 0 ] 1e-03;
+    nuMax           [0 2 -1 0 0 0 0] 1e-03;
-    nuMin           nuMin [ 0 2 -1 0 0 0 0 ] 1e-05;
+    nuMin           [0 2 -1 0 0 0 0] 1e-05;
-    k               k     [ 0 2 -1 0 0 0 0 ] 1e-05;
+    k               [0 2 -1 0 0 0 0] 1e-05;
-    n               n     [ 0 0  0 0 0 0 0 ] 1;
+    n               [0 0  0 0 0 0 0] 1;
 }
 
 HerschelBulkleyCoeffs
 {
-    nu0             nu0   [ 0 2 -1 0 0 0 0 ] 1e-03;
+    nu0             [0 2 -1 0 0 0 0] 1e-03;
-    tau0            tau0  [ 0 2 -2 0 0 0 0 ] 1;
+    tau0            [0 2 -2 0 0 0 0] 1;
-    k               k     [ 0 2 -1 0 0 0 0 ] 1e-05;
+    k               [0 2 -1 0 0 0 0] 1e-05;
-    n               n     [ 0 0  0 0 0 0 0 ] 1;
+    n               [0 0  0 0 0 0 0] 1;
 }
 
 // ************************************************************************* //

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);

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;

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

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")),
+    psiv_
-    psil_(compressibilityProperties_.lookup("psil")),
+    (
-    rhovSat_(compressibilityProperties_.lookup("rhovSat")),
+        "psiv",
-    rholSat_(compressibilityProperties_.lookup("rholSat"))
+        dimCompressibility,
+        compressibilityProperties_.lookup("psiv")
+    ),
+    psil_
+    (
+        "psil",
+        dimCompressibility,
+        compressibilityProperties_.lookup("psil")
+    ),
+    rhovSat_
+    (
+        "rhovSat",
+        dimDensity,
+        compressibilityProperties_.lookup("rhovSat")
+    ),
+    rholSat_
+    (
+        "rholSat",
+        dimDensity,
+        compressibilityProperties_.lookup("rholSat")
+    )
 {
     correct();
 }

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")),
+    psiv_
-    psil_(compressibilityProperties_.lookup("psil")),
+    (
-    rhovSat_(compressibilityProperties_.lookup("rhovSat")),
+        "psiv",
-    rholSat_(compressibilityProperties_.lookup("rholSat"))
+        dimCompressibility,
+        compressibilityProperties_.lookup("psiv")
+    ),
+    psil_
+    (
+        "psil",
+        dimCompressibility,
+        compressibilityProperties_.lookup("psil")
+    ),
+    rhovSat_
+    (
+        "rhovSat",
+        dimDensity,
+        compressibilityProperties_.lookup("rhovSat")
+    ),
+    rholSat_
+    (
+        "rholSat",
+        dimDensity,
+        compressibilityProperties_.lookup("rholSat")
+    )
 {
     correct();
 }

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")),
+    psiv_
-    psil_(compressibilityProperties_.lookup("psil"))
+    (
+        "psiv",
+        dimCompressibility,
+        compressibilityProperties_.lookup("psiv")
+    ),
+    psil_
+    (
+        "psil",
+        dimCompressibility,
+        compressibilityProperties_.lookup("psil")
+    )
 {
     correct();
     psi_.oldTime();

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")),
+    nu0_("nu0", dimViscosity, BirdCarreauCoeffs_.lookup("nu0")),
-    nuInf_(BirdCarreauCoeffs_.lookup("nuInf")),
+    nuInf_("nuInf", dimViscosity, BirdCarreauCoeffs_.lookup("nuInf")),
-    k_(BirdCarreauCoeffs_.lookup("k")),
+    k_("k", dimTime, BirdCarreauCoeffs_.lookup("k")),
-    n_(BirdCarreauCoeffs_.lookup("n")),
+    n_("n", dimless, BirdCarreauCoeffs_.lookup("n")),
     a_
     (
         BirdCarreauCoeffs_.lookupOrDefault

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")),
+    nu0_("nu0", dimViscosity, CrossPowerLawCoeffs_.lookup("nu0")),
-    nuInf_(CrossPowerLawCoeffs_.lookup("nuInf")),
+    nuInf_("nuInf", dimViscosity, CrossPowerLawCoeffs_.lookup("nuInf")),
-    m_(CrossPowerLawCoeffs_.lookup("m")),
+    m_("m", dimTime, CrossPowerLawCoeffs_.lookup("m")),
-    n_(CrossPowerLawCoeffs_.lookup("n")),
+    n_("n", dimless, CrossPowerLawCoeffs_.lookup("n")),
     nu_
     (
         IOobject

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")),
+    k_("k", dimViscosity, HerschelBulkleyCoeffs_.lookup("k")),
-    n_(HerschelBulkleyCoeffs_.lookup("n")),
+    n_("n", dimless, HerschelBulkleyCoeffs_.lookup("n")),
-    tau0_(HerschelBulkleyCoeffs_.lookup("tau0")),
+    tau0_("tau0", dimViscosity/dimTime, HerschelBulkleyCoeffs_.lookup("tau0")),
-    nu0_(HerschelBulkleyCoeffs_.lookup("nu0")),
+    nu0_("nu0", dimViscosity, HerschelBulkleyCoeffs_.lookup("nu0")),
     nu_
     (
         IOobject

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")),
+    k_("k", dimViscosity, powerLawCoeffs_.lookup("k")),
-    n_(powerLawCoeffs_.lookup("n")),
+    n_("n", dimless, powerLawCoeffs_.lookup("n")),
-    nuMin_(powerLawCoeffs_.lookup("nuMin")),
+    nuMin_("nuMin", dimViscosity, powerLawCoeffs_.lookup("nuMin")),
-    nuMax_(powerLawCoeffs_.lookup("nuMax")),
+    nuMax_("nuMax", dimViscosity, powerLawCoeffs_.lookup("nuMax")),
     nu_
     (
         IOobject

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_
     (

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;
 
 
 // ************************************************************************* //

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;
 
 // ************************************************************************* //

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;
+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;
-}
-
 
 // ************************************************************************* //

tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/physicalProperties

@@ -19,5 +19,4 @@ epsilon0        epsilon0 [ -1 -3 4 0 0 2 0 ] 8.85419e-12;
 
 k               k [-1 0 2 0 0 1 0] 0.00016;
 
-
 // ************************************************************************* //

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;
+mu              [1 1 -2 0 0 -2 0] 1;
-
-sigma           sigma [ -1 -3 3 0 0 2 0 ] 1;
 
+sigma           [-1 -3 3 0 0 2 0] 1;
 
 // ************************************************************************* //

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;
+xi              [0 0 -0.5 0 0 0 0] 0.1;
-
-eta             eta [ 0 0 0 0 0 0 0 ] 0;
 
+eta             [0 0 0 0 0 0 0] 0;
 
 // ************************************************************************* //

tutorials/financial/financialFoam/europeanCall/constant/polyMesh/boundary

@@ -32,6 +32,7 @@ FoamFile
     defaultFaces
     {
         type            empty;
+        inGroups        1(empty);
         nFaces          2000;
         startFace       501;
     }

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;
 
 // ************************************************************************* //

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;
 
 // ************************************************************************* //

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;
 
 // ************************************************************************* //

tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/transportProperties

@@ -17,23 +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;
-
-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;
-}
-
 
 // ************************************************************************* //

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;
+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;
-}
-
 
 // ************************************************************************* //

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;

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;
+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;
-}
 
 
 // ************************************************************************* //

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;
+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;
-}
-
 
 // ************************************************************************* //

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;
-
 
 // ************************************************************************* //

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;
-
 
 // ************************************************************************* //

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;
 
 
 // ************************************************************************* //

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;
 
 
 // ************************************************************************* //

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;
 
 
 // ************************************************************************* //

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;
 
 
 // ************************************************************************* //

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;
+    nu0         [0 2 -1 0 0 0 0]  0.01;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 10;
+    nuInf       [0 2 -1 0 0 0 0]  10;
-    m               m [ 0 0 1 0 0 0 0 ] 0.4;
+    m           [0 0 1 0 0 0 0]   0.4;
-    n               n [ 0 0 0 0 0 0 0 ] 3;
+    n           [0 0 0 0 0 0 0]   3;
 }
 
 BirdCarreauCoeffs
 {
-    nu0             nu0 [ 0 2 -1 0 0 0 0 ] 1e-06;
+    nu0         [0 2 -1 0 0 0 0]  1e-06;
-    nuInf           nuInf [ 0 2 -1 0 0 0 0 ] 1e-06;
+    nuInf       [0 2 -1 0 0 0 0]  1e-06;
-    k               k [ 0 0 1 0 0 0 0 ] 0;
+    k           [0 0 1 0 0 0 0]   0;
-    n               n [ 0 0 0 0 0 0 0 ] 1;
+    n           [0 0 0 0 0 0 0]   1;
 }
 
-
 // ************************************************************************* //

tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/transportProperties

@@ -17,23 +17,7 @@ FoamFile
 
 transportModel  Newtonian;
 
-nu              nu [ 0 2 -1 0 0 0 0 ] 1e-05;
+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;
-}
 
 
 // ************************************************************************* //

tutorials/incompressible/pimpleDyMFoam/movingCone/constant/transportProperties

@@ -17,23 +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;
-
-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;
-}
-
 
 // ************************************************************************* //

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;
 
 // ************************************************************************* //

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;
 
 // ************************************************************************* //

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;
 
 // ************************************************************************* //

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;
 
 // ************************************************************************* //

tutorials/incompressible/pimpleFoam/TJunction/constant/transportProperties

@@ -17,23 +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;
-
-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;
-}
-
 
 // ************************************************************************* //

tutorials/incompressible/pimpleFoam/TJunctionFan/constant/transportProperties

@@ -17,23 +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;
-
-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;
-}
-
 
 // ************************************************************************* //

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;
+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;
-}
-
 
 // ************************************************************************* //

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;
+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;
-}
-
 
 // ************************************************************************* //

tutorials/incompressible/pimpleFoam/pitzDaily/constant/transportProperties

@@ -17,23 +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;
-
-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;
-}
-
 
 // ************************************************************************* //

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;
 
 // ************************************************************************* //

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;
+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;
-}
-
 
 // ************************************************************************* //

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;
+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;
-}
-
 
 // ************************************************************************* //

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;
+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;
-}
-
 
 // ************************************************************************* //

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;
+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;
-}
-
 
 // ************************************************************************* //

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;
 
 // ************************************************************************* //

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;
 
 // ************************************************************************* //

tutorials/incompressible/simpleFoam/airFoil2D/constant/transportProperties

@@ -17,25 +17,8 @@ FoamFile
 
 transportModel  Newtonian;
 
-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 ] 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;
 
 // ************************************************************************* //

tutorials/incompressible/simpleFoam/mixerVessel2D/constant/transportProperties

@@ -17,23 +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;
-
-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;
-}
-
 
 // ************************************************************************* //

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;
 
 // ************************************************************************* //

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;
 
 
 // ************************************************************************* //

tutorials/incompressible/simpleFoam/pitzDaily/constant/transportProperties

@@ -17,23 +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;
-
-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;
-}
-
 
 // ************************************************************************* //

tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/transportProperties

@@ -17,23 +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;
-
-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;
-}
-
 
 // ************************************************************************* //

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;
 
 // ************************************************************************* //

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;
 
 // ************************************************************************* //

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;
 
 // ************************************************************************* //

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;
 
 // ************************************************************************* //

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;
 
 // ************************************************************************* //

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;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 300;
+    rho             [1 -3 0 0 0 0 0] 300;
 }
 
 phase2
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-6;
+    nu              [0 2 -1 0 0 0 0] 1e-6;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1027;
+    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;
 
 // ************************************************************************* //

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;
 
 
 // ************************************************************************* //

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;
 
 
 // ************************************************************************* //

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;
+    nu              [0 2 -1 0 0 0 0] 7.831e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 830;
+    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;
-    }
 }
 
 vapour
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 4.252e-05;
+    nu              [0 2 -1 0 0 0 0] 4.252e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 0.14;
+    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;
-    }
 }
 
 

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;
 
 
 // ************************************************************************* //

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;
+    nu              [0 2 -1 0 0 0 0] 7.831e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 830;
+    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;
-    }
 }
 
 vapour
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 4.252e-05;
+    nu              [0 2 -1 0 0 0 0] 4.252e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 0.14;
+    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;
-    }
-}
-
-
 // ************************************************************************* //

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;
+pSat            [1 -1 -2 0 0] 4500;
-
-rhoMin          rhoMin [ 1 -3 0 0 0 ] 0.001;
 
+rhoMin          [1 -3 0 0 0] 0.001;
 
 // ************************************************************************* //

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;
+    nu              [0 2 -1 0 0 0 0] 7.831e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 830;
+    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;
-    }
 }
 
 vapour
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 4.252e-05;
+    nu              [0 2 -1 0 0 0 0] 4.252e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 0.14;
+    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;
-    }
-}
-
-
 // ************************************************************************* //

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;
 
 // ************************************************************************* //

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;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 998.2;
+    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;
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
+    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;
 
 
 // ************************************************************************* //

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;
 
 // ************************************************************************* //

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;
 
 // ************************************************************************* //

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;
     }

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
 (

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;
+    nu              [0 2 -1 0 0 0 0]  1.09e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 998.8;
+    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;
+    nu              [0 2 -1 0 0 0 0]  1.48e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
+    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;
 
 // ************************************************************************* //

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;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1000;
+    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;
-    }
 }
 
 air
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
+    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
+sigma           [1 0 -2 0 0 0 0] 0.07;
-    {
-        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;
-    }
-}
-
-sigma           sigma [ 1 0 -2 0 0 0 0 ] 0.07;
 
 
 // ************************************************************************* //

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;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 998.2;
+    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;
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
+    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;
 
 
 // ************************************************************************* //

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;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 300;
+    rho             [1 -3 0 0 0 0 0] 300;
 }
 
 air
 {
     transportModel  Newtonian;
-    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-6;
+    nu              [0 2 -1 0 0 0 0] 1e-6;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1027;
+    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;
 
 // ************************************************************************* //

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;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 998.2;
+    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;
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
+    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;
-
 
 // ************************************************************************* //

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;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 998.2;
+    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;
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
+    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;
 
 
 // ************************************************************************* //

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;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 998.2;
+    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;
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
+    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;
-
 
 // ************************************************************************* //

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;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 998.2;
+    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;
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
+    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;
 
 
 // ************************************************************************* //

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;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 998.2;
+    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;
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
+    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;
-
 
 // ************************************************************************* //

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;
+    nu              [0 2 -1 0 0 0 0] 1e-06;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 998.2;
+    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;
+    nu              [0 2 -1 0 0 0 0] 1.48e-05;
-    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
+    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;
 
 
 // ************************************************************************* //