Merge branch 'tutorial-heat-transfer' into 'develop'

TUT: heatTransfer: clean up tutorials

See merge request Development/openfoam!458

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/T

@@ -25,11 +25,13 @@ boundaryField
         type            fixedValue;
         value           uniform 301;
     }
+
     ceiling
     {
         type            fixedValue;
         value           uniform 300;
     }
+
     sideWalls
     {
         type            zeroGradient;
@@ -38,4 +40,5 @@ boundaryField
     #includeEtc "caseDicts/setConstraintTypes"
 }
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/U

@@ -28,4 +28,5 @@ boundaryField
     #includeEtc "caseDicts/setConstraintTypes"
 }
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/0/p_rgh

@@ -30,4 +30,5 @@ boundaryField
     #includeEtc "caseDicts/setConstraintTypes"
 }
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/constant/g

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/constant/transportProperties

@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      transportProperties;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 transportModel Newtonian;
@@ -32,4 +31,5 @@ Pr              1.0;
 // Turbulent Prandtl number
 Prt             1.0;
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/constant/turbulenceProperties

@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType laminar;
+simulationType      laminar;
 
 RAS
 {

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/system/blockMeshDict

@@ -82,4 +82,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/system/controlDict

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -51,4 +50,5 @@ functions
     #includeFunc streamlines
 }
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/system/fvSchemes

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

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/system/fvSolution

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -44,7 +43,6 @@ solvers
         $T;
         relTol          0;
     }
-
 }
 
 PIMPLE

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/system/solverInfo

@@ -1,16 +1,4 @@
-/*--------------------------------*- C++ -*----------------------------------*\
+// -*- C++ -*-
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Website:  www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    For specified fields, writes out the initial residuals for the first
-    solution of each time step; for non-scalar fields (e.g. vectors), writes
-    the largest of the residuals for each component (e.g. x, y, z).
-
-\*---------------------------------------------------------------------------*/
 
 #includeEtc "caseDicts/postProcessing/numerical/solverInfo.cfg"
 
@@ -20,4 +8,5 @@ fields      (p_rgh);
 
 writeFields yes;
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/BenardCells/system/streamlines

@@ -1,14 +1,4 @@
-/*--------------------------------*- C++ -*----------------------------------*\
+// -*- C++ -*-
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Website:  www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    Writes out files of streamlines with interpolated field data in VTK format.
-
-\*---------------------------------------------------------------------------*/
 
 nLines  24;
 start   (0 0.5 0);
@@ -17,4 +7,5 @@ fields  (U);
 
 #includeEtc "caseDicts/postProcessing/visualization/streamlines.cfg"
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/T

@@ -25,15 +25,18 @@ boundaryField
         type            fixedValue;
         value           uniform 300;
     }
+
     ceiling
     {
         type            fixedValue;
         value           uniform 300;
     }
+
     fixedWalls
     {
         type            zeroGradient;
     }
 }
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/U

@@ -36,4 +36,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/alphat

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      alphat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -27,12 +26,14 @@ boundaryField
         Prt             0.85;
         value           uniform 0;
     }
+
     ceiling
     {
         type            alphatJayatillekeWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
+
     fixedWalls
     {
         type            alphatJayatillekeWallFunction;

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/epsilon

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      epsilon;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,11 +25,13 @@ boundaryField
         type            epsilonWallFunction;
         value           uniform 0.01;
     }
+
     ceiling
     {
         type            epsilonWallFunction;
         value           uniform 0.01;
     }
+
     fixedWalls
     {
         type            epsilonWallFunction;

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/k

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      k;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,11 +25,13 @@ boundaryField
         type            kqRWallFunction;
         value           uniform 0.1;
     }
+
     ceiling
     {
         type            kqRWallFunction;
         value           uniform 0.1;
     }
+
     fixedWalls
     {
         type            kqRWallFunction;

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/nut

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,11 +25,13 @@ boundaryField
         type            nutkWallFunction;
         value           uniform 0;
     }
+
     ceiling
     {
         type            nutkWallFunction;
         value           uniform 0;
     }
+
     fixedWalls
     {
         type            nutkWallFunction;

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/p

@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/0.orig/p_rgh

@@ -42,4 +42,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allclean

@@ -3,7 +3,6 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
 #------------------------------------------------------------------------------
 
-cleanCase
+cleanCase0
-rm -f 0/T
 
 #------------------------------------------------------------------------------

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun

@@ -3,9 +3,12 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
+restore0Dir
+
 runApplication blockMesh
-\cp 0/T.orig 0/T
+
 runApplication setFields
+
 runApplication $(getApplication)
 
 #------------------------------------------------------------------------------

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/g

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/transportProperties

@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      transportProperties;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 transportModel Newtonian;
@@ -32,4 +31,5 @@ Pr              0.7;
 // Turbulent Prandtl number
 Prt             0.85;
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/constant/turbulenceProperties

@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType RAS;
+simulationType      RAS;
 
 RAS
 {

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/blockMeshDict

@@ -72,4 +72,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/controlDict

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -49,4 +48,5 @@ adjustTimeStep  no;
 
 maxCo           0.5;
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSchemes

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -31,10 +30,13 @@ divSchemes
 
     div(phi,U)      Gauss upwind;
     div(phi,T)      Gauss upwind;
-    div(phi,k)      Gauss upwind;
+
-    div(phi,epsilon) Gauss upwind;
+    turbulence      Gauss upwind;
-    div(phi,R)      Gauss upwind;
+    div(phi,k)      $turbulence;
+    div(phi,epsilon) $turbulence;
+    div(phi,R)      $turbulence;
     div(R)          Gauss linear;
+
     div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSolution

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -65,4 +64,5 @@ relaxationFactors
     }
 }
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/setFieldsDict

@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      setFieldsDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 defaultFieldValues
@@ -22,7 +21,6 @@ defaultFieldValues
 
 regions
 (
-    // Set patch values (using ==)
     boxToFace
     {
         box (4.5 -1000 4.5) (5.5 1e-5 5.5);
@@ -34,4 +32,5 @@ regions
     }
 );
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/T

@@ -25,15 +25,18 @@ boundaryField
         type            fixedValue;
         value           uniform 300;
     }
+
     ceiling
     {
         type            fixedValue;
         value           uniform 300;
     }
+
     fixedWalls
     {
         type            zeroGradient;
     }
 }
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/U

@@ -36,4 +36,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/alphat

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      alphat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -27,12 +26,14 @@ boundaryField
         Prt             0.85;
         value           uniform 0;
     }
+
     ceiling
     {
         type            alphatJayatillekeWallFunction;
         Prt             0.85;
         value           uniform 0;
     }
+
     fixedWalls
     {
         type            alphatJayatillekeWallFunction;

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/epsilon

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      epsilon;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,11 +25,13 @@ boundaryField
         type            epsilonWallFunction;
         value           uniform 0.01;
     }
+
     ceiling
     {
         type            epsilonWallFunction;
         value           uniform 0.01;
     }
+
     fixedWalls
     {
         type            epsilonWallFunction;

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/k

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      k;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,11 +25,13 @@ boundaryField
         type            kqRWallFunction;
         value           uniform 0.1;
     }
+
     ceiling
     {
         type            kqRWallFunction;
         value           uniform 0.1;
     }
+
     fixedWalls
     {
         type            kqRWallFunction;

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/nut

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,11 +25,13 @@ boundaryField
         type            nutkWallFunction;
         value           uniform 0;
     }
+
     ceiling
     {
         type            nutkWallFunction;
         value           uniform 0;
     }
+
     fixedWalls
     {
         type            nutkWallFunction;

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/p

@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0.orig/p_rgh

@@ -42,4 +42,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allclean

@@ -3,7 +3,6 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
 #------------------------------------------------------------------------------
 
-cleanCase
+cleanCase0
-rm -f 0/T
 
 #------------------------------------------------------------------------------

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun

@@ -3,9 +3,12 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
+restore0Dir
+
 runApplication blockMesh
-\cp 0/T.orig 0/T
+
 runApplication setFields
+
 runApplication $(getApplication)
 
 #------------------------------------------------------------------------------

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/transportProperties

@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      transportProperties;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 transportModel Newtonian;
@@ -32,4 +31,5 @@ Pr              0.7;
 // Turbulent Prandtl number
 Prt             0.85;
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/turbulenceProperties

@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType RAS;
+simulationType      RAS;
 
 RAS
 {

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/blockMeshDict

@@ -72,4 +72,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict

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

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSchemes

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -31,8 +30,11 @@ divSchemes
 
     div(phi,U)      bounded Gauss upwind;
     div(phi,T)      bounded Gauss upwind;
-    div(phi,k)      bounded Gauss upwind;
+
-    div(phi,epsilon) bounded Gauss upwind;
+    turbulence      bounded Gauss upwind;
+    div(phi,k)      $turbulence;
+    div(phi,epsilon) $turbulence;
+
     div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution

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

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/setFieldsDict

@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      setFieldsDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 defaultFieldValues
@@ -22,7 +21,6 @@ defaultFieldValues
 
 regions
 (
-    // Set patch values (using ==)
     boxToFace
     {
         box (4.5 -1000 4.5) (5.5 1e-5 5.5);
@@ -34,4 +32,5 @@ regions
     }
 );
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allclean

@@ -0,0 +1,10 @@
+#!/bin/sh
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
+#------------------------------------------------------------------------------
+
+cleanCase0
+
+rm -rf constant/triSurface/
+
+#------------------------------------------------------------------------------

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun

@@ -3,24 +3,51 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
-runApplication blockMesh
+# settings
 
-# Serial
+    # flag to enable computations in parallel mode
-runApplication snappyHexMesh -overwrite
+    parallel=false
-runApplication $(getApplication)
+
+
+#------------------------------------------------------------------------------
+
+restore0Dir
+
+runApplication blockMesh
+
+mkdir -p constant/triSurface
+
+cp -f \
+    "$FOAM_TUTORIALS"/resources/geometry/fridgeA.eMesh \
+    constant/triSurface
+
+if [ "$parallel" = true ]
+then
+
+    runApplication decomposePar -fileHandler collated
+
+    runParallel snappyHexMesh -overwrite -fileHandler collated
+
+    ## Remove any include files from the field dictionaries
+    (   mkdir -p processors/0 && \
+        cd 0 && \
+        for f in *; do [ -f "$f" ] && \
+        foamDictionary "$f" > "../processors/0/$f"; done \
+    )
+
+    runParallel $(getApplication) -fileHandler collated
+
+    runApplication reconstructParMesh -constant
+
+    runApplication reconstructPar
+
+else
+
+    runApplication snappyHexMesh -overwrite
+
+    runApplication $(getApplication)
+
+fi
 
-## Parallel
-#runApplication decomposePar -fileHandler collated
-#runParallel snappyHexMesh -overwrite -fileHandler collated
-## Remove any include files from the field dictionaries
-#(   mkdir -p processors/0 && \
-#    cd 0 && \
-#    for f in *; do [ -f "$f" ] && \
-#    foamDictionary "$f" > "../processors/0/$f"; done \
-#)
-#
-#runParallel $(getApplication) -fileHandler collated
-#runApplication reconstructParMesh -constant
-#runApplication reconstructPar
 
 #------------------------------------------------------------------------------

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/g

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,4 +17,5 @@ FoamFile
 dimensions      [0 1 -2 0 0 0 0];
 value           (0 0 -9.81);
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/transportProperties

@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      transportProperties;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 transportModel Newtonian;
@@ -32,4 +31,5 @@ Pr              0.7;
 // Turbulent Prandtl number
 Prt             0.85;
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/turbulenceProperties

@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType RAS;
+simulationType      RAS;
 
 RAS
 {

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/blockMeshDict

@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      blockMeshDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 scale   1;
@@ -99,4 +98,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict

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

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/decomposeParDict

@@ -16,13 +16,7 @@ FoamFile
 
 numberOfSubdomains 2;
 
-method          scotch;
+method             scotch;
-
-//coeffs
-//{
-//    n           (3 2 1);
-//    dataFile    "cellDecomposition";
-//}
 
 
 // ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -31,10 +30,13 @@ divSchemes
 
     div(phi,U)      bounded Gauss upwind;
     div(phi,T)      bounded Gauss upwind;
-    div(phi,k)      bounded Gauss upwind;
+
-    div(phi,epsilon) bounded Gauss upwind;
+    turbulence      bounded Gauss upwind;
-    div(phi,R)      bounded Gauss upwind;
+    div(phi,k)      $turbulence;
+    div(phi,epsilon) $turbulence;
+    div(phi,R)      $turbulence;
     div(R)          Gauss linear;
+
     div((nuEff*dev2(T(grad(U))))) Gauss linear;
 }
 

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution

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

tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/U

@@ -36,4 +36,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/alphat

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      alphat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,11 +25,13 @@ boundaryField
         type            compressible::alphatWallFunction;
         value           uniform 0;
     }
+
     ceiling
     {
         type            compressible::alphatWallFunction;
         value           uniform 0;
     }
+
     fixedWalls
     {
         type            compressible::alphatWallFunction;

tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/epsilon

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      epsilon;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,11 +25,13 @@ boundaryField
         type            epsilonWallFunction;
         value           uniform 0.01;
     }
+
     ceiling
     {
         type            epsilonWallFunction;
         value           uniform 0.01;
     }
+
     fixedWalls
     {
         type            epsilonWallFunction;

tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/k

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      k;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,11 +25,13 @@ boundaryField
         type            kqRWallFunction;
         value           uniform 0.1;
     }
+
     ceiling
     {
         type            kqRWallFunction;
         value           uniform 0.1;
     }
+
     fixedWalls
     {
         type            kqRWallFunction;

tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/nut

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,11 +25,13 @@ boundaryField
         type            nutkWallFunction;
         value           uniform 0;
     }
+
     ceiling
     {
         type            nutkWallFunction;
         value           uniform 0;
     }
+
     fixedWalls
     {
         type            nutkWallFunction;

tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/p

@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/0.orig/p_rgh

@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allrun

@@ -3,11 +3,12 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
-runApplication blockMesh
-
 restore0Dir
 
+runApplication blockMesh
+
 runApplication setFields
+
 runApplication $(getApplication)
 
 #------------------------------------------------------------------------------

tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/g

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties

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

tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/turbulenceProperties

@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-simulationType  RAS;
+simulationType      RAS;
 
 RAS
 {

tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/blockMeshDict

@@ -72,4 +72,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/controlDict

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -64,4 +63,5 @@ functions
     }
 }
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -29,14 +28,19 @@ divSchemes
 {
     default         none;
     div(phi,U)      Gauss upwind;
-    div(phi,h)      Gauss upwind;
+
-    div(phi,e)      Gauss upwind;
+    energy          Gauss upwind;
-    div(phi,k)      Gauss upwind;
+    div(phi,h)      $energy;
-    div(phi,epsilon) Gauss upwind;
+    div(phi,e)      $energy;
-    div(phi,R)      Gauss upwind;
     div(phi,K)      Gauss linear;
     div(phi,Ekp)    Gauss linear;
+
+    turbulence      Gauss upwind;
+    div(phi,k)      $turbulence;
+    div(phi,epsilon) $turbulence;
+    div(phi,R)      $turbulence;
     div(R)          Gauss linear;
+
     div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 

tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSolution

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

tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/setFieldsDict

@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      setFieldsDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 defaultFieldValues
@@ -22,7 +21,6 @@ defaultFieldValues
 
 regions
 (
-    // Set patch values (using ==)
     boxToFace
     {
         box (4.5 -1000 4.5) (5.5 1e-5 5.5);
@@ -34,4 +32,5 @@ regions
     }
 );
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/0.orig/IDefault

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      IDefault;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/0.orig/T

@@ -27,4 +27,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/0.orig/U

@@ -27,4 +27,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/0.orig/p

@@ -27,4 +27,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/0.orig/p_rgh

@@ -27,4 +27,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/Allclean

@@ -3,6 +3,6 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
 #------------------------------------------------------------------------------
 
-cleanCase
+cleanCase0
 
 #------------------------------------------------------------------------------

tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/Allrun

@@ -3,7 +3,10 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
+restore0Dir
+
 runApplication blockMesh
+
 runApplication $(getApplication)
 
 #------------------------------------------------------------------------------

tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/boundaryRadiationProperties

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      boundaryRadiationProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -23,4 +22,5 @@ FoamFile
     transmissivity  0.0;
 }
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/g

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/radiationProperties

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      radiationProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -43,4 +42,5 @@ scatterModel    none;
 
 sootModel       none;
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/thermophysicalProperties

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      thermophysicalProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,8 +25,6 @@ thermoType
     energy          sensibleEnthalpy;
 }
 
-//pRef            100000;
-
 mixture
 {
     specie

tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/constant/turbulenceProperties

@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/system/blockMeshDict

@@ -58,4 +58,5 @@ mergePatchPairs
 (
 );
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/system/controlDict

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -75,4 +74,5 @@ functions
     }
 }
 
+
 // ************************************************************************* //

tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/system/fvSchemes

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -28,15 +27,21 @@ gradSchemes
 divSchemes
 {
     default         none;
+
     div(phi,U)      Gauss upwind;
-    div(phi,h)      Gauss upwind;
+
-    div(phi,e)      Gauss upwind;
+    energy          Gauss upwind;
-    div(phi,k)      Gauss upwind;
+    div(phi,h)      $energy;
-    div(phi,epsilon) Gauss upwind;
+    div(phi,e)      $energy;
-    div(phi,R)      Gauss upwind;
     div(phi,K)      Gauss linear;
     div(phi,Ekp)    Gauss linear;
+
+    turbulence      Gauss upwind;
+    div(phi,k)      $turbulence;
+    div(phi,epsilon) $turbulence;
+    div(phi,R)      $turbulence;
     div(R)          Gauss linear;
+
     div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
     div(Ji,Ii_h)    Gauss linearUpwind grad(Ii_h);
 }

tutorials/heatTransfer/buoyantPimpleFoam/thermocoupleTestCase/system/fvSolution

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

tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/T

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      T;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/0.orig/U

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //