GIT: Initial state after latest Foundation merge

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun

@@ -7,7 +7,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 application=$(getApplication)
 
 runApplication blockMesh
-\cp 0/T.org 0/T
+\cp 0/T.orig 0/T
 runApplication setFields
 runApplication $application
 

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/system/fvSolution

@@ -33,7 +33,7 @@ solvers
 
     "(U|T|k|epsilon|R)"
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-6;
         relTol          0.1;

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun

@@ -7,7 +7,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 application=$(getApplication)
 
 runApplication blockMesh
-\cp 0/T.org 0/T
+\cp 0/T.orig 0/T
 runApplication setFields
 runApplication $application
 

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/fvSolution

@@ -27,7 +27,7 @@ solvers
 
     "(U|T|k|epsilon|R)"
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-05;
         relTol          0.1;

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSchemes

@@ -40,7 +40,7 @@ divSchemes
 
 laplacianSchemes
 {
-    default         Gauss linear limited corrected 0.333;
+    default         Gauss linear limited corrected 0.33;
     laplacian(diffusivity,cellDisplacement) Gauss linear corrected;
 }
 
@@ -51,7 +51,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default         limited corrected 0.333;
+    default         limited corrected 0.33;
 }
 
 

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/fvSolution

@@ -27,7 +27,7 @@ solvers
 
     "(U|T|k|epsilon)"
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-07;
         relTol          0.1;

tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean

@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-\cp 0/T.org 0/T
+\cp 0/T.orig 0/T
 
 #------------------------------------------------------------------------------

tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSolution

@@ -41,7 +41,7 @@ solvers
 
     "(U|h|e|k|epsilon|R)"
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-6;
         relTol          0.1;

tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allclean

@@ -5,7 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-rm -rf sets
 rm -f validation/*.eps
 
 #------------------------------------------------------------------------------

tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun

@@ -9,7 +9,7 @@ application=$(getApplication)
 
 runApplication blockMesh
 runApplication $application
-runApplication sample -latestTime
+runApplication -s sample  postProcess -latestTime -func sample
 
 ( cd validation && ./createGraphs )
 

tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/fvSolution

@@ -25,15 +25,11 @@ solvers
 
         smoother         DICGaussSeidel;
 
-        cacheAgglomeration true;
-        nCellsInCoarsestLevel 10;
-        agglomerator     faceAreaPair;
-        mergeLevels      1;
     }
 
     "(U|h|k|epsilon|omega)"
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-8;
         relTol          0.1;

tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sample

@@ -11,11 +11,14 @@ FoamFile
     format          ascii;
     class           dictionary;
     location        "system";
-    object          sampleDict;
+    object          sample;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+type sets;
+libs            ("libsampling.so");
+
 interpolationScheme cellPointFace;
 
 setFormat raw;

tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -86,7 +86,7 @@ then
     exit 1
 fi
 
-SETSDIR="../postProcessing/sets"
+SETSDIR="../postProcessing/sample"
 
 if [ ! -d $SETSDIR ]
 then

tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/baffle3DRegion/T

@@ -24,8 +24,7 @@ boundaryField
     bottom
     {
         type                compressible::thermalBaffle;
-        kappa               solidThermo;
-        kappaName           none;
+        kappaMethod         solidThermo;
         value               uniform 300;
     }
     side
@@ -35,8 +34,7 @@ boundaryField
     top
     {
         type                compressible::thermalBaffle;
-        kappa               solidThermo;
-        kappaName           none;
+        kappaMethod         solidThermo;
         value               uniform 300;
     }
 }

tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches

@@ -9,18 +9,16 @@
 T
 {
         type                compressible::thermalBaffle;
-        kappa               fluidThermo;
-        kappaName           none;
+        kappaMethod         fluidThermo;
         value               uniform 300;
 
-        regionName           ${baffleRegionName};
-        active               yes;
+        regionName          ${baffleRegionName};
+        active              yes;
 
         # include "3DbaffleSolidThermo"
 
         // New fvMesh (region) information
         # include "extrudeModel"
-
 }
 
 // ************************************************************************* //

tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/controlDict

@@ -44,6 +44,6 @@ timePrecision   6;
 
 runTimeModifiable true;
 
-libs ("libthermalBaffleModels.so");
+libs            ("libthermalBaffleModels.so");
 
 // ************************************************************************* //

tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/fvSolution

@@ -25,15 +25,11 @@ solvers
 
         smoother         DICGaussSeidel;
 
-        cacheAgglomeration true;
-        nCellsInCoarsestLevel 10;
-        agglomerator     faceAreaPair;
-        mergeLevels      1;
     }
 
     "(U|h|k|epsilon|omega)"
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-7;
         relTol          0.01;

tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/system/fvSolution

@@ -27,7 +27,7 @@ solvers
 
     "(U|h|k|epsilon)"
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-05;
         relTol          0.1;

tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/G

@@ -23,7 +23,6 @@ boundaryField
     ".*"
     {
         type            MarshakRadiation;
-        T               T;
         emissivityMode  lookup;
         emissivity      uniform 1.0;
         value           uniform 0;

tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/radiationProperties

@@ -25,7 +25,6 @@ fvDOMCoeffs
     nTheta      5;          // polar angles in PI (from Z to X-Y plane)
     convergence 1e-3;   // convergence criteria for radiation iteration
     maxIter     10;         // maximum number of iterations
-    cacheDiv    false;
 }
 
 // Number of flow iterations per radiation iteration

tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/system/fvSolution

@@ -31,18 +31,13 @@ solvers
         tolerance           1e-4;
         relTol              0;
         smoother            symGaussSeidel;
-        cacheAgglomeration  true;
-        nCellsInCoarsestLevel   10;
-        agglomerator        faceAreaPair;
-        mergeLevels         1;
         maxIter             5;
-        nPreSweeps          0;
         nPostSweeps         1;
     }
 
     "(U|h|k|epsilon)"
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-05;
         relTol          0.1;

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/T

@@ -52,24 +52,21 @@ boundaryField
         type            compressible::turbulentTemperatureCoupledBaffleMixed;
         value           uniform 300;
         Tnbr            T;
-        kappa           fluidThermo;
-        kappaName       none;
+        kappaMethod     fluidthermo;
     }
     bottomWater_to_leftSolid
     {
         type            compressible::turbulentTemperatureCoupledBaffleMixed;
         value           uniform 300;
         Tnbr            T;
-        kappa           fluidThermo;
-        kappaName       none;
+        kappaMethod     fluidthermo;
     }
     bottomWater_to_heater
     {
         type            compressible::turbulentTemperatureCoupledBaffleMixed;
         value           uniform 300;
         Tnbr            T;
-        kappa           fluidThermo;
-        kappaName       none;
+        kappaMethod     fluidthermo;
     }
 }
 

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun

@@ -18,7 +18,7 @@ done
 
 for i in bottomWater topAir heater leftSolid rightSolid
 do
-   runApplication -s $i  changeDictionary -region $i
+   runApplication -s $i changeDictionary -region $i
 done
 
 

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/changeDictionaryDict

@@ -14,158 +14,154 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+U
 {
-    U
+    internalField   uniform (0.001 0 0);
+
+    boundaryField
     {
-        internalField   uniform (0.001 0 0);
-
-        boundaryField
+        minX
         {
-            minX
-            {
-                type            fixedValue;
-                value           uniform (0.001 0 0);
-            }
+            type            fixedValue;
+            value           uniform (0.001 0 0);
+        }
 
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform (0 0 0);
-            }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform (0 0 0);
+        }
 
-            ".*"
-            {
-                type            fixedValue;
-                value           uniform (0 0 0);
-            }
+        ".*"
+        {
+            type            fixedValue;
+            value           uniform (0 0 0);
         }
     }
+}
 
-    T
+T
+{
+    internalField   uniform 300;
+
+    boundaryField
     {
-        internalField   uniform 300;
-
-        boundaryField
+        minX
         {
-            minX
-            {
-                type            fixedValue;
-                value           uniform 300;
-            }
+            type            fixedValue;
+            value           uniform 300;
+        }
 
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform 300;
-            }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform 300;
+        }
 
-            ".*"
-            {
-                type            zeroGradient;
-                value           uniform 300;
-            }
+        ".*"
+        {
+            type            zeroGradient;
+            value           uniform 300;
+        }
 
-            "bottomWater_to_.*"
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappa           fluidThermo;
-                kappaName       none;
-                value           uniform 300;
-            }
+        "bottomWater_to_.*"
+        {
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     fluidThermo;
+            value           uniform 300;
         }
     }
+}
 
-    epsilon
+epsilon
+{
+    internalField   uniform 0.01;
+
+    boundaryField
     {
-        internalField   uniform 0.01;
-
-        boundaryField
+        minX
         {
-            minX
-            {
-                type            fixedValue;
-                value           uniform 0.01;
-            }
+            type            fixedValue;
+            value           uniform 0.01;
+        }
 
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform 0.01;
-            }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform 0.01;
+        }
 
-            ".*"
-            {
-                type            epsilonWallFunction;
-                value           uniform 0.01;
-            }
+        ".*"
+        {
+            type            epsilonWallFunction;
+            value           uniform 0.01;
         }
     }
+}
 
-    k
+k
+{
+    internalField   uniform 0.1;
+
+    boundaryField
     {
-        internalField   uniform 0.1;
-
-        boundaryField
+        minX
         {
-            minX
-            {
-                type            inletOutlet;
-                inletValue      uniform 0.1;
-            }
+            type            inletOutlet;
+            inletValue      uniform 0.1;
+        }
 
-            maxX
-            {
-                type            zeroGradient;
-                value           uniform 0.1;
-            }
+        maxX
+        {
+            type            zeroGradient;
+            value           uniform 0.1;
+        }
 
-            ".*"
-            {
-                type            kqRWallFunction;
-                value           uniform 0.1;
-            }
+        ".*"
+        {
+            type            kqRWallFunction;
+            value           uniform 0.1;
         }
     }
+}
 
-    p_rgh
+p_rgh
+{
+    internalField   uniform 0;
+
+    boundaryField
     {
-        internalField   uniform 0;
-
-        boundaryField
+        minX
         {
-            minX
-            {
-                type            zeroGradient;
-                value           uniform 0;
-            }
+            type            zeroGradient;
+            value           uniform 0;
+        }
 
-            maxX
-            {
-                type            fixedValue;
-                value           uniform 0;
-            }
+        maxX
+        {
+            type            fixedValue;
+            value           uniform 0;
+        }
 
-            ".*"
-            {
-                type            fixedFluxPressure;
-                value           uniform 0;
-            }
+        ".*"
+        {
+            type            fixedFluxPressure;
+            value           uniform 0;
         }
     }
+}
 
-    p
+p
+{
+    internalField   uniform 0;
+
+    boundaryField
     {
-        internalField   uniform 0;
-
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 0;
-            }
+            type            calculated;
+            value           uniform 0;
         }
     }
 }

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/fvSolution

@@ -39,10 +39,6 @@ solvers
 
         smoother         GaussSeidel;
 
-        cacheAgglomeration  true;
-        nCellsInCoarsestLevel 10;
-        agglomerator     faceAreaPair;
-        mergeLevels      1;
     }
 
     p_rghFinal
@@ -54,7 +50,7 @@ solvers
 
     "(U|h|k|epsilon|R)"
     {
-        solver           PBiCG;
+        solver           PBiCGStab;
         preconditioner   DILU;
         tolerance        1e-7;
         relTol           0.1;
@@ -70,7 +66,7 @@ solvers
 
 PIMPLE
 {
-    momentumPredictor   on;
+    momentumPredictor   yes;
     nCorrectors         2;
     nNonOrthogonalCorrectors 0;
 }

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict

@@ -14,60 +14,55 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+boundary
 {
-    boundary
+    minY
     {
+        type            patch;
+    }
+    minZ
+    {
+        type            patch;
+    }
+    maxZ
+    {
+        type            patch;
+    }
+}
+
+T
+{
+    internalField   uniform 300;
+
+    boundaryField
+    {
+        ".*"
+        {
+            type            zeroGradient;
+            value           uniform 300;
+        }
+        "heater_to_.*"
+        {
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            value           uniform 300;
+        }
+
+        heater_to_leftSolid
+        {
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            thicknessLayers (1e-3);
+            kappaLayers     (5e-4);
+            value           uniform 300;
+        }
+
         minY
         {
-            type            patch;
-        }
-        minZ
-        {
-            type            patch;
-        }
-        maxZ
-        {
-            type            patch;
-        }
-    }
-
-    T
-    {
-        internalField   uniform 300;
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            zeroGradient;
-                value           uniform 300;
-            }
-            "heater_to_.*"
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappa           solidThermo;
-                kappaName       none;
-                value           uniform 300;
-            }
-
-            heater_to_leftSolid
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappa           solidThermo;
-                kappaName       none;
-                thicknessLayers (1e-3);
-                kappaLayers     (5e-4);
-                value           uniform 300;
-            }
-
-            minY
-            {
-                type            fixedValue;
-                value           uniform 500;
-            }
+            type            fixedValue;
+            value           uniform 500;
         }
     }
 }

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict

@@ -14,50 +14,45 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+boundary
 {
-    boundary
+    minZ
     {
-        minZ
-        {
-            type            patch;
-        }
-        maxZ
-        {
-            type            patch;
-        }
+        type            patch;
     }
-
-    T
+    maxZ
     {
-        internalField   uniform 300;
+        type            patch;
+    }
+}
 
-        boundaryField
+T
+{
+    internalField   uniform 300;
+
+    boundaryField
+    {
+        ".*"
         {
-            ".*"
-            {
-                type            zeroGradient;
-                value           uniform 300;
-            }
-            "leftSolid_to_.*"
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappa           solidThermo;
-                kappaName       none;
-                value           uniform 300;
-            }
+            type            zeroGradient;
+            value           uniform 300;
+        }
+        "leftSolid_to_.*"
+        {
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            value           uniform 300;
+        }
 
-            leftSolid_to_heater
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappa           solidThermo;
-                kappaName       none;
-                thicknessLayers (1e-3);
-                kappaLayers     (5e-4);
-                value           uniform 300;
-            }
+        leftSolid_to_heater
+        {
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            thicknessLayers (1e-3);
+            kappaLayers     (5e-4);
+            value           uniform 300;
         }
     }
 }

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution

@@ -1 +0,0 @@
-../heater/fvSolution

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution

@@ -0,0 +1,40 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    h
+    {
+        solver           PCG;
+        preconditioner   DIC;
+        tolerance        1e-06;
+        relTol           0.1;
+    }
+
+    hFinal
+    {
+        $h;
+        tolerance        1e-06;
+        relTol           0;
+    }
+}
+
+PIMPLE
+{
+    nNonOrthogonalCorrectors 0;
+}
+
+// ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict

@@ -14,39 +14,35 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+boundary
 {
-    boundary
+    minZ
     {
-        minZ
-        {
-            type            patch;
-        }
-        maxZ
-        {
-            type            patch;
-        }
+        type            patch;
     }
-
-    T
+    maxZ
     {
-        internalField   uniform 300;
+        type            patch;
+    }
+}
 
-        boundaryField
+T
+{
+    internalField   uniform 300;
+
+    boundaryField
+    {
+        ".*"
         {
-            ".*"
-            {
-                type            zeroGradient;
-                value           uniform 300;
-            }
-            "rightSolid_to_.*"
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappa           solidThermo;
-                kappaName       none;
-                value           uniform 300;
-            }
+            type            zeroGradient;
+            value           uniform 300;
+        }
+        "rightSolid_to_.*"
+        {
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            value           uniform 300;
         }
     }
 }

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution

@@ -1 +0,0 @@
-../heater/fvSolution

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution

@@ -0,0 +1,40 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    h
+    {
+        solver           PCG;
+        preconditioner   DIC;
+        tolerance        1e-06;
+        relTol           0.1;
+    }
+
+    hFinal
+    {
+        $h;
+        tolerance        1e-06;
+        relTol           0;
+    }
+}
+
+PIMPLE
+{
+    nNonOrthogonalCorrectors 0;
+}
+
+// ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict

@@ -14,156 +14,152 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+U
 {
-    U
-    {
-        internalField   uniform (0.1 0 0);
+    internalField   uniform (0.1 0 0);
 
-        boundaryField
+    boundaryField
+    {
+        ".*"
         {
-            ".*"
-            {
-                type            fixedValue;
-                value           uniform (0 0 0);
-            }
-            minX
-            {
-                type            fixedValue;
-                value           uniform (0.1 0 0);
-            }
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform (0 0 0);
-                value           uniform (0.1 0 0);
-            }
+            type            fixedValue;
+            value           uniform (0 0 0);
+        }
+        minX
+        {
+            type            fixedValue;
+            value           uniform (0.1 0 0);
+        }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform (0 0 0);
+            value           uniform (0.1 0 0);
         }
     }
+}
 
-    T
+T
+{
+    internalField   uniform 300;
+
+    boundaryField
     {
-        internalField   uniform 300;
-
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            zeroGradient;
-            }
+            type            zeroGradient;
+        }
 
-            minX
-            {
-                type            fixedValue;
-                value           uniform 300;
-            }
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform 300;
-                value           uniform 300;
-            }
+        minX
+        {
+            type            fixedValue;
+            value           uniform 300;
+        }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform 300;
+            value           uniform 300;
+        }
 
-            "topAir_to_.*"
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappa           fluidThermo;
-                kappaName       none;
-                value           uniform 300;
-            }
+        "topAir_to_.*"
+        {
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     fluidThermo;
+            value           uniform 300;
         }
     }
+}
 
-    epsilon
+epsilon
+{
+    internalField   uniform 0.01;
+
+    boundaryField
     {
-        internalField   uniform 0.01;
-
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            epsilonWallFunction;
-                value           uniform 0.01;
-            }
+            type            epsilonWallFunction;
+            value           uniform 0.01;
+        }
 
-            minX
-            {
-                type            fixedValue;
-                value           uniform 0.01;
-            }
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform 0.01;
-                value           uniform 0.01;
-            }
+        minX
+        {
+            type            fixedValue;
+            value           uniform 0.01;
+        }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform 0.01;
+            value           uniform 0.01;
         }
     }
+}
 
-    k
+k
+{
+    internalField   uniform 0.1;
+
+    boundaryField
     {
-        internalField   uniform 0.1;
-
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            kqRWallFunction;
-                value           uniform 0.1;
-            }
+            type            kqRWallFunction;
+            value           uniform 0.1;
+        }
 
-            minX
-            {
-                type            fixedValue;
-                value           uniform 0.1;
-            }
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform 0.1;
-                value           uniform 0.1;
-            }
+        minX
+        {
+            type            fixedValue;
+            value           uniform 0.1;
+        }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform 0.1;
+            value           uniform 0.1;
         }
     }
+}
 
-    p_rgh
+p_rgh
+{
+    internalField   uniform 1e5;
+
+    boundaryField
     {
-        internalField   uniform 1e5;
-
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            fixedFluxPressure;
-                value           uniform 1e5;
-            }
+            type            fixedFluxPressure;
+            value           uniform 1e5;
+        }
 
-            maxX
-            {
-                type            fixedValue;
-                value           uniform 1e5;
-            }
+        maxX
+        {
+            type            fixedValue;
+            value           uniform 1e5;
         }
     }
+}
 
-    p
+p
+{
+    internalField   uniform 1e5;
+
+    boundaryField
     {
-        internalField   uniform 1e5;
-
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 1e5;
-            }
+            type            calculated;
+            value           uniform 1e5;
+        }
 
-            maxX
-            {
-                type            calculated;
-                value           uniform 1e5;
-            }
+        maxX
+        {
+            type            calculated;
+            value           uniform 1e5;
         }
     }
 }

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution

@@ -1 +0,0 @@
-../bottomWater/fvSolution

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution

@@ -0,0 +1,83 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    rho
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-7;
+        relTol          0.1;
+    }
+
+    rhoFinal
+    {
+        $rho;
+        tolerance       1e-7;
+        relTol          0;
+    }
+
+    p_rgh
+    {
+        solver           GAMG;
+        tolerance        1e-7;
+        relTol           0.01;
+
+        smoother         GaussSeidel;
+
+    }
+
+    p_rghFinal
+    {
+        $p_rgh;
+        tolerance        1e-7;
+        relTol           0;
+    }
+
+    "(U|h|k|epsilon|R)"
+    {
+        solver           PBiCGStab;
+        preconditioner   DILU;
+        tolerance        1e-7;
+        relTol           0.1;
+    }
+
+    "(U|h|k|epsilon|R)Final"
+    {
+        $U;
+        tolerance        1e-7;
+        relTol           0;
+    }
+}
+
+PIMPLE
+{
+    momentumPredictor   yes;
+    nCorrectors         2;
+    nNonOrthogonalCorrectors 0;
+}
+
+relaxationFactors
+{
+    equations
+    {
+        "h.*"           1;
+        "U.*"           1;
+    }
+}
+
+// ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict

@@ -14,111 +14,107 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+boundary
 {
-    boundary
+    minX
     {
-        minX
+        type            wall;
+    }
+    maxX
+    {
+        type            wall;
+    }
+}
+
+U
+{
+    internalField   uniform (0.01 0 0);
+
+    boundaryField
+    {
+        ".*"
         {
-            type            wall;
-        }
-        maxX
-        {
-            type            wall;
+            type            fixedValue;
+            value           uniform (0 0 0);
         }
     }
+}
 
-    U
+T
+{
+    internalField   uniform 300;
+
+    boundaryField
     {
-        internalField   uniform (0.01 0 0);
-
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            fixedValue;
-                value           uniform (0 0 0);
-            }
+            type            zeroGradient;
+        }
+
+        "bottomAir_to_.*"
+        {
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     fluidThermo;
+            value           uniform 300;
         }
     }
+}
 
-    T
+epsilon
+{
+    // Set the value on all bc to non-zero. Not used in simulation
+    // since zeroGradient; only used in initialisation.
+    internalField   uniform 0.01;
+
+    boundaryField
     {
-        internalField   uniform 300;
-
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            zeroGradient;
-            }
-
-            "bottomAir_to_.*"
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappa           fluidThermo;
-                kappaName       none;
-                value           uniform 300;
-            }
+            type            epsilonWallFunction;
+            value           uniform 0.01;
         }
     }
+}
 
-    epsilon
+k
+{
+    internalField   uniform 0.1;
+
+    boundaryField
     {
-        // Set the value on all bc to non-zero. Not used in simulation
-        // since zeroGradient; only used in initialisation.
-        internalField   uniform 0.01;
-
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            epsilonWallFunction;
-                value           uniform 0.01;
-            }
+            type            kqRWallFunction;
+            value           uniform 0.1;
         }
     }
+}
 
-    k
+p_rgh
+{
+    internalField   uniform 1e5;
+
+    boundaryField
     {
-        internalField   uniform 0.1;
-
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            kqRWallFunction;
-                value           uniform 0.1;
-            }
+            type            fixedFluxPressure;
+            value           uniform 1e5;
         }
     }
+}
 
-    p_rgh
+p
+{
+    internalField   uniform 1e5;
+
+    boundaryField
     {
-        internalField   uniform 1e5;
-
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            fixedFluxPressure;
-                value           uniform 1e5;
-            }
-        }
-    }
-
-    p
-    {
-        internalField   uniform 1e5;
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 1e5;
-            }
+            type            calculated;
+            value           uniform 1e5;
         }
     }
 }

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution

@@ -32,10 +32,6 @@ solvers
 
         smoother         GaussSeidel;
 
-        cacheAgglomeration true;
-        nCellsInCoarsestLevel 10;
-        agglomerator     faceAreaPair;
-        mergeLevels      1;
     }
 
     p_rghFinal
@@ -47,7 +43,7 @@ solvers
 
     "(U|h|k|epsilon|R)"
     {
-        solver           PBiCG;
+        solver           PBiCGStab;
         preconditioner   DILU;
         tolerance        1e-7;
         relTol           0.1;
@@ -63,7 +59,7 @@ solvers
 
 PIMPLE
 {
-    momentumPredictor   on;
+    momentumPredictor   yes;
     nCorrectors         2;
     nNonOrthogonalCorrectors 0;
 }

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict

@@ -14,48 +14,44 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+boundary
 {
-    boundary
+    minY
     {
+        type            patch;
+    }
+    minZ
+    {
+        type            patch;
+    }
+    maxZ
+    {
+        type            patch;
+    }
+}
+
+T
+{
+    internalField   uniform 300;
+
+    boundaryField
+    {
+        ".*"
+        {
+            type            zeroGradient;
+            value           uniform 300;
+        }
+        "heater_to_.*"
+        {
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            value           uniform 300;
+        }
         minY
         {
-            type            patch;
-        }
-        minZ
-        {
-            type            patch;
-        }
-        maxZ
-        {
-            type            patch;
-        }
-    }
-
-    T
-    {
-        internalField   uniform 300;
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            zeroGradient;
-                value           uniform 300;
-            }
-            "heater_to_.*"
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappa           solidThermo;
-                kappaName       none;
-                value           uniform 300;
-            }
-            minY
-            {
-                type            fixedValue;
-                value           uniform 500;
-            }
+            type            fixedValue;
+            value           uniform 500;
         }
     }
 }

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict

@@ -14,39 +14,35 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+boundary
 {
-    boundary
+    minZ
     {
-        minZ
-        {
-            type            patch;
-        }
-        maxZ
-        {
-            type            patch;
-        }
+        type            patch;
     }
-
-    T
+    maxZ
     {
-        internalField   uniform 300;
+        type            patch;
+    }
+}
 
-        boundaryField
+T
+{
+    internalField   uniform 300;
+
+    boundaryField
+    {
+        ".*"
         {
-            ".*"
-            {
-                type            zeroGradient;
-                value           uniform 300;
-            }
-            "leftSolid_to_.*"
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappa           solidThermo;
-                kappaName       none;
-                value           uniform 300;
-            }
+            type            zeroGradient;
+            value           uniform 300;
+        }
+        "leftSolid_to_.*"
+        {
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            value           uniform 300;
         }
     }
 }

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution

@@ -1 +0,0 @@
-../heater/fvSolution

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution

@@ -0,0 +1,40 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    h
+    {
+        solver           PCG;
+        preconditioner   DIC;
+        tolerance        1e-06;
+        relTol           0.1;
+    }
+
+    hFinal
+    {
+        $h;
+        tolerance        1e-06;
+        relTol           0;
+    }
+}
+
+PIMPLE
+{
+    nNonOrthogonalCorrectors 0;
+}
+
+// ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict

@@ -14,39 +14,35 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+boundary
 {
-    boundary
+    minZ
     {
-        minZ
-        {
-            type            patch;
-        }
-        maxZ
-        {
-            type            patch;
-        }
+        type            patch;
     }
-
-    T
+    maxZ
     {
-        internalField   uniform 300;
+        type            patch;
+    }
+}
 
-        boundaryField
+T
+{
+    internalField   uniform 300;
+
+    boundaryField
+    {
+        ".*"
         {
-            ".*"
-            {
-                type            zeroGradient;
-                value           uniform 300;
-            }
-            "rightSolid_to_.*"
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappa           solidThermo;
-                kappaName       none;
-                value           uniform 300;
-            }
+            type            zeroGradient;
+            value           uniform 300;
+        }
+        "rightSolid_to_.*"
+        {
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            value           uniform 300;
         }
     }
 }

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution

@@ -1 +0,0 @@
-../heater/fvSolution

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution

@@ -0,0 +1,40 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    h
+    {
+        solver           PCG;
+        preconditioner   DIC;
+        tolerance        1e-06;
+        relTol           0.1;
+    }
+
+    hFinal
+    {
+        $h;
+        tolerance        1e-06;
+        relTol           0;
+    }
+}
+
+PIMPLE
+{
+    nNonOrthogonalCorrectors 0;
+}
+
+// ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict

@@ -14,156 +14,152 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+U
 {
-    U
-    {
-        internalField   uniform (0.1 0 0);
+    internalField   uniform (0.1 0 0);
 
-        boundaryField
+    boundaryField
+    {
+        ".*"
         {
-            ".*"
-            {
-                type            fixedValue;
-                value           uniform (0 0 0);
-            }
-            minX
-            {
-                type            fixedValue;
-                value           uniform (0.1 0 0);
-            }
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform (0 0 0);
-                value           uniform (0.1 0 0);
-            }
+            type            fixedValue;
+            value           uniform (0 0 0);
+        }
+        minX
+        {
+            type            fixedValue;
+            value           uniform (0.1 0 0);
+        }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform (0 0 0);
+            value           uniform (0.1 0 0);
         }
     }
+}
 
-    T
+T
+{
+    internalField   uniform 300;
+
+    boundaryField
     {
-        internalField   uniform 300;
-
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            zeroGradient;
-            }
+            type            zeroGradient;
+        }
 
-            minX
-            {
-                type            fixedValue;
-                value           uniform 300;
-            }
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform 300;
-                value           uniform 300;
-            }
+        minX
+        {
+            type            fixedValue;
+            value           uniform 300;
+        }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform 300;
+            value           uniform 300;
+        }
 
-            "topAir_to_.*"
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappa           fluidThermo;
-                kappaName       none;
-                value           uniform 300;
-            }
+        "topAir_to_.*"
+        {
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     fluidThermo;
+            value           uniform 300;
         }
     }
+}
 
-    epsilon
+epsilon
+{
+    internalField   uniform 0.01;
+
+    boundaryField
     {
-        internalField   uniform 0.01;
-
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            epsilonWallFunction;
-                value           uniform 0.01;
-            }
+            type            epsilonWallFunction;
+            value           uniform 0.01;
+        }
 
-            minX
-            {
-                type            fixedValue;
-                value           uniform 0.01;
-            }
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform 0.01;
-                value           uniform 0.01;
-            }
+        minX
+        {
+            type            fixedValue;
+            value           uniform 0.01;
+        }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform 0.01;
+            value           uniform 0.01;
         }
     }
+}
 
-    k
+k
+{
+    internalField   uniform 0.1;
+
+    boundaryField
     {
-        internalField   uniform 0.1;
-
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            kqRWallFunction;
-                value           uniform 0.1;
-            }
+            type            kqRWallFunction;
+            value           uniform 0.1;
+        }
 
-            minX
-            {
-                type            fixedValue;
-                value           uniform 0.1;
-            }
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform 0.1;
-                value           uniform 0.1;
-            }
+        minX
+        {
+            type            fixedValue;
+            value           uniform 0.1;
+        }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform 0.1;
+            value           uniform 0.1;
         }
     }
+}
 
-    p_rgh
+p_rgh
+{
+    internalField   uniform 1e5;
+
+    boundaryField
     {
-        internalField   uniform 1e5;
-
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            fixedFluxPressure;
-                value           uniform 1e5;
-            }
+            type            fixedFluxPressure;
+            value           uniform 1e5;
+        }
 
-            maxX
-            {
-                type            fixedValue;
-                value           uniform 1e5;
-            }
+        maxX
+        {
+            type            fixedValue;
+            value           uniform 1e5;
         }
     }
+}
 
-    p
+p
+{
+    internalField   uniform 1e5;
+
+    boundaryField
     {
-        internalField   uniform 1e5;
-
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 1e5;
-            }
+            type            calculated;
+            value           uniform 1e5;
+        }
 
-            maxX
-            {
-                type            calculated;
-                value           uniform 1e5;
-            }
+        maxX
+        {
+            type            calculated;
+            value           uniform 1e5;
         }
     }
 }

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution

@@ -1 +0,0 @@
-../bottomAir/fvSolution

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution

@@ -0,0 +1,76 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    "(rho|rhoFinal)"
+    {
+        solver          PCG
+        preconditioner  DIC;
+        tolerance       1e-7;
+        relTol          0;
+    }
+
+    p_rgh
+    {
+        solver           GAMG;
+        tolerance        1e-7;
+        relTol           0.01;
+
+        smoother         GaussSeidel;
+
+    }
+
+    p_rghFinal
+    {
+        $p_rgh;
+        tolerance        1e-7;
+        relTol           0;
+    }
+
+    "(U|h|k|epsilon|R)"
+    {
+        solver           PBiCGStab;
+        preconditioner   DILU;
+        tolerance        1e-7;
+        relTol           0.1;
+    }
+
+    "(U|h|k|epsilon|R)Final"
+    {
+        $U;
+        tolerance        1e-07;
+        relTol           0;
+    }
+}
+
+PIMPLE
+{
+    momentumPredictor   yes;
+    nCorrectors         2;
+    nNonOrthogonalCorrectors 0;
+}
+
+relaxationFactors
+{
+    equations
+    {
+        "h.*"           1;
+        "U.*"           1;
+    }
+}
+
+// ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.org/cabin/U

@@ -35,7 +35,6 @@ boundaryField
     outlet
     {
         type            pressureInletOutletVelocity;
-        inletValue      uniform (0 0 0);
         value           uniform (0 0 0);
     }
     symmetry

tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions

@@ -26,8 +26,8 @@ airToporous
         nbrRegionName   porous;
         master          false;
 
-        nbrModelName    porousToair;
-        fieldNames      (h);
+        nbrModel        porousToair;
+        fields          (h);
         semiImplicit    no;
     }
 }

tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions

@@ -26,8 +26,8 @@ porousToair
         nbrRegionName   air;
         master          true;
 
-        nbrModelName    airToporous;
-        fieldNames      (h);
+        nbrModel        airToporous;
+        fields          (h);
         semiImplicit    no;
     }
 }

tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSchemes

@@ -40,7 +40,7 @@ divSchemes
 
 laplacianSchemes
 {
-    default         Gauss linear limited 0.333;
+    default         Gauss linear limited corrected 0.33;
 }
 
 interpolationSchemes
@@ -50,7 +50,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default         limited 0.333;
+    default         limited corrected 0.33;
 }
 
 

tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSolution

@@ -25,17 +25,13 @@ solvers
 
         smoother         DIC;
 
-        cacheAgglomeration true;
-        nCellsInCoarsestLevel 10;
-        agglomerator     faceAreaPair;
-        mergeLevels      1;
 
         maxIter          100;
     }
 
     "(U|h|e|k|epsilon)"
     {
-        solver          PBiCG;
+        solver          PBiCGStab;
         preconditioner  DILU;
         tolerance       1e-6;
         relTol          0.1;

tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSolution

@@ -24,17 +24,13 @@ solvers
 
         smoother         DIC;
 
-        cacheAgglomeration true;
-        nCellsInCoarsestLevel 10;
-        agglomerator     faceAreaPair;
-        mergeLevels      1;
 
         maxIter          10;
     }
 
     "(U|h|e|k|epsilon)"
     {
-        solver           PBiCG;
+        solver           PBiCGStab;
         preconditioner   DILU;
         tolerance        1e-7;
         relTol           0.1;

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict

@@ -14,181 +14,171 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+boundary
 {
-    boundary
+    minX
     {
-        minX
+        type            wall;
+    }
+    maxX
+    {
+        type            wall;
+    }
+}
+
+U
+{
+    internalField   uniform (0.01 0 0);
+    boundaryField
+    {
+        ".*"
         {
-            type            wall;
-        }
-        maxX
-        {
-            type            wall;
+            type            fixedValue;
+            value           uniform (0 0 0);
         }
     }
+}
 
-    U
+T
+{
+    internalField   uniform 300;
+    boundaryField
     {
-        internalField   uniform (0.01 0 0);
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            fixedValue;
-                value           uniform (0 0 0);
-            }
+            type            zeroGradient;
+        }
+
+        "bottomAir_to_.*"
+        {
+            type            compressible::turbulentTemperatureRadCoupledMixed;
+            Tnbr            T;
+            kappaMethod     fluidThermo;
+            QrNbr           none;
+            Qr              Qr;
+            value           uniform 300;
         }
     }
+}
 
-    T
+epsilon
+{
+    internalField   uniform 0.01;
+    boundaryField
     {
-        internalField   uniform 300;
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            zeroGradient;
-            }
-
-            "bottomAir_to_.*"
-            {
-                type            compressible::turbulentTemperatureRadCoupledMixed;
-                Tnbr            T;
-                kappa           fluidThermo;
-                QrNbr           none;
-                Qr              Qr;
-                kappaName       none;
-                value           uniform 300;
-            }
+            type            epsilonWallFunction;
+            value           uniform 0.01;
         }
     }
+}
 
-    epsilon
+k
+{
+    internalField   uniform 0.1;
+    boundaryField
     {
-        internalField   uniform 0.01;
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            epsilonWallFunction;
-                value           uniform 0.01;
-            }
+            type            kqRWallFunction;
+            value           uniform 0.1;
         }
     }
+}
 
-    k
+p_rgh
+{
+    internalField   uniform 1e5;
+    boundaryField
     {
-        internalField   uniform 0.1;
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            kqRWallFunction;
-                value           uniform 0.1;
-            }
+            type            fixedFluxPressure;
+            value           uniform 1e5;
         }
     }
+}
 
-    p_rgh
+p
+{
+    internalField   uniform 1e5;
+    boundaryField
     {
-        internalField   uniform 1e5;
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            fixedFluxPressure;
-                value           uniform 1e5;
-            }
+            type            calculated;
+            value           uniform 1e5;
         }
     }
+}
 
-    p
+Qr
+{
+    internalField   uniform 0;
+    boundaryField
     {
-        internalField   uniform 1e5;
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 1e5;
-            }
+            type            greyDiffusiveRadiationViewFactor;
+            emissivityMode  lookup;
+            Qro             uniform 0;
+            emissivity      uniform 1.0;
+            value           uniform 0;
+        }
+
+        "bottomAir_to_.*"
+        {
+            type            greyDiffusiveRadiationViewFactor;
+            emissivityMode  solidRadiation;
+            Qro             uniform 0;
+            value           uniform 0;
         }
     }
+}
 
-    Qr
+G
+{
+    internalField   uniform 0;
+    boundaryField
     {
-        internalField   uniform 0;
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            greyDiffusiveRadiationViewFactor;
-                emissivityMode  lookup;
-                Qro             uniform 0;
-                emissivity      uniform 1.0;
-                value           uniform 0;
-            }
+            type            MarshakRadiation;
+            emissivityMode  lookup;
+            emissivity      uniform 1.0;
+            value           uniform 0;
+        }
 
-            "bottomAir_to_.*"
-            {
-                type            greyDiffusiveRadiationViewFactor;
-                emissivityMode  solidRadiation;
-                Qro             uniform 0;
-                value           uniform 0;
-            }
+        "bottomAir_to_.*"
+        {
+            type            MarshakRadiation;
+            emissivityMode  solidRadiation;
+            value           uniform 0;
         }
     }
+}
 
-    G
+IDefault
+{
+    internalField   uniform 0;
+    boundaryField
     {
-        internalField   uniform 0;
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            MarshakRadiation;
-                T               T;
-                emissivityMode  lookup;
-                emissivity      uniform 1.0;
-                value           uniform 0;
-            }
+            type            greyDiffusiveRadiation;
+            emissivityMode  lookup;
+            emissivity      uniform 1.0;
+            value           uniform 0;
+        }
 
-            "bottomAir_to_.*"
-            {
-                type            MarshakRadiation;
-                T               T;
-                emissivityMode  solidRadiation;
-                value           uniform 0;
-            }
+        "bottomAir_to_.*"
+        {
+            type            greyDiffusiveRadiation;
+            emissivityMode  solidRadiation;
+            value           uniform 0;
         }
     }
-
-    IDefault
-    {
-        internalField   uniform 0;
-        boundaryField
-        {
-            ".*"
-            {
-                type            greyDiffusiveRadiation;
-                T               T;
-                emissivityMode  lookup;
-                emissivity      uniform 1.0;
-                value           uniform 0;
-            }
-
-            "bottomAir_to_.*"
-            {
-                type            greyDiffusiveRadiation;
-                T               T;
-                emissivityMode  solidRadiation;
-                value           uniform 0;
-            }
-        }
-    }
-
-
 }
 
 // ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution

@@ -32,15 +32,11 @@ solvers
 
         smoother         GaussSeidel;
 
-        cacheAgglomeration true;
-        nCellsInCoarsestLevel 10;
-        agglomerator     faceAreaPair;
-        mergeLevels      1;
     }
 
     "(U|h|k|epsilon|G|Ii)"
     {
-        solver           PBiCG;
+        solver           PBiCGStab;
         preconditioner   DILU;
         tolerance        1e-7;
         relTol           0.1;
@@ -56,7 +52,7 @@ solvers
 
 SIMPLE
 {
-    momentumPredictor on;
+    momentumPredictor yes;
     nNonOrthogonalCorrectors 0;
     pRefCell        0;
     pRefValue       100000;

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict

@@ -14,71 +14,65 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+boundary
 {
-    boundary
+    minY
     {
+        type            patch;
+    }
+    minZ
+    {
+        type            patch;
+    }
+    maxZ
+    {
+        type            patch;
+    }
+}
+
+T
+{
+    internalField   uniform 300;
+
+    boundaryField
+    {
+        ".*"
+        {
+            type            zeroGradient;
+            value           uniform 300;
+        }
+
+        heater_to_topAir
+        {
+            type            compressible::turbulentTemperatureRadCoupledMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            QrNbr           Qr;
+            Qr              none;
+            value           uniform 300;
+        }
+
+        heater_to_bottomAir
+        {
+            type            compressible::turbulentTemperatureRadCoupledMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            QrNbr           Qr;
+            Qr              none;
+            value           uniform 300;
+        }
+
+        "heater_to_.*"
+        {
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            value           uniform 300;
+        }
         minY
         {
-            type            patch;
-        }
-        minZ
-        {
-            type            patch;
-        }
-        maxZ
-        {
-            type            patch;
-        }
-    }
-
-    T
-    {
-        internalField   uniform 300;
-
-        boundaryField
-        {
-            ".*"
-            {
-                type            zeroGradient;
-                value           uniform 300;
-            }
-
-            heater_to_topAir
-            {
-                type            compressible::turbulentTemperatureRadCoupledMixed;
-                Tnbr            T;
-                kappa           solidThermo;
-                QrNbr           Qr;
-                Qr              none;
-                kappaName       none;
-                value           uniform 300;
-            }
-
-            heater_to_bottomAir
-            {
-                type            compressible::turbulentTemperatureRadCoupledMixed;
-                Tnbr            T;
-                kappa           solidThermo;
-                QrNbr           Qr;
-                Qr              none;
-                kappaName       none;
-                value           uniform 300;
-            }
-
-            "heater_to_.*"
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappa           solidThermo;
-                kappaName       none;
-                value           uniform 300;
-            }
-            minY
-            {
-                type            fixedValue;
-                value           uniform 500;
-            }
+            type            fixedValue;
+            value           uniform 500;
         }
     }
 }

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict

@@ -14,62 +14,56 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+boundary
 {
-    boundary
+    minZ
     {
-        minZ
-        {
-            type            patch;
-        }
-        maxZ
-        {
-            type            patch;
-        }
+        type            patch;
     }
-
-    T
+    maxZ
     {
-        internalField   uniform 300;
+        type            patch;
+    }
+}
 
-        boundaryField
+T
+{
+    internalField   uniform 300;
+
+    boundaryField
+    {
+        ".*"
         {
-            ".*"
-            {
-                type            zeroGradient;
-                value           uniform 300;
-            }
+            type            zeroGradient;
+            value           uniform 300;
+        }
 
-            leftSolid_to_topAir
-            {
-                type            compressible::turbulentTemperatureRadCoupledMixed;
-                Tnbr            T;
-                kappa           solidThermo;
-                QrNbr           Qr;
-                Qr              none;
-                kappaName       none;
-                value           uniform 300;
-            }
+        leftSolid_to_topAir
+        {
+            type            compressible::turbulentTemperatureRadCoupledMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            QrNbr           Qr;
+            Qr              none;
+            value           uniform 300;
+        }
 
-            leftSolid_to_bottomAir
-            {
-                type            compressible::turbulentTemperatureRadCoupledMixed;
-                Tnbr            T;
-                kappa           solidThermo;
-                QrNbr           Qr;
-                Qr              none;
-                kappaName       none;
-                value           uniform 300;
-            }
+        leftSolid_to_bottomAir
+        {
+            type            compressible::turbulentTemperatureRadCoupledMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            QrNbr           Qr;
+            Qr              none;
+            value           uniform 300;
+        }
 
-            "leftSolid_to_.*"
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappa           solidThermo;
-                kappaName       none;
-                value           uniform 300;
-            }
+        "leftSolid_to_.*"
+        {
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            value           uniform 300;
         }
     }
 }

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution

@@ -1 +0,0 @@
-../heater/fvSolution

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution

@@ -0,0 +1,41 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    h
+    {
+        solver           PCG;
+        preconditioner   DIC;
+        tolerance        1e-06;
+        relTol           0.1;
+    }
+}
+
+SIMPLE
+{
+    nNonOrthogonalCorrectors 0;
+}
+
+relaxationFactors
+{
+    equations
+    {
+        h               0.7;
+    }
+}
+
+// ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict

@@ -14,62 +14,56 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+boundary
 {
-    boundary
+    minZ
     {
-        minZ
-        {
-            type            patch;
-        }
-        maxZ
-        {
-            type            patch;
-        }
+        type            patch;
     }
-
-    T
+    maxZ
     {
-        internalField   uniform 300;
+        type            patch;
+    }
+}
 
-        boundaryField
+T
+{
+    internalField   uniform 300;
+
+    boundaryField
+    {
+        ".*"
         {
-            ".*"
-            {
-                type            zeroGradient;
-                value           uniform 300;
-            }
+            type            zeroGradient;
+            value           uniform 300;
+        }
 
-            rightSolid_to_topAir
-            {
-                type            compressible::turbulentTemperatureRadCoupledMixed;
-                Tnbr            T;
-                kappa           solidThermo;
-                QrNbr           Qr;
-                Qr              none;
-                kappaName       none;
-                value           uniform 300;
-            }
+        rightSolid_to_topAir
+        {
+            type            compressible::turbulentTemperatureRadCoupledMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            QrNbr           Qr;
+            Qr              none;
+            value           uniform 300;
+        }
 
-            rightSolid_to_bottomAir
-            {
-                type            compressible::turbulentTemperatureRadCoupledMixed;
-                Tnbr            T;
-                kappa           solidThermo;
-                QrNbr           Qr;
-                Qr              none;
-                kappaName       none;
-                value           uniform 300;
-            }
+        rightSolid_to_bottomAir
+        {
+            type            compressible::turbulentTemperatureRadCoupledMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            QrNbr           Qr;
+            Qr              none;
+            value           uniform 300;
+        }
 
-            "rightSolid_to_.*"
-            {
-                type            compressible::turbulentTemperatureCoupledBaffleMixed;
-                Tnbr            T;
-                kappa           solidThermo;
-                kappaName       none;
-                value           uniform 300;
-            }
+        "rightSolid_to_.*"
+        {
+            type            compressible::turbulentTemperatureCoupledBaffleMixed;
+            Tnbr            T;
+            kappaMethod     solidThermo;
+            value           uniform 300;
         }
     }
 }

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution

@@ -1 +0,0 @@
-../heater/fvSolution

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution

@@ -0,0 +1,41 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    h
+    {
+        solver           PCG;
+        preconditioner   DIC;
+        tolerance        1e-06;
+        relTol           0.1;
+    }
+}
+
+SIMPLE
+{
+    nNonOrthogonalCorrectors 0;
+}
+
+relaxationFactors
+{
+    equations
+    {
+        h               0.7;
+    }
+}
+
+// ************************************************************************* //

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict

@@ -14,224 +14,216 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dictionaryReplacement
+U
 {
-    U
+    internalField   uniform (0.1 0 0);
+    boundaryField
     {
-        internalField   uniform (0.1 0 0);
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            fixedValue;
-                value           uniform (0 0 0);
-            }
-            minX
-            {
-                type            fixedValue;
-                value           uniform (0.1 0 0);
-            }
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform (0 0 0);
-                value           uniform (0.1 0 0);
-            }
+            type            fixedValue;
+            value           uniform (0 0 0);
+        }
+        minX
+        {
+            type            fixedValue;
+            value           uniform (0.1 0 0);
+        }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform (0 0 0);
+            value           uniform (0.1 0 0);
         }
     }
+}
 
-    T
+T
+{
+    internalField   uniform 300;
+    boundaryField
     {
-        internalField   uniform 300;
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            zeroGradient;
-            }
+            type            zeroGradient;
+        }
 
-            minX
-            {
-                type            fixedValue;
-                value           uniform 300;
-            }
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform 300;
-                value           uniform 300;
-            }
+        minX
+        {
+            type            fixedValue;
+            value           uniform 300;
+        }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform 300;
+            value           uniform 300;
+        }
 
-            "topAir_to_.*"
-            {
-                type            compressible::turbulentTemperatureRadCoupledMixed;
-                Tnbr            T;
-                kappa           fluidThermo;
-                QrNbr           none;
-                Qr              Qr;
-                kappaName       none;
-                value           uniform 300;
-            }
+        "topAir_to_.*"
+        {
+            type            compressible::turbulentTemperatureRadCoupledMixed;
+            Tnbr            T;
+            kappaMethod     fluidThermo;
+            QrNbr           none;
+            Qr              Qr;
+            value           uniform 300;
         }
     }
+}
 
-    epsilon
+epsilon
+{
+    internalField   uniform 0.01;
+    boundaryField
     {
-        internalField   uniform 0.01;
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            epsilonWallFunction;
-                value           uniform 0.01;
-            }
+            type            epsilonWallFunction;
+            value           uniform 0.01;
+        }
 
-            minX
-            {
-                type            fixedValue;
-                value           uniform 0.01;
-            }
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform 0.01;
-                value           uniform 0.01;
-            }
+        minX
+        {
+            type            fixedValue;
+            value           uniform 0.01;
+        }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform 0.01;
+            value           uniform 0.01;
         }
     }
+}
 
-    k
+k
+{
+    internalField   uniform 0.1;
+    boundaryField
     {
-        internalField   uniform 0.1;
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            kqRWallFunction;
-                value           uniform 0.1;
-            }
+            type            kqRWallFunction;
+            value           uniform 0.1;
+        }
 
-            minX
-            {
-                type            fixedValue;
-                value           uniform 0.1;
-            }
-            maxX
-            {
-                type            inletOutlet;
-                inletValue      uniform 0.1;
-                value           uniform 0.1;
-            }
+        minX
+        {
+            type            fixedValue;
+            value           uniform 0.1;
+        }
+        maxX
+        {
+            type            inletOutlet;
+            inletValue      uniform 0.1;
+            value           uniform 0.1;
         }
     }
+}
 
-    p_rgh
+p_rgh
+{
+    internalField   uniform 1e5;
+    boundaryField
     {
-        internalField   uniform 1e5;
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            fixedFluxPressure;
-                value           uniform 1e5;
-            }
+            type            fixedFluxPressure;
+            value           uniform 1e5;
+        }
 
-            maxX
-            {
-                type            fixedValue;
-                value           uniform 1e5;
-            }
+        maxX
+        {
+            type            fixedValue;
+            value           uniform 1e5;
         }
     }
+}
 
-    p
+p
+{
+    internalField   uniform 1e5;
+    boundaryField
     {
-        internalField   uniform 1e5;
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            calculated;
-                value           uniform 1e5;
-            }
+            type            calculated;
+            value           uniform 1e5;
+        }
 
-            maxX
-            {
-                type            calculated;
-                value           uniform 1e5;
-            }
+        maxX
+        {
+            type            calculated;
+            value           uniform 1e5;
         }
     }
+}
 
-    Qr
+Qr
+{
+    internalField   uniform 0;
+    boundaryField
     {
-        internalField   uniform 0;
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            greyDiffusiveRadiationViewFactor;
-                emissivityMode  lookup;
-                Qro             uniform 0;
-                emissivity      uniform 1.0;
-                value           uniform 0;
-            }
+            type            greyDiffusiveRadiationViewFactor;
+            emissivityMode  lookup;
+            Qro             uniform 0;
+            emissivity      uniform 1.0;
+            value           uniform 0;
+        }
 
-            "topAir_to_.*"
-            {
-                type            greyDiffusiveRadiationViewFactor;
-                emissivityMode  solidRadiation;
-                Qro             uniform 0;
-                value           uniform 0;
-            }
+        "topAir_to_.*"
+        {
+            type            greyDiffusiveRadiationViewFactor;
+            emissivityMode  solidRadiation;
+            Qro             uniform 0;
+            value           uniform 0;
         }
     }
+}
 
-    G
+G
+{
+    internalField   uniform 0;
+    boundaryField
     {
-        internalField   uniform 0;
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            MarshakRadiation;
-                T               T;
-                emissivityMode  lookup;
-                emissivity      uniform 1.0;
-                value           uniform 0;
-            }
+            type            MarshakRadiation;
+            emissivityMode  lookup;
+            emissivity      uniform 1.0;
+            value           uniform 0;
+        }
 
-            "topAir_to_.*"
-            {
-                type            MarshakRadiation;
-                T               T;
-                emissivityMode  solidRadiation;
-                value           uniform 0;
-            }
+        "topAir_to_.*"
+        {
+            type            MarshakRadiation;
+            emissivityMode  solidRadiation;
+            value           uniform 0;
         }
     }
+}
 
-    IDefault
+IDefault
+{
+    internalField   uniform 0;
+    boundaryField
     {
-        internalField   uniform 0;
-        boundaryField
+        ".*"
         {
-            ".*"
-            {
-                type            greyDiffusiveRadiation;
-                T               T;
-                emissivityMode  lookup;
-                emissivity      uniform 1.0;
-                value           uniform 0;
-            }
+            type            greyDiffusiveRadiation;
+            emissivityMode  lookup;
+            emissivity      uniform 1.0;
+            value           uniform 0;
+        }
 
-            "topAir_to_.*"
-            {
-                type            greyDiffusiveRadiation;
-                T               T;
-                emissivityMode  solidRadiation;
-                value           uniform 0;
-            }
+        "topAir_to_.*"
+        {
+            type            greyDiffusiveRadiation;
+            emissivityMode  solidRadiation;
+            value           uniform 0;
         }
     }
 }

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution

@@ -1 +0,0 @@
-../bottomAir/fvSolution

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution

@@ -0,0 +1,81 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    rho
+    {
+        solver          PCG
+        preconditioner  DIC;
+        tolerance       1e-7;
+        relTol          0;
+    }
+
+    p_rgh
+    {
+        solver           GAMG;
+        tolerance        1e-7;
+        relTol           0.01;
+
+        smoother         GaussSeidel;
+
+    }
+
+    "(U|h|k|epsilon|G|Ii)"
+    {
+        solver           PBiCGStab;
+        preconditioner   DILU;
+        tolerance        1e-7;
+        relTol           0.1;
+    }
+
+    G
+    {
+        $p_rgh;
+        tolerance       1e-05;
+        relTol          0.1;
+    }
+}
+
+SIMPLE
+{
+    momentumPredictor yes;
+    nNonOrthogonalCorrectors 0;
+    pRefCell        0;
+    pRefValue       100000;
+    rhoMin          0.2;
+    rhoMax          2;
+}
+
+relaxationFactors
+{
+    fields
+    {
+        rho             1.0;
+        p_rgh           0.7;
+    }
+    equations
+    {
+        U               0.3;
+        h               0.7;
+        "(k|epsilon|omega)" 0.7;
+        G               0.7;
+        "ILambda.*"     0.7;
+        Qr              0.7;
+    }
+}
+
+// ************************************************************************* //