multiphaseEulerFoam: Formatting improvements to population balance test cases

Patch contributed by Institute of Fluid Dynamics,
Helmholtz-Zentrum Dresden - Rossendorf (HZDR)

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.air1

@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.air1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
+boundaryField   {}
-{
-}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.air2

@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.air2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
+boundaryField   {}
-{
-}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.air3

@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.air3;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
+boundaryField   {}
-{
-}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.water

@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
+boundaryField   {}
-{
-}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.air1

@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.air1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.air2

@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.air2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.air3

@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.air3;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.water

@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.air1

@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0;
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.air2

@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0;
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.air3

@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0.05;
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.water

@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0.95;
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air1

@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 1.0;
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air2

@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 1.0;
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air3

@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 1.0;
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/p

@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [1 -1 -2 0 0 0 0];
+dimensions      [1 -1 -2 0 0 0 0];
 
-internalField       uniform 1e5;
+internalField   uniform 1e5;
 
-boundaryField
+boundaryField   {}
-{
-}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/p_rgh

@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      p_rgh;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [1 -1 -2 0 0 0 0];
+dimensions      [1 -1 -2 0 0 0 0];
 
-internalField       uniform 1e5;
+internalField   uniform 1e5;
 
-boundaryField
+boundaryField   {}
-{
-}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/Allclean

@@ -1,7 +1,11 @@
 #!/bin/sh
 
-cd ${0%/*} || exit 1
+# Run from this directory
+cd "${0%/*}" || exit 1
 
+# Source clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase && rm -f numberDensity.eps
+
+#------------------------------------------------------------------------------

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/Allrun

@@ -1,14 +1,13 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
 
-# Source tutorial run functions
+# Run from this directory
+cd "${0%/*}" || exit 1
+
+# Source run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Set application name
-application=$(getApplication)
-
 runApplication blockMesh
-runApplication $application
+runApplication $(getApplication)
 
 ( cd validation && ./createGraphs )
 

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/g

@@ -18,5 +18,4 @@ FoamFile
 dimensions      [0 1 -2 0 0 0 0];
 value           (0 0 0);
 
-
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air1

@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
@@ -45,5 +44,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air2

@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
@@ -45,5 +44,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air3

@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
@@ -45,5 +44,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.water

@@ -20,7 +20,7 @@ thermoType
     type            heRhoThermo;
     mixture         pureMixture;
     transport       const;
-    thermo          eConst;
+    thermo          hConst;
     equationOfState rhoConst;
     specie          specie;
     energy          sensibleInternalEnergy;
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   18;
     }
     equationOfState
@@ -39,7 +38,7 @@ mixture
     }
     thermodynamics
     {
-        Cv          4195;
+        Cp          4195;
         Hf          0;
     }
     transport
@@ -49,5 +48,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/blockMeshDict

@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      blockMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/fvSchemes

@@ -29,7 +29,7 @@ divSchemes
 {
     default                         none;
 
-    "div\(phi,alpha.*)"             Gauss vanLeer;
+    "div\(phi,alpha.*\)"            Gauss vanLeer;
     "div\(alphaRhoPhi.*,U.*\)"      Gauss limitedLinearV 1;
     "div\(alphaPhi.*,f.*\)"         Gauss limitedLinear 1;
 

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/fvSolution

@@ -63,12 +63,6 @@ PIMPLE
 }
 
 relaxationFactors
-{
+{}
-    equations
-    {
-        "f.*"              1.0;
-    }
-}
-
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/validation/createGraphs

@@ -29,11 +29,11 @@ gnuplot<<EOF
 
     numberDensity = '../postProcessing/numberDensity/10/numberDensity.dat'
 
-    plot '<printf "1 0.05\n1 0\n"' w l t 'Init. Cond.',\
+    plot '<printf "1 0.05\n1 0\n"' w l lc rgb 'black' t 'Init. Cond.',\
-    n(x,10.0) ls 2 lc rgb 'black' t '[Ziff and McGrady, J. Phys. A: Math. Gen., 18: 3027-3037, 1985]',\
+    n(x,10.0) dt 2 lc rgb 'black' t 'Ziff and McGrady (1985)',\
-    numberDensity every ::0::19 u 1:4 w p pt 1 t 'air1',\
+    numberDensity every ::0::19 u 1:4 w p pt 1 lc rgb 'black' t 'air1',\
-    numberDensity every ::20::24 u 1:4 w p pt 5 t 'air2',\
+    numberDensity every ::20::24 u 1:4 w p pt 5 lc rgb 'black' t 'air2',\
-    numberDensity every ::25::28 u 1:4 w p pt 9 t 'air3'
+    numberDensity every ::25::28 u 1:4 w p pt 9 lc rgb 'black' t 'air3'
 EOF
 
 #------------------------------------------------------------------------------

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/T.air1

@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.air1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
+boundaryField   {}
-{
-}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/T.air2

@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.air2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
+boundaryField   {}
-{
-}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/T.air3

@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.air3;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
+boundaryField   {}
-{
-}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/T.water

@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
+boundaryField   {}
-{
-}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/U.air1

@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.air1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/U.air2

@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.air2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/U.air3

@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.air3;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/U.water

@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/alpha.air1

@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0;
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/alpha.air2

@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0;
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/alpha.air3

@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0.05;
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/alpha.water

@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0.95;
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air1

@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 1.0;
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air2

@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 1.0;
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air3

@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 1.0;
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/p

@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [1 -1 -2 0 0 0 0];
+dimensions      [1 -1 -2 0 0 0 0];
 
-internalField       uniform 1e5;
+internalField   uniform 1e5;
 
-boundaryField
+boundaryField   {}
-{
-}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/p_rgh

@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      p_rgh;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [1 -1 -2 0 0 0 0];
+dimensions      [1 -1 -2 0 0 0 0];
 
-internalField       uniform 1e5;
+internalField   uniform 1e5;
 
-boundaryField
+boundaryField   {}
-{
-}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/Allclean

@@ -1,7 +1,11 @@
 #!/bin/sh
 
-cd ${0%/*} || exit 1
+# Run from this directory
+cd "${0%/*}" || exit 1
 
+# Source clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase && rm -f numberDensity.eps
+
+#------------------------------------------------------------------------------

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/Allrun

@@ -1,14 +1,13 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
 
-# Source tutorial run functions
+# Run from this directory
+cd "${0%/*}" || exit 1
+
+# Source run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Set application name
-application=$(getApplication)
-
 runApplication blockMesh
-runApplication $application
+runApplication $(getApplication)
 
 ( cd validation && ./createGraphs )
 

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/g

@@ -18,5 +18,4 @@ FoamFile
 dimensions      [0 1 -2 0 0 0 0];
 value           (0 0 0);
 
-
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.air1

@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
@@ -45,5 +44,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.air2

@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
@@ -45,5 +44,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.air3

@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
@@ -45,5 +44,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.water

@@ -20,7 +20,7 @@ thermoType
     type            heRhoThermo;
     mixture         pureMixture;
     transport       const;
-    thermo          eConst;
+    thermo          hConst;
     equationOfState rhoConst;
     specie          specie;
     energy          sensibleInternalEnergy;
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   18;
     }
     equationOfState
@@ -39,7 +38,7 @@ mixture
     }
     thermodynamics
     {
-        Cv          4195;
+        Cp          4195;
         Hf          0;
     }
     transport
@@ -49,5 +48,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/blockMeshDict

@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      blockMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/fvSchemes

@@ -29,7 +29,7 @@ divSchemes
 {
     default                         none;
 
-    "div\(phi,alpha.*)"             Gauss vanLeer;
+    "div\(phi,alpha.*\)"            Gauss vanLeer;
     "div\(alphaRhoPhi.*,U.*\)"      Gauss limitedLinearV 1;
     "div\(alphaPhi.*,f.*\)"         Gauss limitedLinear 1;
 

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/fvSolution

@@ -63,12 +63,6 @@ PIMPLE
 }
 
 relaxationFactors
-{
+{}
-    equations
-    {
-        "f.*"              1.0;
-    }
-}
-
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/breakup/validation/createGraphs

@@ -29,11 +29,11 @@ gnuplot<<EOF
 
     numberDensity = '../postProcessing/numberDensity/10/numberDensity.dat'
 
-    plot '<printf "1 0.05\n1 0\n"' w l t 'Init. Cond.',\
+    plot '<printf "1 0.05\n1 0\n"' w l lc rgb 'black' t 'Init. Cond.',\
-    n(x,10.0) ls 2 lc rgb 'black' t '[Ziff and McGrady, J. Phys. A: Math. Gen., 18: 3027-3037, 1985]',\
+    n(x,10.0) dt 2 lc rgb 'black' t 'Ziff and McGrady (1985)',\
-    numberDensity every ::0::19 u 1:4 w p pt 1 t 'air1',\
+    numberDensity every ::0::19 u 1:4 w p pt 1 lc rgb 'black' t 'air1',\
-    numberDensity every ::20::24 u 1:4 w p pt 5 t 'air2',\
+    numberDensity every ::20::24 u 1:4 w p pt 5 lc rgb 'black' t 'air2',\
-    numberDensity every ::25::28 u 1:4 w p pt 9 t 'air3'
+    numberDensity every ::25::28 u 1:4 w p pt 9 lc rgb 'black' t 'air3'
 EOF
 
 #------------------------------------------------------------------------------

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/T.air1

@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.air1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
+boundaryField   {}
-{
-}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/T.air2

@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.air2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
+boundaryField   {}
-{
-}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/T.air3

@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.air3;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
+boundaryField   {}
-{
-}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/T.water

@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
+boundaryField   {}
-{
-}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/U.air1

@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.air1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/U.air2

@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.air2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/U.air3

@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.air3;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/U.water

@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/alpha.air1

@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 5.408481e-02;
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/alpha.air2

@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0;
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/alpha.air3

@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0;
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/alpha.water

@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 9.459152e-01;
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air1

@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 1.0;
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air2

@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 1.0;
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air3

@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 1.0;
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/p

@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [1 -1 -2 0 0 0 0];
+dimensions      [1 -1 -2 0 0 0 0];
 
-internalField       uniform 1e5;
+internalField   uniform 1e5;
 
-boundaryField
+boundaryField   {}
-{
-}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/p_rgh

@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      p_rgh;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [1 -1 -2 0 0 0 0];
+dimensions      [1 -1 -2 0 0 0 0];
 
-internalField       uniform 1e5;
+internalField   uniform 1e5;
 
-boundaryField
+boundaryField   {}
-{
-}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/Allclean

@@ -1,7 +1,11 @@
 #!/bin/sh
 
-cd ${0%/*} || exit 1
+# Run from this directory
+cd "${0%/*}" || exit 1
 
+# Source clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase && rm -f numberDensity.eps
+
+#------------------------------------------------------------------------------

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/Allrun

@@ -1,14 +1,13 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
 
-# Source tutorial run functions
+# Run from this directory
+cd "${0%/*}" || exit 1
+
+# Source run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Set application name
-application=$(getApplication)
-
 runApplication blockMesh
-runApplication $application
+runApplication $(getApplication)
 
 ( cd validation && ./createGraphs )
 

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/g

@@ -18,5 +18,4 @@ FoamFile
 dimensions      [0 1 -2 0 0 0 0];
 value           (0 0 0);
 
-
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.air1

@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
@@ -45,5 +44,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.air2

@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
@@ -45,5 +44,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.air3

@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
@@ -45,5 +44,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.water

@@ -20,7 +20,7 @@ thermoType
     type            heRhoThermo;
     mixture         pureMixture;
     transport       const;
-    thermo          eConst;
+    thermo          hConst;
     equationOfState rhoConst;
     specie          specie;
     energy          sensibleInternalEnergy;
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   18;
     }
     equationOfState
@@ -39,7 +38,7 @@ mixture
     }
     thermodynamics
     {
-        Cv          4195;
+        Cp          4195;
         Hf          0;
     }
     transport
@@ -49,5 +48,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/blockMeshDict

@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      blockMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/fvSchemes

@@ -29,7 +29,7 @@ divSchemes
 {
     default                         none;
 
-    "div\(phi,alpha.*)"             Gauss vanLeer;
+    "div\(phi,alpha.*\)"            Gauss vanLeer;
     "div\(alphaRhoPhi.*,U.*\)"      Gauss limitedLinearV 1;
     "div\(alphaPhi.*,f.*\)"         Gauss limitedLinear 1;
 

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/fvSolution

@@ -63,12 +63,6 @@ PIMPLE
 }
 
 relaxationFactors
-{
+{}
-    equations
-    {
-        "f.*"              1.0;
-    }
-}
-
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/validation/createGraphs

@@ -50,10 +50,10 @@ gnuplot<<EOF
     numberDensity = '../postProcessing/numberDensity/10/numberDensity.dat'
 
     plot n0(x) ls -1 t 'Initial Condition',\
-    n(x,10.0) ls 2 lc rgb 'black' t '[Scott, J. Atmos. Sci., 25: 54-65, 1968]',\
+    n(x,10.0) dt 2 lc rgb 'black' t 'Scott (1968)',\
-    numberDensity every ::0::46 u 1:4 w p pt 1 t 'air1',\
+    numberDensity every ::0::46 u 1:4 w p pt 1 lc rgb 'black' t 'air1',\
-    numberDensity every ::47::55 u 1:4 w p pt 5 t 'air2',\
+    numberDensity every ::47::55 u 1:4 w p pt 5 lc rgb 'black' t 'air2',\
-    numberDensity every ::56::70 u 1:4 w p pt 9 t 'air3'
+    numberDensity every ::56::70 u 1:4 w p pt 9 lc rgb 'black' t 'air3'
 EOF
 
 #------------------------------------------------------------------------------

test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/T.air

@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
+boundaryField   {}
-{
-}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/T.water

@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
+boundaryField   {}
-{
-}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/U.air

@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/U.water

@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/alpha.air

@@ -17,10 +17,8 @@ FoamFile
 
 dimensions      [0 0 0 0 0 0 0];
 
-internalField   uniform 0.0751237;
+internalField   uniform 0.066553351;
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/f.air

@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 1.0;
 
-boundaryField
+boundaryField   {}
-{
-}
 
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/p

@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [1 -1 -2 0 0 0 0];
+dimensions      [1 -1 -2 0 0 0 0];
 
-internalField       uniform 1e5;
+internalField   uniform 1e5;
 
-boundaryField
+boundaryField   {}
-{
-}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/p_rgh

@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      p_rgh;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [1 -1 -2 0 0 0 0];
+dimensions      [1 -1 -2 0 0 0 0];
 
-internalField       uniform 1e5;
+internalField   uniform 1e5;
 
-boundaryField
+boundaryField   {}
-{
-}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/drift/Allclean

@@ -1,7 +1,11 @@
 #!/bin/sh
 
-cd ${0%/*} || exit 1
+# Run from this directory
+cd "${0%/*}" || exit 1
 
+# Source clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase && rm -f moments.eps numberDensity.eps
+
+#------------------------------------------------------------------------------

test/multiphase/multiphaseEulerFoam/populationBalance/drift/Allrun

@@ -1,14 +1,13 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
 
-# Source tutorial run functions
+# Run from this directory
+cd "${0%/*}" || exit 1
+
+# Source run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Set application name
-application=$(getApplication)
-
 runApplication blockMesh
-runApplication $application
+runApplication $(getApplication)
 
 ( cd validation && ./createGraphs )
 

test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/fvModels

@@ -21,7 +21,7 @@ airSource
 
     selectionMode   all;
 
-    massFlowRate    24.535;
+    massFlowRate    0.02186682;
 
     phase           air;
     rho             thermo:rho.air;
@@ -57,8 +57,6 @@ airSource
         f26.air     0;
         f27.air     0;
         f28.air     0;
-        f29.air     0;
-        f30.air     0;
     }
 }
 
@@ -68,7 +66,7 @@ waterSink
 
     selectionMode   all;
 
-    massFlowRate    -24535;
+    massFlowRate    -21.86682;
 
     phase           water;
     rho             thermo:rho.water;
@@ -77,5 +75,4 @@ waterSink
     {}
 }
 
-
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/g

@@ -18,5 +18,4 @@ FoamFile
 dimensions      [0 1 -2 0 0 0 0];
 value           (0 0 0);
 
-
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/phaseProperties

@@ -35,37 +35,35 @@ air
 
         sizeGroups
         (
-            f0 {dSph 1.240700982; value 0;}
+            f0 {dSph 1.000; value 0.0000;}
-            f1 {dSph 1.302736031; value 0;}
+            f1 {dSph 1.074; value 0.0000;}
-            f2 {dSph 1.364771080; value 0;}
+            f2 {dSph 1.147; value 0.0000;}
-            f3 {dSph 1.426806129; value 0;}
+            f3 {dSph 1.221; value 0.0000;}
-            f4 {dSph 1.488841178; value 0;}
+            f4 {dSph 1.294; value 0.0000;}
-            f5 {dSph 1.550876227; value 0.0609671;}
+            f5 {dSph 1.368; value 0.0000;}
-            f6 {dSph 1.612911276; value 0.0741729;}
+            f6 {dSph 1.441; value 0.0000;}
-            f7 {dSph 1.674946325; value 0.0895739;}
+            f7 {dSph 1.515; value 0.0000;}
-            f8 {dSph 1.736981375; value 0.1074333;}
+            f8 {dSph 1.588; value 0.0918;}
-            f9 {dSph 1.799016424; value 0.1280343;}
+            f9 {dSph 1.662; value 0.1151;}
-            f10{dSph 1.861051473; value 0.151681;}
+            f10{dSph 1.735; value 0.1429;}
-            f11{dSph 1.923086522; value 0.1786995;}
+            f11{dSph 1.809; value 0.1758;}
-            f12{dSph 1.985121571; value 0.209438;}
+            f12{dSph 1.882; value 0.2146;}
-            f13{dSph 2.047156620; value 0;}
+            f13{dSph 1.956; value 0.2599;}
-            f14{dSph 2.109191669; value 0;}
+            f14{dSph 2.029; value 0.0000;}
-            f15{dSph 2.171226718; value 0;}
+            f15{dSph 2.103; value 0.0000;}
-            f16{dSph 2.233261767; value 0;}
+            f16{dSph 2.176; value 0.0000;}
-            f17{dSph 2.295296816; value 0;}
+            f17{dSph 2.250; value 0.0000;}
-            f18{dSph 2.357331865; value 0;}
+            f18{dSph 2.323; value 0.0000;}
-            f19{dSph 2.419366915; value 0;}
+            f19{dSph 2.397; value 0.0000;}
-            f20{dSph 2.481401964; value 0;}
+            f20{dSph 2.470; value 0.0000;}
-            f21{dSph 2.543437013; value 0;}
+            f21{dSph 2.544; value 0.0000;}
-            f22{dSph 2.605472062; value 0;}
+            f22{dSph 2.617; value 0.0000;}
-            f23{dSph 2.667507111; value 0;}
+            f23{dSph 2.691; value 0.0000;}
-            f24{dSph 2.729542160; value 0;}
+            f24{dSph 2.764; value 0.0000;}
-            f25{dSph 2.791577209; value 0;}
+            f25{dSph 2.838; value 0.0000;}
-            f26{dSph 2.853612258; value 0;}
+            f26{dSph 2.911; value 0.0000;}
-            f27{dSph 2.915647307; value 0;}
+            f27{dSph 2.985; value 0.0000;}
-            f28{dSph 2.977682356; value 0;}
+            f28{dSph 3.058; value 0.0000;}
-            f29{dSph 3.039717405; value 0;}
-            f30{dSph 3.101752454; value 0;}
         );
     }
 

test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/thermophysicalProperties.air

@@ -20,7 +20,7 @@ thermoType
     type            heRhoThermo;
     mixture         pureMixture;
     transport       const;
-    thermo          eConst;
+    thermo          hConst;
     equationOfState rhoConst;
     specie          specie;
     energy          sensibleInternalEnergy;
@@ -38,7 +38,7 @@ mixture
     }
     thermodynamics
     {
-        Cv          1007;
+        Cp          1007;
         Hf          0;
     }
     transport
@@ -48,5 +48,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/thermophysicalProperties.water

@@ -20,7 +20,7 @@ thermoType
     type            heRhoThermo;
     mixture         pureMixture;
     transport       const;
-    thermo          eConst;
+    thermo          hConst;
     equationOfState rhoConst;
     specie          specie;
     energy          sensibleInternalEnergy;
@@ -38,7 +38,7 @@ mixture
     }
     thermodynamics
     {
-        Cv          4195;
+        Cp          4195;
         Hf          0;
     }
     transport
@@ -48,5 +48,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //

test/multiphase/multiphaseEulerFoam/populationBalance/drift/system/blockMeshDict

@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      blockMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,14 +19,14 @@ convertToMeters 1;
 
 vertices
 (
-    (0  0  0 )
+    (0 0 0)
-    (10 0  0 )
+    (1 0 0)
-    (10 10 0 )
+    (1 1 0)
-    (0  10 0 )
+    (0 1 0)
-    (0  0  10)
+    (0 0 1)
-    (10 0  10)
+    (1 0 1)
-    (10 10 10)
+    (1 1 1)
-    (0  10 10)
+    (0 1 1)
 );
 
 blocks