From 283f8b7dc8873e3c0352c23144cb6dfcb7ca26d9 Mon Sep 17 00:00:00 2001
From: Will Bainbridge <http://cfd.direct>
Date: Fri, 26 Jan 2018 13:40:42 +0000
Subject: [PATCH] chtMultiRegionFoam: SIMPLE operation and transonic switch

Multi-region PIMPLE controls have been applied to the chtMultiRegionFoam
solver, and a transonic option has been implemented.

The new PIMPLE controls let the solver operate SIMPLE mode. The
utilisation of library solution and convergence control functionality
has significantly reduced the amount of code in the solver. The
chtMultiRegionSimpleFoam solver has also been made obsolete, and has
therefore been removed.

A few changes will be necessary to convert an existing
chtMultiRegionSimpleFoam case to chtMultiRegionFoam. All the SIMPLE
sub-dictionaries in the system/<regions>/fvSolution will need to be
renamed PIMPLE. The system/fvSolution file will also need an empty
PIMPLE sub-dictionary. In addition, additional "<variable>Final" solver
and relaxation entries will be needed. For a steady case, adding a
wildcard ending, ".*", to the variable names should be sufficient.

Solution parameters appropriate for a steady case are shown below:

    solvers
    {
        "p_rgh.*"
        {
            solver           GAMG;
            tolerance        1e-7;
            relTol           0.01;
            smoother         DIC;
            maxIter          10;
        }

        "(U|h|e|k|epsilon).*"
        {
            solver           PBiCGStab;
            preconditioner   DILU;
            tolerance        1e-7;
            relTol           0.1;
        }
    }

    PIMPLE
    {
        // ...
    }

    relaxationFactors
    {
        fields
        {
            "p_rgh.*"       0.7;
        }
        equations
        {
            "U.*"           0.5;
            "(h|e).*"       0.3;
            "(k|epsilon).*" 0.2;
        }
    }

This work was supported by Fabian Buelow, at Evonik
Tobias Holzmann provided cases for testing the convergence controls
---
 .../chtMultiRegionFoam/Make/options           |   1 +
 .../checkResidualControls.H                   |  66 -----
 .../chtMultiRegionFoam/chtMultiRegionFoam.C   |  37 +--
 .../chtMultiRegionSimpleFoam/Make/files       |   4 -
 .../chtMultiRegionSimpleFoam/Make/options     |  30 --
 .../checkResidualControls.H                   |  68 -----
 .../chtMultiRegionSimpleFoam.C                | 103 -------
 .../chtMultiRegionSimpleFoam/fluid/EEqn.H     |  32 --
 .../chtMultiRegionSimpleFoam/fluid/UEqn.H     |  35 ---
 .../fluid/compressibleContinuityErrors.H      |  21 --
 .../fluid/compressibleMultiRegionCourantNo.H  |  15 -
 .../fluid/createFluidFields.H                 | 277 ------------------
 .../fluid/createFluidMeshes.H                 |  24 --
 .../chtMultiRegionSimpleFoam/fluid/pEqn.H     |  84 ------
 .../readFluidMultiRegionResidualControls.H    |  60 ----
 .../readFluidMultiRegionSIMPLEControls.H      |   7 -
 .../fluid/residualControlsFluid.H             |  56 ----
 .../fluid/setRegionFluidFields.H              |  39 ---
 .../fluid/solveFluid.H                        |  19 --
 .../solid/createSolidFields.H                 | 126 --------
 .../solid/createSolidMeshes.H                 |   1 -
 .../readSolidMultiRegionResidualControls.H    |  36 ---
 .../readSolidMultiRegionSIMPLEControls.H      |   4 -
 .../solid/residualControlsSolid.H             |   1 -
 .../solid/setRegionSolidFields.H              |   1 -
 .../solid/solveSolid.H                        |  28 --
 .../chtMultiRegionFoam/createFields.H         |   5 -
 .../chtMultiRegionFoam/fluid/EEqn.H           |   2 +-
 .../chtMultiRegionFoam/fluid/UEqn.H           |  26 +-
 .../fluid/compressibleContinuityErrors.H      |  21 --
 .../fluid/compressibleMultiRegionCourantNo.H  |  16 -
 .../fluid/createFluidFields.H                 |  20 --
 .../fluid/createFluidPressureControls.H       |  16 +
 .../fluid/initContinuityErrs.H                |   2 +-
 .../chtMultiRegionFoam/fluid/pEqn.H           | 123 +++++---
 .../readFluidMultiRegionPIMPLEControls.H      |  10 -
 .../readFluidMultiRegionResidualControls.H    |  60 ----
 .../fluid/residualControlsFluid.H             |  55 ----
 .../fluid/setRegionFluidFields.H              |  12 +-
 .../chtMultiRegionFoam/fluid/solveFluid.H     |  26 +-
 .../fluid/storeOldFluidFields.H               |   2 -
 .../chtMultiRegionFoam/readPIMPLEControls.H   |   8 -
 .../solid/createSolidFields.H                 |  19 --
 .../readSolidMultiRegionPIMPLEControls.H      |   4 -
 .../readSolidMultiRegionResidualControls.H    |  36 ---
 .../solid/residualControlsSolid.H             |   8 -
 .../solid/setRegionSolidFields.H              |   4 +-
 .../chtMultiRegionFoam/solid/solveSolid.H     |  20 +-
 .../heatExchanger/0.orig/air/T                |   0
 .../heatExchanger/0.orig/air/U                |   0
 .../heatExchanger/0.orig/air/alphat           |   0
 .../heatExchanger/0.orig/air/epsilon          |   0
 .../heatExchanger/0.orig/air/k                |   0
 .../heatExchanger/0.orig/air/nut              |   0
 .../heatExchanger/0.orig/air/p                |   0
 .../heatExchanger/0.orig/air/p_rgh            |   0
 .../heatExchanger/0.orig/porous/AoV           |   0
 .../heatExchanger/0.orig/porous/T             |   0
 .../heatExchanger/0.orig/porous/U             |   0
 .../heatExchanger/0.orig/porous/htcConst      |   0
 .../heatExchanger/0.orig/porous/p             |   0
 .../heatExchanger/0.orig/porous/p_rgh         |   0
 .../heatExchanger/Allclean                    |   0
 .../heatExchanger/Allrun                      |   0
 .../heatExchanger/Allrun-parallel             |   0
 .../heatExchanger/Allrun.pre                  |   0
 .../heatExchanger/constant/air/MRFProperties  |   0
 .../heatExchanger/constant/air/fvOptions      |   0
 .../heatExchanger/constant/air/g              |   0
 .../constant/air/radiationProperties          |   0
 .../constant/air/thermophysicalProperties     |   0
 .../constant/air/turbulenceProperties         |   0
 .../heatExchanger/constant/porous/fvOptions   |   0
 .../heatExchanger/constant/porous/g           |   0
 .../constant/porous/thermophysicalProperties  |   0
 .../constant/porous/turbulenceProperties      |   0
 .../heatExchanger/constant/regionProperties   |   0
 .../heatExchanger/system/air/blockMeshDict    |   0
 .../system/air/createBafflesDict              |   0
 .../heatExchanger/system/air/decomposeParDict |   0
 .../heatExchanger/system/air/fvSchemes        |   0
 .../heatExchanger/system/air/fvSolution       |  34 +--
 .../heatExchanger/system/air/topoSetDict.1    |   0
 .../heatExchanger/system/air/topoSetDict.2    |   0
 .../heatExchanger/system/controlDict          |   2 +-
 .../heatExchanger/system/decomposeParDict     |   0
 .../heatExchanger/system/fvSchemes            |   0
 .../heatExchanger/system/fvSolution           |   0
 .../heatExchanger/system/porous/blockMeshDict |   0
 .../system/porous/decomposeParDict            |   0
 .../heatExchanger/system/porous/fvSchemes     |   0
 .../heatExchanger/system/porous/fvSolution    |  24 +-
 .../multiRegionHeaterRadiation/0/G            |   0
 .../multiRegionHeaterRadiation/0/IDefault     |   0
 .../multiRegionHeaterRadiation/0/T            |   0
 .../multiRegionHeaterRadiation/0/U            |   0
 .../multiRegionHeaterRadiation/0/epsilon      |   0
 .../multiRegionHeaterRadiation/0/k            |   0
 .../multiRegionHeaterRadiation/0/p            |   0
 .../multiRegionHeaterRadiation/0/p_rgh        |   0
 .../multiRegionHeaterRadiation/0/qr           |   0
 .../multiRegionHeaterRadiation/Allclean       |   0
 .../multiRegionHeaterRadiation/Allrun         |   0
 .../Allrun-parallel                           |   0
 .../multiRegionHeaterRadiation/Allrun.pre     |   0
 .../constant/bottomAir/g                      |   0
 .../constant/bottomAir/radiationProperties    |   0
 .../bottomAir/thermophysicalProperties        |   0
 .../constant/bottomAir/turbulenceProperties   |   0
 .../constant/bottomAir/viewFactorsDict        |   0
 .../constant/heater/radiationProperties       |   0
 .../constant/heater/thermophysicalProperties  |   0
 .../constant/leftSolid/radiationProperties    |   0
 .../leftSolid/thermophysicalProperties        |   0
 .../constant/regionProperties                 |   0
 .../constant/rightSolid/radiationProperties   |   0
 .../rightSolid/thermophysicalProperties       |   0
 .../constant/topAir/g                         |   0
 .../constant/topAir/radiationProperties       |   0
 .../constant/topAir/thermophysicalProperties  |   0
 .../constant/topAir/turbulenceProperties      |   0
 .../constant/topAir/viewFactorsDict           |   0
 .../system/blockMeshDict                      |   0
 .../system/bottomAir/changeDictionaryDict     |   0
 .../system/bottomAir/decomposeParDict         |   0
 .../system/bottomAir/fvSchemes                |   0
 .../system/bottomAir}/fvSolution              |  37 +--
 .../system/controlDict                        |   2 +-
 .../system/decomposeParDict                   |   0
 .../system/fvSchemes                          |   0
 .../system/fvSolution                         |   5 +
 .../system/heater/changeDictionaryDict        |   0
 .../system/heater/decomposeParDict            |   0
 .../system/heater/fvSchemes                   |   0
 .../system/heater}/fvSolution                 |   6 +-
 .../system/leftSolid/changeDictionaryDict     |   0
 .../system/leftSolid/decomposeParDict         |   0
 .../system/leftSolid/fvSchemes                |   0
 .../system/leftSolid}/fvSolution              |   6 +-
 .../system/rightSolid/changeDictionaryDict    |   0
 .../system/rightSolid/decomposeParDict        |   0
 .../system/rightSolid/fvSchemes               |   0
 .../system/rightSolid}/fvSolution             |   6 +-
 .../system/topAir/changeDictionaryDict        |   0
 .../system/topAir/decomposeParDict            |   0
 .../system/topAir/fvSchemes                   |   0
 .../system/topAir}/fvSolution                 |  37 +--
 .../system/topoSetDict                        |   0
 148 files changed, 205 insertions(+), 1624 deletions(-)
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/checkResidualControls.H
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/files
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/checkResidualControls.H
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/EEqn.H
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/UEqn.H
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/compressibleContinuityErrors.H
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/compressibleMultiRegionCourantNo.H
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidMeshes.H
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/readFluidMultiRegionResidualControls.H
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/readFluidMultiRegionSIMPLEControls.H
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/residualControlsFluid.H
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/solveFluid.H
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/createSolidFields.H
 delete mode 120000 applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/createSolidMeshes.H
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/readSolidMultiRegionResidualControls.H
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/readSolidMultiRegionSIMPLEControls.H
 delete mode 120000 applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/residualControlsSolid.H
 delete mode 120000 applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/solveSolid.H
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleContinuityErrors.H
 create mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidPressureControls.H
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPIMPLEControls.H
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionResidualControls.H
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/residualControlsFluid.H
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/storeOldFluidFields.H
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/readPIMPLEControls.H
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/solid/readSolidMultiRegionPIMPLEControls.H
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/solid/readSolidMultiRegionResidualControls.H
 delete mode 100644 applications/solvers/heatTransfer/chtMultiRegionFoam/solid/residualControlsSolid.H
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/0.orig/air/T (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/0.orig/air/U (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/0.orig/air/alphat (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/0.orig/air/epsilon (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/0.orig/air/k (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/0.orig/air/nut (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/0.orig/air/p (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/0.orig/air/p_rgh (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/0.orig/porous/AoV (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/0.orig/porous/T (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/0.orig/porous/U (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/0.orig/porous/htcConst (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/0.orig/porous/p (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/0.orig/porous/p_rgh (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/Allclean (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/Allrun (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/Allrun-parallel (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/Allrun.pre (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/constant/air/MRFProperties (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/constant/air/fvOptions (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/constant/air/g (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/constant/air/radiationProperties (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/constant/air/thermophysicalProperties (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/constant/air/turbulenceProperties (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/constant/porous/fvOptions (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/constant/porous/g (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/constant/porous/thermophysicalProperties (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/constant/porous/turbulenceProperties (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/constant/regionProperties (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/system/air/blockMeshDict (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/system/air/createBafflesDict (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/system/air/decomposeParDict (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/system/air/fvSchemes (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/system/air/fvSolution (73%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/system/air/topoSetDict.1 (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/system/air/topoSetDict.2 (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/system/controlDict (96%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/system/decomposeParDict (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/system/fvSchemes (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/system/fvSolution (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/system/porous/blockMeshDict (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/system/porous/decomposeParDict (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/system/porous/fvSchemes (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/heatExchanger/system/porous/fvSolution (82%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/0/G (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/0/IDefault (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/0/T (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/0/U (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/0/epsilon (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/0/k (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/0/p (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/0/p_rgh (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/0/qr (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/Allclean (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/Allrun (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/Allrun-parallel (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/Allrun.pre (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/constant/bottomAir/g (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/constant/bottomAir/radiationProperties (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/constant/bottomAir/turbulenceProperties (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/constant/bottomAir/viewFactorsDict (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/constant/heater/radiationProperties (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/constant/leftSolid/radiationProperties (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/constant/regionProperties (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/constant/rightSolid/radiationProperties (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/constant/topAir/g (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/constant/topAir/radiationProperties (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/constant/topAir/turbulenceProperties (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/constant/topAir/viewFactorsDict (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/system/blockMeshDict (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/system/bottomAir/decomposeParDict (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/system/bottomAir/fvSchemes (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir => chtMultiRegionFoam/multiRegionHeaterRadiation/system/bottomAir}/fvSolution (70%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/system/controlDict (96%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/system/decomposeParDict (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/system/fvSchemes (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/system/fvSolution (98%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/system/heater/changeDictionaryDict (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/system/heater/decomposeParDict (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/system/heater/fvSchemes (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid => chtMultiRegionFoam/multiRegionHeaterRadiation/system/heater}/fvSolution (95%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/system/leftSolid/decomposeParDict (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/system/leftSolid/fvSchemes (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid => chtMultiRegionFoam/multiRegionHeaterRadiation/system/leftSolid}/fvSolution (95%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/system/rightSolid/decomposeParDict (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/system/rightSolid/fvSchemes (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater => chtMultiRegionFoam/multiRegionHeaterRadiation/system/rightSolid}/fvSolution (95%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/system/topAir/decomposeParDict (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/system/topAir/fvSchemes (100%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir => chtMultiRegionFoam/multiRegionHeaterRadiation/system/topAir}/fvSolution (70%)
 rename tutorials/heatTransfer/{chtMultiRegionSimpleFoam => chtMultiRegionFoam}/multiRegionHeaterRadiation/system/topoSetDict (100%)

diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
index deef74acc..2b9836121 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
@@ -8,6 +8,7 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/cfdTools \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/checkResidualControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/checkResidualControls.H
deleted file mode 100644
index 8068798cd..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/checkResidualControls.H
+++ /dev/null
@@ -1,66 +0,0 @@
-// Residual control used?
-bool resControlUsed = false;
-int nFluidControlled = fluidRegions.size();
-int nSolidControlled = solidRegions.size();
-
-// Check wheater there is a single regions that uses residual control
-forAll(fluidRegions, i)
-{
-    if (residualControlUsedFluid[i])
-    {
-        resControlUsed = true;
-    }
-}
-
-forAll(solidRegions, i)
-{
-    if(residualControlUsedSolid[i])
-    {
-        resControlUsed = true;
-    }
-}
-
-if (resControlUsed)
-{
-    int nFluidConv = 0;
-    int nSolidConv = 0;
-
-    // Sum of all converged regions (Note: if no residual control is used
-    // the residualReached* flag is already set to true)
-    forAll(fluidRegions, i)
-    {
-        if (residualReachedFluid[i])
-        {
-            nFluidConv++;
-        }
-    }
-
-    forAll(solidRegions, i)
-    {
-        if (residualReachedSolid[i])
-        {
-            nSolidConv++;
-        }
-    }
-
-    if (nFluidConv == nFluidControlled && nSolidConv == nSolidControlled)
-    {
-        // Activate flag to go to the 'Final' loop using the 'Final'
-        // relaxation factors
-        allRegionsConverged = true;
-    }
-}
-
-if (finalIter && resControlUsed && !allRegionsConverged)
-{
-    Info<< "\nRegions not converged after " << nOuterCorr
-        << " outer correctors" << endl;
-}
-else if (finalIter && resControlUsed && allRegionsConverged)
-{
-    Info<< "\nRegions converged after " << oCorr
-        << " outer correctors" << endl;
-
-    // Leave PIMPLE loop
-    break;
-}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
index 8f11f8bab..c58eadb06 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,6 +45,8 @@ Description
 #include "radiationModel.H"
 #include "fvOptions.H"
 #include "coordinateSystem.H"
+#include "pimpleMultiRegionControl.H"
+#include "pressureControl.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -59,17 +61,18 @@ int main(int argc, char *argv[])
     #include "createMeshes.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
+    pimpleMultiRegionControl pimples(fluidRegions, solidRegions);
+    #include "createFluidPressureControls.H"
     #include "createTimeControls.H"
     #include "readSolidTimeControls.H"
     #include "compressibleMultiRegionCourantNo.H"
     #include "solidRegionDiffusionNo.H"
     #include "setInitialMultiRegionDeltaT.H"
 
-    while (runTime.run())
+    while (pimples.run(runTime))
     {
         #include "readTimeControls.H"
         #include "readSolidTimeControls.H"
-        #include "readPIMPLEControls.H"
 
         #include "compressibleMultiRegionCourantNo.H"
         #include "solidRegionDiffusionNo.H"
@@ -79,36 +82,15 @@ int main(int argc, char *argv[])
 
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        if (nOuterCorr != 1)
-        {
-            forAll(fluidRegions, i)
-            {
-                #include "storeOldFluidFields.H"
-            }
-        }
-
-        bool allRegionsConverged = false;
-        bool finalIter = false;
-
         // --- PIMPLE loop
-        for (int oCorr=0; oCorr<nOuterCorr; oCorr++)
+        while (pimples.loop())
         {
-            Info<< nl << "Pimple iteration " << oCorr;
-
-            if (oCorr == nOuterCorr-1 || allRegionsConverged)
-            {
-                finalIter = true;
-            }
-
             forAll(fluidRegions, i)
             {
                 Info<< "\nSolving for fluid region "
                     << fluidRegions[i].name() << endl;
                 #include "setRegionFluidFields.H"
-                #include "readFluidMultiRegionPIMPLEControls.H"
-                #include "readFluidMultiRegionResidualControls.H"
                 #include "solveFluid.H"
-                #include "residualControlsFluid.H"
             }
 
             forAll(solidRegions, i)
@@ -116,13 +98,8 @@ int main(int argc, char *argv[])
                 Info<< "\nSolving for solid region "
                     << solidRegions[i].name() << endl;
                 #include "setRegionSolidFields.H"
-                #include "readSolidMultiRegionPIMPLEControls.H"
-                #include "readSolidMultiRegionResidualControls.H"
                 #include "solveSolid.H"
-                #include "residualControlsSolid.H"
             }
-
-            #include "checkResidualControls.H"
         }
 
         runTime.write();
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/files b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/files
deleted file mode 100644
index d604fafb2..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/files
+++ /dev/null
@@ -1,4 +0,0 @@
-chtMultiRegionSimpleFoam.C
-
-EXE = $(FOAM_APPBIN)/chtMultiRegionSimpleFoam
-
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
deleted file mode 100644
index 9ce7394b3..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
+++ /dev/null
@@ -1,30 +0,0 @@
-EXE_INC = \
-    -I. \
-    -I.. \
-    -Ifluid \
-    -Isolid \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/cfdTools \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/regionModels/regionModel/lnInclude
-
-EXE_LIBS = \
-    -lfiniteVolume \
-    -lcompressibleTransportModels \
-    -lfluidThermophysicalModels \
-    -lsolidThermo \
-    -lspecie \
-    -lturbulenceModels \
-    -lcompressibleTurbulenceModels \
-    -lradiationModels \
-    -lfvOptions \
-    -lregionModels \
-    -lsampling
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/checkResidualControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/checkResidualControls.H
deleted file mode 100644
index dc71f23d6..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/checkResidualControls.H
+++ /dev/null
@@ -1,68 +0,0 @@
-// Residual control used?
-bool resControlUsed = false;
-int nFluidControlled = fluidRegions.size();
-int nSolidControlled = solidRegions.size();
-
-// Check wheater there is a single regions that uses residual control
-forAll(fluidRegions, i)
-{
-    if (residualControlUsedFluid[i])
-    {
-        resControlUsed = true;
-        break;
-    }
-}
-
-forAll(solidRegions, i)
-{
-    if(residualControlUsedSolid[i])
-    {
-        resControlUsed = true;
-        break;
-    }
-}
-
-if (resControlUsed)
-{
-    int nFluidConv = 0;
-    int nSolidConv = 0;
-
-    // Sum of all converged regions (Note: if no residual control is used
-    // the residualReached* flag is already set to true)
-    forAll(fluidRegions, i)
-    {
-        if (residualReachedFluid[i])
-        {
-            nFluidConv++;
-        }
-    }
-
-    forAll(solidRegions, i)
-    {
-        if (residualReachedSolid[i])
-        {
-            nSolidConv++;
-        }
-    }
-
-    if (nFluidConv == nFluidControlled && nSolidConv == nSolidControlled)
-    {
-        // Activate flag to go to the 'Final' loop using the 'Final'
-        // relaxation factors
-        allRegionsConverged = true;
-    }
-}
-
-if (!runTime.running())
-{
-    Info<< "\nRegions not converged after " << runTime.timeName()
-        << " iterations" << endl;
-}
-else if (runTime.running() && resControlUsed && allRegionsConverged)
-{
-    Info<< "\nRegions converged after " << runTime.timeName()
-        << " iterations" << endl;
-
-    // Save converged time step and end the run
-    runTime.writeAndEnd();
-}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C
deleted file mode 100644
index 229794069..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C
+++ /dev/null
@@ -1,103 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Application
-    chtMultiRegionSimpleFoam
-
-Description
-    Steady-state solver for buoyant, turbulent fluid flow and solid heat
-    conduction with conjugate heat transfer between solid and fluid regions.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "rhoThermo.H"
-#include "turbulentFluidThermoModel.H"
-#include "fixedGradientFvPatchFields.H"
-#include "regionProperties.H"
-#include "solidThermo.H"
-#include "radiationModel.H"
-#include "fvOptions.H"
-#include "coordinateSystem.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-    #define NO_CONTROL
-    #define CREATE_MESH createMeshesPostProcess.H
-    #include "postProcess.H"
-
-    #include "setRootCase.H"
-    #include "createTime.H"
-    #include "createMeshes.H"
-    #include "createFields.H"
-    #include "initContinuityErrs.H"
-
-    // Residual control
-    bool allRegionsConverged = false;
-
-    while (runTime.run())
-    {
-        runTime++;
-
-        Info<< "Time = " << runTime.timeName() << nl << endl;
-
-        forAll(fluidRegions, i)
-        {
-            Info<< "\nSolving for fluid region "
-                << fluidRegions[i].name() << endl;
-            #include "setRegionFluidFields.H"
-            #include "readFluidMultiRegionSIMPLEControls.H"
-            #include "readFluidMultiRegionResidualControls.H"
-            #include "solveFluid.H"
-            #include "residualControlsFluid.H"
-        }
-
-        forAll(solidRegions, i)
-        {
-            Info<< "\nSolving for solid region "
-                << solidRegions[i].name() << endl;
-            #include "setRegionSolidFields.H"
-            #include "readSolidMultiRegionSIMPLEControls.H"
-            #include "readSolidMultiRegionResidualControls.H"
-            #include "solveSolid.H"
-            #include "residualControlsSolid.H"
-        }
-
-        #include "checkResidualControls.H"
-
-        runTime.write();
-
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
-    }
-
-    Info<< "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/EEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/EEqn.H
deleted file mode 100644
index 3fd3ba505..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/EEqn.H
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    volScalarField& he = thermo.he();
-
-    fvScalarMatrix EEqn
-    (
-        fvm::div(phi, he)
-      + (
-            he.name() == "e"
-          ? fvc::div(phi, volScalarField("Ekp", 0.5*magSqr(U) + p/rho))
-          : fvc::div(phi, volScalarField("K", 0.5*magSqr(U)))
-        )
-      - fvm::laplacian(turb.alphaEff(), he)
-     ==
-        rho*(U&g)
-      + rad.Sh(thermo, he)
-      + fvOptions(rho, he)
-    );
-
-    EEqn.relax();
-
-    fvOptions.constrain(EEqn);
-
-    solvPerfh = EEqn.solve();
-
-    fvOptions.correct(he);
-
-    thermo.correct();
-    rad.correct();
-
-    Info<< "Min/max T:" << min(thermo.T()).value() << ' '
-        << max(thermo.T()).value() << endl;
-}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/UEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/UEqn.H
deleted file mode 100644
index 636c29ff9..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/UEqn.H
+++ /dev/null
@@ -1,35 +0,0 @@
-    // Solve the Momentum equation
-
-    MRF.correctBoundaryVelocity(U);
-
-    tmp<fvVectorMatrix> tUEqn
-    (
-        fvm::div(phi, U)
-      + MRF.DDt(rho, U)
-      + turb.divDevRhoReff(U)
-     ==
-        fvOptions(rho, U)
-    );
-    fvVectorMatrix& UEqn = tUEqn.ref();
-
-    UEqn.relax();
-
-    fvOptions.constrain(UEqn);
-
-    if (momentumPredictor)
-    {
-        solvPerfU = solve
-        (
-            UEqn
-         ==
-            fvc::reconstruct
-            (
-                (
-                  - ghf*fvc::snGrad(rho)
-                  - fvc::snGrad(p_rgh)
-                )*mesh.magSf()
-            )
-        );
-    }
-
-    fvOptions.correct(U);
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/compressibleContinuityErrors.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/compressibleContinuityErrors.H
deleted file mode 100644
index 046ca5ec3..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/compressibleContinuityErrors.H
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    dimensionedScalar totalMass = fvc::domainIntegrate(rho);
-
-    scalar sumLocalContErr =
-    (
-        fvc::domainIntegrate(mag(rho - thermo.rho()))/totalMass
-    ).value();
-
-    scalar globalContErr =
-    (
-        fvc::domainIntegrate(rho - thermo.rho())/totalMass
-    ).value();
-
-    cumulativeContErr[i] += globalContErr;
-
-    Info<< "time step continuity errors (" << mesh.name() << ")"
-        << ": sum local = " << sumLocalContErr
-        << ", global = " << globalContErr
-        << ", cumulative = " << cumulativeContErr[i]
-        << endl;
-}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/compressibleMultiRegionCourantNo.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/compressibleMultiRegionCourantNo.H
deleted file mode 100644
index e070c5966..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/compressibleMultiRegionCourantNo.H
+++ /dev/null
@@ -1,15 +0,0 @@
-    scalar CoNum = -great;
-    forAll(fluidRegions, regionI)
-    {
-        CoNum = max
-        (
-            compressibleCourantNo
-            (
-                fluidRegions[regionI],
-                runTime,
-                rhoFluid[regionI],
-                phiFluid[regionI]
-            ),
-            CoNum
-        );
-    }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
deleted file mode 100644
index c1bb05fc2..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
+++ /dev/null
@@ -1,277 +0,0 @@
-// Initialise fluid field pointer lists
-PtrList<rhoThermo> thermoFluid(fluidRegions.size());
-PtrList<volScalarField> rhoFluid(fluidRegions.size());
-PtrList<volVectorField> UFluid(fluidRegions.size());
-PtrList<surfaceScalarField> phiFluid(fluidRegions.size());
-PtrList<uniformDimensionedVectorField> gFluid(fluidRegions.size());
-PtrList<uniformDimensionedScalarField> hRefFluid(fluidRegions.size());
-PtrList<volScalarField> ghFluid(fluidRegions.size());
-PtrList<surfaceScalarField> ghfFluid(fluidRegions.size());
-PtrList<compressible::turbulenceModel> turbulence(fluidRegions.size());
-PtrList<volScalarField> p_rghFluid(fluidRegions.size());
-PtrList<radiation::radiationModel> radiation(fluidRegions.size());
-
-List<scalar> initialMassFluid(fluidRegions.size());
-List<label> pRefCellFluid(fluidRegions.size(), 0);
-List<scalar> pRefValueFluid(fluidRegions.size(), 0.0);
-List<bool> frozenFlowFluid(fluidRegions.size(), false);
-List<bool> residualReachedFluid(fluidRegions.size(), true);
-List<bool> residualControlUsedFluid(fluidRegions.size(), false);
-List<bool> firstIterationFluid(fluidRegions.size(), true);
-
-PtrList<dimensionedScalar> rhoMax(fluidRegions.size());
-PtrList<dimensionedScalar> rhoMin(fluidRegions.size());
-
-PtrList<IOMRFZoneList> MRFfluid(fluidRegions.size());
-PtrList<fv::options> fluidFvOptions(fluidRegions.size());
-
-// Populate fluid field pointer lists
-forAll(fluidRegions, i)
-{
-    Info<< "*** Reading fluid mesh thermophysical properties for region "
-        << fluidRegions[i].name() << nl << endl;
-
-    Info<< "    Adding to thermoFluid\n" << endl;
-
-    thermoFluid.set
-    (
-        i,
-        rhoThermo::New(fluidRegions[i]).ptr()
-    );
-
-    Info<< "    Adding to rhoFluid\n" << endl;
-    rhoFluid.set
-    (
-        i,
-        new volScalarField
-        (
-            IOobject
-            (
-                "rho",
-                runTime.timeName(),
-                fluidRegions[i],
-                IOobject::NO_READ,
-                IOobject::AUTO_WRITE
-            ),
-            thermoFluid[i].rho()
-        )
-    );
-
-    Info<< "    Adding to UFluid\n" << endl;
-    UFluid.set
-    (
-        i,
-        new volVectorField
-        (
-            IOobject
-            (
-                "U",
-                runTime.timeName(),
-                fluidRegions[i],
-                IOobject::MUST_READ,
-                IOobject::AUTO_WRITE
-            ),
-            fluidRegions[i]
-        )
-    );
-
-    Info<< "    Adding to phiFluid\n" << endl;
-    phiFluid.set
-    (
-        i,
-        new surfaceScalarField
-        (
-            IOobject
-            (
-                "phi",
-                runTime.timeName(),
-                fluidRegions[i],
-                IOobject::READ_IF_PRESENT,
-                IOobject::AUTO_WRITE
-            ),
-            linearInterpolate(rhoFluid[i]*UFluid[i])
-                & fluidRegions[i].Sf()
-        )
-    );
-
-    Info<< "    Adding to gFluid\n" << endl;
-    gFluid.set
-    (
-        i,
-        new uniformDimensionedVectorField
-        (
-            IOobject
-            (
-                "g",
-                runTime.constant(),
-                fluidRegions[i],
-                IOobject::MUST_READ,
-                IOobject::NO_WRITE
-            )
-        )
-    );
-
-    Info<< "    Adding to hRefFluid\n" << endl;
-    hRefFluid.set
-    (
-        i,
-        new uniformDimensionedScalarField
-        (
-            IOobject
-            (
-                "hRef",
-                runTime.constant(),
-                fluidRegions[i],
-                IOobject::READ_IF_PRESENT,
-                IOobject::NO_WRITE
-            ),
-            dimensionedScalar("hRef", dimLength, 0)
-        )
-    );
-
-    dimensionedScalar ghRef
-    (
-        mag(gFluid[i].value()) > small
-      ? gFluid[i]
-          & (cmptMag(gFluid[i].value())/mag(gFluid[i].value()))*hRefFluid[i]
-      : dimensionedScalar("ghRef", gFluid[i].dimensions()*dimLength, 0)
-    );
-
-    Info<< "    Adding to ghFluid\n" << endl;
-    ghFluid.set
-    (
-        i,
-        new volScalarField
-        (
-            "gh",
-            (gFluid[i] & fluidRegions[i].C()) - ghRef
-        )
-    );
-
-    Info<< "    Adding to ghfFluid\n" << endl;
-    ghfFluid.set
-    (
-        i,
-        new surfaceScalarField
-        (
-            "ghf",
-            (gFluid[i] & fluidRegions[i].Cf()) - ghRef
-        )
-    );
-
-    Info<< "    Adding to turbulence\n" << endl;
-    turbulence.set
-    (
-        i,
-        compressible::turbulenceModel::New
-        (
-            rhoFluid[i],
-            UFluid[i],
-            phiFluid[i],
-            thermoFluid[i]
-        ).ptr()
-    );
-
-    p_rghFluid.set
-    (
-        i,
-        new volScalarField
-        (
-            IOobject
-            (
-                "p_rgh",
-                runTime.timeName(),
-                fluidRegions[i],
-                IOobject::MUST_READ,
-                IOobject::AUTO_WRITE
-            ),
-            fluidRegions[i]
-        )
-    );
-
-    // Force p_rgh to be consistent with p
-    p_rghFluid[i] = thermoFluid[i].p() - rhoFluid[i]*ghFluid[i];
-
-    fluidRegions[i].setFluxRequired(p_rghFluid[i].name());
-
-    radiation.set
-    (
-        i,
-        radiation::radiationModel::New(thermoFluid[i].T())
-    );
-
-    initialMassFluid[i] = fvc::domainIntegrate(rhoFluid[i]).value();
-
-    const dictionary& simpleDict =
-        fluidRegions[i].solutionDict().subDict("SIMPLE");
-
-    setRefCell
-    (
-        thermoFluid[i].p(),
-        p_rghFluid[i],
-        simpleDict,
-        pRefCellFluid[i],
-        pRefValueFluid[i]
-    );
-
-    simpleDict.readIfPresent("frozenFlow", frozenFlowFluid[i]);
-
-    rhoMax.set
-    (
-        i,
-        new dimensionedScalar
-        (
-            dimensionedScalar::lookupOrDefault
-            (
-                "rhoMax",
-                simpleDict,
-                dimDensity,
-                great
-            )
-        )
-    );
-
-    rhoMin.set
-    (
-        i,
-        new dimensionedScalar
-        (
-            dimensionedScalar::lookupOrDefault
-            (
-                "rhoMin",
-                simpleDict,
-                dimDensity,
-                0
-            )
-        )
-    );
-
-    Info<< "    Adding MRF\n" << endl;
-    MRFfluid.set
-    (
-        i,
-        new IOMRFZoneList(fluidRegions[i])
-    );
-
-    Info<< "    Adding fvOptions\n" << endl;
-    fluidFvOptions.set
-    (
-        i,
-        new fv::options(fluidRegions[i])
-    );
-
-    turbulence[i].validate();
-
-    if (simpleDict.isDict("residualControl"))
-    {
-
-        Info<< "    Reading residual controls\n" << endl;
-
-        bool& residualControlUsed = residualControlUsedFluid[i];
-        bool& resReachedFluid = residualReachedFluid[i];
-        bool& firstIteration = firstIterationFluid[i];
-        const fvMesh& mesh = fluidRegions[i];
-
-        #include "readFluidMultiRegionResidualControls.H"
-    }
-}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidMeshes.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidMeshes.H
deleted file mode 100644
index 9ded78bb7..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidMeshes.H
+++ /dev/null
@@ -1,24 +0,0 @@
-    const wordList fluidNames(rp["fluid"]);
-
-    PtrList<fvMesh> fluidRegions(fluidNames.size());
-
-    forAll(fluidNames, i)
-    {
-        Info<< "Create fluid mesh for region " << fluidNames[i]
-            << " for time = " << runTime.timeName() << nl << endl;
-
-        fluidRegions.set
-        (
-            i,
-            new fvMesh
-            (
-                IOobject
-                (
-                    fluidNames[i],
-                    runTime.timeName(),
-                    runTime,
-                    IOobject::MUST_READ
-                )
-            )
-        );
-    }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H
deleted file mode 100644
index dc0e091d4..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-    rho = thermo.rho();
-    rho = max(rho, rhoMin[i]);
-    rho = min(rho, rhoMax[i]);
-    rho.relax();
-
-    volScalarField rAU("rAU", 1.0/UEqn.A());
-    surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_rgh));
-    tUEqn.clear();
-
-    surfaceScalarField phig(-rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
-
-    surfaceScalarField phiHbyA
-    (
-        "phiHbyA",
-        fvc::flux(rho*HbyA)
-    );
-
-    MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
-
-    bool closedVolume = adjustPhi(phiHbyA, U, p_rgh);
-
-    phiHbyA += phig;
-
-    // Update the pressure BCs to ensure flux consistency
-    constrainPressure(p_rgh, rho, U, phiHbyA, rhorAUf, MRF);
-
-    dimensionedScalar compressibility = fvc::domainIntegrate(psi);
-    bool compressible = (compressibility.value() > small);
-
-    // Solve pressure
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
-    {
-        fvScalarMatrix p_rghEqn
-        (
-            fvm::laplacian(rhorAUf, p_rgh) == fvc::div(phiHbyA)
-        );
-
-        p_rghEqn.setReference
-        (
-            pRefCell,
-            compressible ? getRefCellValue(p_rgh, pRefCell) : pRefValue
-        );
-
-        solvPerfp_rgh = p_rghEqn.solve();
-
-        if (nonOrth == nNonOrthCorr)
-        {
-            // Calculate the conservative fluxes
-            phi = phiHbyA - p_rghEqn.flux();
-
-            // Explicitly relax pressure for momentum corrector
-            p_rgh.relax();
-
-            // Correct the momentum source with the pressure gradient flux
-            // calculated from the relaxed pressure
-            U = HbyA + rAU*fvc::reconstruct((phig - p_rghEqn.flux())/rhorAUf);
-            U.correctBoundaryConditions();
-            fvOptions.correct(U);
-        }
-    }
-
-    p = p_rgh + rho*gh;
-
-    #include "continuityErrs.H"
-
-    // For closed-volume cases adjust the pressure level
-    // to obey overall mass continuity
-    if (closedVolume && compressible)
-    {
-        p += (initialMass - fvc::domainIntegrate(thermo.rho()))
-            /compressibility;
-        p_rgh = p - rho*gh;
-    }
-
-    rho = thermo.rho();
-    rho = max(rho, rhoMin[i]);
-    rho = min(rho, rhoMax[i]);
-    rho.relax();
-
-    Info<< "Min/max rho:" << min(rho).value() << ' '
-        << max(rho).value() << endl;
-}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/readFluidMultiRegionResidualControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/readFluidMultiRegionResidualControls.H
deleted file mode 100644
index b71b1ef39..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/readFluidMultiRegionResidualControls.H
+++ /dev/null
@@ -1,60 +0,0 @@
-const dictionary& residualControl =
-    mesh.solutionDict().subDict("SIMPLE").subOrEmptyDict("residualControl");
-
-scalar UTol = -1;
-scalar hTol = -1;
-scalar p_rghTol = -1;
-
-if (!residualControl.empty())
-{
-    if (!residualControl.subOrEmptyDict("U").empty())
-    {
-        UTol = readScalar(residualControl.subDict("U").lookup("tolerance"));
-    }
-
-    if (!residualControl.subOrEmptyDict("p_rgh").empty())
-    {
-        p_rghTol =
-            readScalar
-            (
-                residualControl.subDict("p_rgh").lookup("tolerance")
-            );
-    }
-
-    if (!residualControl.subOrEmptyDict("h").empty())
-    {
-        hTol = readScalar(residualControl.subDict("h").lookup("tolerance"));
-    }
-
-    //- Residual control used?
-    if (UTol != -1 || hTol != -1 || p_rghTol != -1)
-    {
-        residualControlUsed = true;
-        resReachedFluid = false;
-    }
-
-    if (firstIteration)
-    {
-        firstIteration = false;
-
-        if (UTol != -1 || hTol != -1 || p_rghTol != -1)
-        {
-            Info<< "SIMPLE convergence criteria\n";
-
-            if (UTol != -1)
-            {
-                Info<< "   field U      tolerance " << UTol << "\n";
-            }
-            if (hTol != -1)
-            {
-                Info<< "   field h      tolerance " << hTol << "\n";
-            }
-            if (p_rghTol != -1)
-            {
-                Info<< "   field p_rgh  tolerance " << p_rghTol << "\n";
-            }
-
-            Info<< endl;
-        }
-    }
-}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/readFluidMultiRegionSIMPLEControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/readFluidMultiRegionSIMPLEControls.H
deleted file mode 100644
index 1472397dc..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/readFluidMultiRegionSIMPLEControls.H
+++ /dev/null
@@ -1,7 +0,0 @@
-    const dictionary& simple = fluidRegions[i].solutionDict().subDict("SIMPLE");
-
-    const int nNonOrthCorr =
-        simple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
-
-    const bool momentumPredictor =
-        simple.lookupOrDefault("momentumPredictor", true);
\ No newline at end of file
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/residualControlsFluid.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/residualControlsFluid.H
deleted file mode 100644
index 9965f5c76..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/residualControlsFluid.H
+++ /dev/null
@@ -1,56 +0,0 @@
-// Residual control used
-if (residualControlUsed)
-{
-    bool UConv = false;
-    bool p_rghConv = false;
-    bool hConv = false;
-
-    // Check which field is not used for control
-    {
-        if (UTol == -1 || !momentumPredictor)
-        {
-            UConv =  true;
-        }
-
-        if (p_rghTol == -1)
-        {
-            p_rghConv = true;
-        }
-
-        if (hTol == -1)
-        {
-            hConv = true;
-        }
-    }
-
-    // Get the last initial residual of the solvers
-    if (momentumPredictor && !UConv)
-    {
-        if (UTol > cmptMax(solvPerfU.initialResidual()))
-        {
-            UConv = true;
-        }
-    }
-
-    if (!p_rghConv)
-    {
-        if (p_rghTol > solvPerfp_rgh.initialResidual())
-        {
-            p_rghConv = true;
-        }
-    }
-
-    if (!hConv)
-    {
-        if (hTol > solvPerfh.initialResidual())
-        {
-            hConv = true;
-        }
-    }
-
-    // Check if each field is converged
-    if (UConv && p_rghConv && hConv)
-    {
-        resReachedFluid = true;
-    }
-}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H
deleted file mode 100644
index 7249c06b2..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H
+++ /dev/null
@@ -1,39 +0,0 @@
-    const fvMesh& mesh = fluidRegions[i];
-
-    rhoThermo& thermo = thermoFluid[i];
-    thermo.validate(args.executable(), "h", "e");
-
-    volScalarField& rho = rhoFluid[i];
-    volVectorField& U = UFluid[i];
-    surfaceScalarField& phi = phiFluid[i];
-
-    compressible::turbulenceModel& turb = turbulence[i];
-
-    volScalarField& p = thermo.p();
-    const volScalarField& psi = thermo.psi();
-
-    IOMRFZoneList& MRF = MRFfluid[i];
-    fv::options& fvOptions = fluidFvOptions[i];
-
-    const dimensionedScalar initialMass
-    (
-        "initialMass",
-        dimMass,
-        initialMassFluid[i]
-    );
-
-    radiation::radiationModel& rad = radiation[i];
-
-    const label pRefCell = pRefCellFluid[i];
-    const scalar pRefValue = pRefValueFluid[i];
-    const bool frozenFlow = frozenFlowFluid[i];
-
-    volScalarField& p_rgh = p_rghFluid[i];
-
-    const dimensionedVector& g = gFluid[i];
-    const volScalarField& gh = ghFluid[i];
-    const surfaceScalarField& ghf = ghfFluid[i];
-
-    bool& resReachedFluid = residualReachedFluid[i];
-    bool& residualControlUsed = residualControlUsedFluid[i];
-    bool& firstIteration = firstIterationFluid[i];
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/solveFluid.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/solveFluid.H
deleted file mode 100644
index b43a94904..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/solveFluid.H
+++ /dev/null
@@ -1,19 +0,0 @@
-//  Pressure-velocity SIMPLE corrector
-
-    {
-        if (frozenFlow)
-        {
-            #include "EEqn.H"
-        }
-        else
-        {
-            p_rgh.storePrevIter();
-            rho.storePrevIter();
-
-            #include "UEqn.H"
-            #include "EEqn.H"
-            #include "pEqn.H"
-
-            turb.correct();
-        }
-    }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/createSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/createSolidFields.H
deleted file mode 100644
index 1799e5707..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/createSolidFields.H
+++ /dev/null
@@ -1,126 +0,0 @@
-// Initialise solid field pointer lists
-PtrList<coordinateSystem> coordinates(solidRegions.size());
-PtrList<solidThermo> thermos(solidRegions.size());
-PtrList<radiation::radiationModel> radiations(solidRegions.size());
-PtrList<fv::options> solidHeatSources(solidRegions.size());
-PtrList<volScalarField> betavSolid(solidRegions.size());
-PtrList<volSymmTensorField> aniAlphas(solidRegions.size());
-
-List<bool> residualReachedSolid(solidRegions.size(), true);
-List<bool> residualControlUsedSolid(solidRegions.size(), false);
-List<bool> firstIterationSolid(solidRegions.size(), true);
-
-// Populate solid field pointer lists
-forAll(solidRegions, i)
-{
-    Info<< "*** Reading solid mesh thermophysical properties for region "
-        << solidRegions[i].name() << nl << endl;
-
-    Info<< "    Adding to thermos\n" << endl;
-    thermos.set(i, solidThermo::New(solidRegions[i]));
-
-    Info<< "    Adding to radiations\n" << endl;
-    radiations.set(i, radiation::radiationModel::New(thermos[i].T()));
-
-    Info<< "    Adding fvOptions\n" << endl;
-    solidHeatSources.set
-    (
-        i,
-        new fv::options(solidRegions[i])
-    );
-
-    if (!thermos[i].isotropic())
-    {
-        Info<< "    Adding coordinateSystems\n" << endl;
-        coordinates.set
-        (
-            i,
-            coordinateSystem::New(solidRegions[i], thermos[i])
-        );
-
-        tmp<volVectorField> tkappaByCp =
-            thermos[i].Kappa()/thermos[i].Cp();
-
-        aniAlphas.set
-        (
-            i,
-            new volSymmTensorField
-            (
-                IOobject
-                (
-                    "Anialpha",
-                    runTime.timeName(),
-                    solidRegions[i],
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE
-                ),
-                solidRegions[i],
-                dimensionedSymmTensor
-                (
-                    "zero",
-                    tkappaByCp().dimensions(),
-                    Zero
-                ),
-                zeroGradientFvPatchSymmTensorField::typeName
-            )
-        );
-
-        aniAlphas[i].primitiveFieldRef() =
-            coordinates[i].R().transformVector(tkappaByCp());
-        aniAlphas[i].correctBoundaryConditions();
-
-    }
-
-    IOobject betavSolidIO
-    (
-        "betavSolid",
-        runTime.timeName(),
-        solidRegions[i],
-        IOobject::MUST_READ,
-        IOobject::AUTO_WRITE
-    );
-
-    if (betavSolidIO.typeHeaderOk<volScalarField>(true))
-    {
-        betavSolid.set
-        (
-            i,
-            new volScalarField(betavSolidIO, solidRegions[i])
-        );
-    }
-    else
-    {
-        betavSolid.set
-        (
-            i,
-            new volScalarField
-            (
-                IOobject
-                (
-                    "betavSolid",
-                    runTime.timeName(),
-                    solidRegions[i],
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE
-                ),
-                solidRegions[i],
-                dimensionedScalar("1", dimless, scalar(1))
-            )
-        );
-    }
-
-    const dictionary& simpleDict =
-        solidRegions[i].solutionDict().subDict("SIMPLE");
-
-    if (simpleDict.isDict("residualControl"))
-    {
-        Info<< "    Reading residual controls\n" << endl;
-
-        bool& residualControlUsed = residualControlUsedSolid[i];
-        bool& resReachedSolid = residualReachedSolid[i];
-        bool& firstIteration = firstIterationSolid[i];
-        const fvMesh& mesh = solidRegions[i];
-
-        #include "readSolidMultiRegionResidualControls.H"
-    }
-}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/createSolidMeshes.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/createSolidMeshes.H
deleted file mode 120000
index 66ac87b9d..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/createSolidMeshes.H
+++ /dev/null
@@ -1 +0,0 @@
-../../solid/createSolidMeshes.H
\ No newline at end of file
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/readSolidMultiRegionResidualControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/readSolidMultiRegionResidualControls.H
deleted file mode 100644
index dc0042e11..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/readSolidMultiRegionResidualControls.H
+++ /dev/null
@@ -1,36 +0,0 @@
-const dictionary& residualControl =
-    mesh.solutionDict().subDict("SIMPLE").subOrEmptyDict("residualControl");
-
-scalar hTol = -1;
-
-if (!residualControl.empty())
-{
-    if (!residualControl.subOrEmptyDict("h").empty())
-    {
-        hTol = readScalar(residualControl.subDict("h").lookup("tolerance"));
-
-        //- Used residual control for actual solid region
-        if (hTol != -1)
-        {
-            residualControlUsed = true;
-            resReachedSolid = false;
-        }
-    }
-
-    if (firstIteration)
-    {
-        firstIteration = false;
-
-        if (hTol != -1)
-        {
-            Info<< "SIMPLE convergence criteria\n";
-
-            if (hTol != -1)
-            {
-                Info<< "   field h      tolerance " << hTol << "\n";
-            }
-
-            Info<< endl;
-        }
-    }
-}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/readSolidMultiRegionSIMPLEControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/readSolidMultiRegionSIMPLEControls.H
deleted file mode 100644
index 41b76293e..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/readSolidMultiRegionSIMPLEControls.H
+++ /dev/null
@@ -1,4 +0,0 @@
-const dictionary& simple = mesh.solutionDict().subDict("SIMPLE");
-
-const int nNonOrthCorr =
-    simple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/residualControlsSolid.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/residualControlsSolid.H
deleted file mode 120000
index 22a456cf1..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/residualControlsSolid.H
+++ /dev/null
@@ -1 +0,0 @@
-../../solid/residualControlsSolid.H
\ No newline at end of file
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H
deleted file mode 120000
index b0d6f27aa..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H
+++ /dev/null
@@ -1 +0,0 @@
-../../solid/setRegionSolidFields.H
\ No newline at end of file
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/solveSolid.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/solveSolid.H
deleted file mode 100644
index aa349a87f..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/solveSolid.H
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
-    {
-        fvScalarMatrix hEqn
-        (
-            (
-                thermo.isotropic()
-              ? -fvm::laplacian(betav*thermo.alpha(), h, "laplacian(alpha,h)")
-              : -fvm::laplacian(betav*taniAlpha(), h, "laplacian(alpha,h)")
-            )
-          ==
-            fvOptions(rho, h)
-        );
-
-        hEqn.relax();
-
-        fvOptions.constrain(hEqn);
-
-        solvPerfh = hEqn.solve();
-
-        fvOptions.correct(h);
-    }
-}
-
-thermo.correct();
-
-Info<< "Min/max T:" << min(thermo.T()).value() << ' '
-    << max(thermo.T()).value() << endl;
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/createFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/createFields.H
index f7a5260cc..30f445230 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/createFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/createFields.H
@@ -1,7 +1,2 @@
 #include "createFluidFields.H"
 #include "createSolidFields.H"
-
-SolverPerformance<vector> solvPerfU;
-SolverPerformance<scalar> solvPerfh;
-SolverPerformance<scalar> solvPerfhe;
-SolverPerformance<scalar> solvPerfp_rgh;
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/EEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/EEqn.H
index 3b10be765..ab467c50e 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/EEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/EEqn.H
@@ -27,7 +27,7 @@
 
     fvOptions.constrain(EEqn);
 
-    solvPerfhe = EEqn.solve(mesh.solver(he.select(finalIter)));
+    EEqn.solve();
 
     fvOptions.correct(he);
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H
index 677f9fb11..e7eea337d 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H
@@ -16,23 +16,23 @@
 
     fvOptions.constrain(UEqn);
 
-    if (momentumPredictor)
+    if (pimple.momentumPredictor())
     {
-        solvPerfU =
-            solve
+        solve
+        (
+            UEqn
+         ==
+            fvc::reconstruct
             (
-                UEqn
-              ==
-                fvc::reconstruct
                 (
-                    (
-                      - ghf*fvc::snGrad(rho)
-                      - fvc::snGrad(p_rgh)
-                    )*mesh.magSf()
-                ),
-                mesh.solver(U.select(finalIter))
-            );
+                  - ghf*fvc::snGrad(rho)
+                  - fvc::snGrad(p_rgh)
+                )*mesh.magSf()
+            )
+        );
 
         fvOptions.correct(U);
         K = 0.5*magSqr(U);
     }
+
+    fvOptions.correct(U);
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleContinuityErrors.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleContinuityErrors.H
deleted file mode 100644
index 046ca5ec3..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleContinuityErrors.H
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    dimensionedScalar totalMass = fvc::domainIntegrate(rho);
-
-    scalar sumLocalContErr =
-    (
-        fvc::domainIntegrate(mag(rho - thermo.rho()))/totalMass
-    ).value();
-
-    scalar globalContErr =
-    (
-        fvc::domainIntegrate(rho - thermo.rho())/totalMass
-    ).value();
-
-    cumulativeContErr[i] += globalContErr;
-
-    Info<< "time step continuity errors (" << mesh.name() << ")"
-        << ": sum local = " << sumLocalContErr
-        << ", global = " << globalContErr
-        << ", cumulative = " << cumulativeContErr[i]
-        << endl;
-}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleMultiRegionCourantNo.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleMultiRegionCourantNo.H
index d62806050..7af4be54d 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleMultiRegionCourantNo.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleMultiRegionCourantNo.H
@@ -14,19 +14,3 @@
             CoNum
         );
     }
-/*
-    forAll(porousFluidRegions, porousI)
-    {
-        CoNum = max
-        (
-            compressibleCourantNo
-            (
-                porousFluidRegions[porousI],
-                runTime,
-                rhoPorous[porousI],
-                phiPorous[porousI]
-            ),
-            CoNum
-        );
-    }
-*/
\ No newline at end of file
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
index 9f001d43a..c8484f8f7 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
@@ -18,10 +18,6 @@ PtrList<multivariateSurfaceInterpolationScheme<scalar>::fieldTable>
 PtrList<volScalarField> QdotFluid(fluidRegions.size());
 
 List<scalar> initialMassFluid(fluidRegions.size());
-List<bool> frozenFlowFluid(fluidRegions.size(), false);
-List<bool> residualReachedFluid(fluidRegions.size(), true);
-List<bool> residualControlUsedFluid(fluidRegions.size(), false);
-List<bool> firstIterationFluid(fluidRegions.size(), true);
 
 PtrList<IOMRFZoneList> MRFfluid(fluidRegions.size());
 PtrList<fv::options> fluidFvOptions(fluidRegions.size());
@@ -274,10 +270,6 @@ forAll(fluidRegions, i)
         )
     );
 
-    const dictionary& pimpleDict =
-        fluidRegions[i].solutionDict().subDict("PIMPLE");
-    pimpleDict.readIfPresent("frozenFlow", frozenFlowFluid[i]);
-
     Info<< "    Adding MRF\n" << endl;
     MRFfluid.set
     (
@@ -293,16 +285,4 @@ forAll(fluidRegions, i)
     );
 
     turbulenceFluid[i].validate();
-
-    if (pimpleDict.isDict("residualControl"))
-    {
-        Info<< "    Reading residual controls\n" << endl;
-
-        bool& residualControlUsed = residualControlUsedFluid[i];
-        bool& resReachedFluid = residualReachedFluid[i];
-        bool& firstIteration = firstIterationFluid[i];
-        const fvMesh& mesh = fluidRegions[i];
-
-        #include "readFluidMultiRegionResidualControls.H"
-    }
 }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidPressureControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidPressureControls.H
new file mode 100644
index 000000000..0134fd358
--- /dev/null
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidPressureControls.H
@@ -0,0 +1,16 @@
+PtrList<pressureControl> pressureControlFluid(fluidRegions.size());
+
+forAll(fluidRegions, i)
+{
+    pressureControlFluid.set
+    (
+        i,
+        new pressureControl
+        (
+            p_rghFluid[i],
+            rhoFluid[i],
+            pimples.pimple(i).dict(),
+            false
+        )
+    );
+}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/initContinuityErrs.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/initContinuityErrs.H
index 1a7f5a326..354a85a03 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/initContinuityErrs.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/initContinuityErrs.H
@@ -1 +1 @@
-List<scalar> cumulativeContErr(fluidRegions.size(), 0.0);
+List<scalar> cumulativeContErrs(fluidRegions.size(), 0.0);
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
index c29dbe5fc..77689a595 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H
@@ -1,69 +1,87 @@
-bool closedVolume = p_rgh.needReference();
-dimensionedScalar compressibility = fvc::domainIntegrate(psi);
-bool compressible = (compressibility.value() > small);
-
-rho = thermo.rho();
+if (!mesh.steady() && !pimple.SIMPLErho())
+{
+    rho = thermo.rho();
+}
 
 volScalarField rAU("rAU", 1.0/UEqn.A());
 surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
 volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_rgh));
+if (pimple.nCorrPISO() <= 1)
+{
+    tUEqn.clear();
+}
 
 surfaceScalarField phig(-rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf());
 
 surfaceScalarField phiHbyA
 (
     "phiHbyA",
-    (
-        fvc::flux(rho*HbyA)
-      + rhorAUf*fvc::ddtCorr(rho, U, phi)
-    )
-  + phig
+    fvc::flux(rho*HbyA) + rhorAUf*fvc::ddtCorr(rho, U, phi)
 );
 
 MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
 
+const bool closedVolume = adjustPhi(phiHbyA, U, p_rgh);
+const bool adjustMass = closedVolume && !thermo.incompressible();
+
+phiHbyA += phig;
+
 // Update the pressure BCs to ensure flux consistency
 constrainPressure(p_rgh, rho, U, phiHbyA, rhorAUf, MRF);
 
 {
-    fvScalarMatrix p_rghDDtEqn
+    fvScalarMatrix p_rghEqnComp
     (
         fvc::ddt(rho) + psi*correction(fvm::ddt(p_rgh))
-      + fvc::div(phiHbyA)
     );
 
+    if (pimple.transonic())
+    {
+        surfaceScalarField phid
+        (
+            "phid",
+            (fvc::interpolate(psi)/fvc::interpolate(rho))*phiHbyA
+        );
+
+        phiHbyA -= fvc::interpolate(psi*p_rgh)*phiHbyA/fvc::interpolate(rho);
+
+        p_rghEqnComp += fvm::div(phid, p_rgh);
+    }
+
     // Thermodynamic density needs to be updated by psi*d(p) after the
     // pressure solution
-    const volScalarField psip0(psi*p);
+    tmp<volScalarField> psip0(mesh.steady() ? tmp<volScalarField>() : psi*p);
 
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
-        fvScalarMatrix p_rghEqn
+        fvScalarMatrix p_rghEqnIncomp
         (
-            p_rghDDtEqn
+            fvc::div(phiHbyA)
           - fvm::laplacian(rhorAUf, p_rgh)
         );
 
-        solvPerfp_rgh = p_rghEqn.solve
+        fvScalarMatrix p_rghEqn(p_rghEqnComp + p_rghEqnIncomp);
+
+        p_rghEqn.setReference
         (
-            mesh.solver
-            (
-                p_rgh.select
-                (
-                    (
-                        oCorr == nOuterCorr-1
-                     && corr == nCorr-1
-                     && nonOrth == nNonOrthCorr
-                    )
-                )
-            )
+            pressureControl.refCell(),
+            pressureControl.refValue()
         );
 
-        if (nonOrth == nNonOrthCorr)
+        p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
+
+        if (pimple.finalNonOrthogonalIter())
         {
+            // Calculate the conservative fluxes
             phi = phiHbyA + p_rghEqn.flux();
+
+            // Explicitly relax pressure for momentum corrector
+            p_rgh.relax();
+
+            // Correct the momentum source with the pressure gradient flux
+            // calculated from the relaxed pressure
             U = HbyA
-              + rAU*fvc::reconstruct((phig + p_rghEqn.flux())/rhorAUf);
+                + rAU*fvc::reconstruct((phig + p_rghEqnIncomp.flux())/rhorAUf);
             U.correctBoundaryConditions();
             fvOptions.correct(U);
             K = 0.5*magSqr(U);
@@ -73,7 +91,10 @@ constrainPressure(p_rgh, rho, U, phiHbyA, rhorAUf, MRF);
     p = p_rgh + rho*gh;
 
     // Thermodynamic density update
-    thermo.correctRho(psi*p - psip0);
+    if (!mesh.steady())
+    {
+        thermo.correctRho(psi*p - psip0);
+    }
 }
 
 // Update pressure time derivative if needed
@@ -83,17 +104,43 @@ if (thermo.dpdt())
 }
 
 // Solve continuity
-#include "rhoEqn.H"
+if (!mesh.steady())
+{
+    #include "rhoEqn.H"
+    #include "compressibleContinuityErrs.H"
+}
+else
+{
+    #include "incompressible/continuityErrs.H"
+}
 
-// Update continuity errors
-#include "compressibleContinuityErrors.H"
+// Pressure limiting
+const bool pLimited = pressureControl.limit(p);
 
-// For closed-volume cases adjust the pressure and density levels
+// For closed-volume compressible cases adjust the pressure level
 // to obey overall mass continuity
-if (closedVolume && compressible)
+if (adjustMass)
 {
     p += (initialMass - fvc::domainIntegrate(thermo.rho()))
-        /compressibility;
-    rho = thermo.rho();
+        /fvc::domainIntegrate(psi);
     p_rgh = p - rho*gh;
 }
+
+if (adjustMass || pLimited)
+{
+    p.correctBoundaryConditions();
+}
+
+// Density updates
+if (adjustMass || pLimited || mesh.steady() || pimple.SIMPLErho())
+{
+    rho = thermo.rho();
+}
+
+if (mesh.steady() && !pimple.transonic())
+{
+    rho.relax();
+}
+
+Info<< "Min/max rho:" << min(rho).value() << ' '
+    << max(rho).value() << endl;
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPIMPLEControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPIMPLEControls.H
deleted file mode 100644
index a6f6aad8a..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionPIMPLEControls.H
+++ /dev/null
@@ -1,10 +0,0 @@
-    const dictionary& pimple = mesh.solutionDict().subDict("PIMPLE");
-
-    const int nCorr =
-        pimple.lookupOrDefault<int>("nCorrectors", 1);
-
-    const int nNonOrthCorr =
-        pimple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
-
-    const bool momentumPredictor =
-        pimple.lookupOrDefault("momentumPredictor", true);
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionResidualControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionResidualControls.H
deleted file mode 100644
index 7e5a5cd81..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/readFluidMultiRegionResidualControls.H
+++ /dev/null
@@ -1,60 +0,0 @@
-const dictionary& residualControl =
-    mesh.solutionDict().subDict("PIMPLE").subOrEmptyDict("residualControl");
-
-scalar UTol = -1;
-scalar heTol = -1;
-scalar p_rghTol = -1;
-
-if (!residualControl.empty())
-{
-    if (!residualControl.subOrEmptyDict("U").empty())
-    {
-        UTol = readScalar(residualControl.subDict("U").lookup("tolerance"));
-    }
-
-    if (!residualControl.subOrEmptyDict("p_rgh").empty())
-    {
-        p_rghTol =
-            readScalar
-            (
-                residualControl.subDict("p_rgh").lookup("tolerance")
-            );
-    }
-
-    if (!residualControl.subOrEmptyDict("h").empty())
-    {
-        heTol = readScalar(residualControl.subDict("h").lookup("tolerance"));
-    }
-
-    // Residual control used?
-    if (UTol != -1 || heTol != -1 || p_rghTol != -1)
-    {
-        residualControlUsed = true;
-        resReachedFluid = false;
-    }
-
-    if (firstIteration)
-    {
-        firstIteration = false;
-
-        if (UTol != -1 || heTol != -1 || p_rghTol != -1)
-        {
-            Info<< "PIMPLE convergence criteria\n";
-
-            if (UTol != -1)
-            {
-                Info<< "   field U      tolerance " << UTol << "\n";
-            }
-            if (heTol != -1)
-            {
-                Info<< "   field h      tolerance " << heTol << "\n";
-            }
-            if (p_rghTol != -1)
-            {
-                Info<< "   field p_rgh  tolerance " << p_rghTol << "\n";
-            }
-
-            Info<< endl;
-        }
-    }
-}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/residualControlsFluid.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/residualControlsFluid.H
deleted file mode 100644
index 24b4370bc..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/residualControlsFluid.H
+++ /dev/null
@@ -1,55 +0,0 @@
-if (residualControlUsed)
-{
-    bool UConv = false;
-    bool p_rghConv = false;
-    bool heConv = false;
-
-    // Check which field is not used for control
-    {
-        if (UTol == -1 || !momentumPredictor)
-        {
-            UConv =  true;
-        }
-
-        if (p_rghTol == -1)
-        {
-            p_rghConv = true;
-        }
-
-        if (heTol == -1)
-        {
-            heConv = true;
-        }
-    }
-
-    // Get the last initial residual of the solvers
-    if (momentumPredictor && !UConv)
-    {
-        if (UTol > cmptMax(solvPerfU.initialResidual()))
-        {
-            UConv = true;
-        }
-    }
-
-    if (!p_rghConv)
-    {
-        if (p_rghTol > solvPerfp_rgh.initialResidual())
-        {
-            p_rghConv = true;
-        }
-    }
-
-    if (!heConv)
-    {
-        if (heTol > solvPerfhe.initialResidual())
-        {
-            heConv = true;
-        }
-    }
-
-    // Check if each field is converged
-    if (UConv && p_rghConv && heConv)
-    {
-        resReachedFluid = true;
-    }
-}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
index d9df29a15..6ef10d410 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
@@ -1,8 +1,8 @@
-    fvMesh& mesh = fluidRegions[i];
+    const fvMesh& mesh = fluidRegions[i];
 
     CombustionModel<rhoReactionThermo>& reaction = reactionFluid[i];
 
-    rhoReactionThermo& thermo = reaction.thermo();
+    rhoReactionThermo& thermo = thermoFluid[i];
     thermo.validate(args.executable(), "h", "e");
 
     basicMultiComponentMixture& composition = thermo.composition();
@@ -57,8 +57,8 @@
         initialMassFluid[i]
     );
 
-    const bool frozenFlow = frozenFlowFluid[i];
+    pimpleNoLoopControl& pimple = pimples.pimple(i);
 
-    bool& resReachedFluid = residualReachedFluid[i];
-    bool& residualControlUsed = residualControlUsedFluid[i];
-    bool& firstIteration = firstIterationFluid[i];
+    pressureControl& pressureControl = pressureControlFluid[i];
+
+    scalar cumulativeContErr = cumulativeContErrs[i];
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveFluid.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveFluid.H
index d4d18e9fd..1bba4ca82 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveFluid.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveFluid.H
@@ -1,15 +1,10 @@
-if (finalIter)
-{
-    mesh.data::add("finalIteration", true);
-}
-
-if (frozenFlow)
+if (!pimple.solveFlow())
 {
     #include "EEqn.H"
 }
 else
 {
-    if (oCorr == 0)
+    if (!mesh.steady() && pimples.nCorrPIMPLE() <= 1)
     {
         #include "rhoEqn.H"
     }
@@ -19,17 +14,18 @@ else
     #include "EEqn.H"
 
     // --- PISO loop
-    for (int corr=0; corr<nCorr; corr++)
+    while (pimple.correct())
     {
         #include "pEqn.H"
     }
 
-    turbulence.correct();
+    if (pimples.pimpleTurbCorr(i))
+    {
+        turbulence.correct();
+    }
 
-    rho = thermo.rho();
-}
-
-if (finalIter)
-{
-    mesh.data::remove("finalIteration");
+    if (!mesh.steady() && pimples.finalIter())
+    {
+        rho = thermo.rho();
+    }
 }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/storeOldFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/storeOldFluidFields.H
deleted file mode 100644
index a5b1e0243..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/storeOldFluidFields.H
+++ /dev/null
@@ -1,2 +0,0 @@
-p_rghFluid[i].storePrevIter();
-rhoFluid[i].storePrevIter();
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/readPIMPLEControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/readPIMPLEControls.H
deleted file mode 100644
index 7405dee8d..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/readPIMPLEControls.H
+++ /dev/null
@@ -1,8 +0,0 @@
-    // We do not have a top-level mesh. Construct the fvSolution for
-    // the runTime instead.
-    fvSolution solutionDict(runTime);
-
-    const dictionary& pimple = solutionDict.subDict("PIMPLE");
-
-    const int nOuterCorr =
-        pimple.lookupOrDefault<int>("nOuterCorrectors", 1);
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
index 56fdc11de..a65afcb02 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
@@ -6,10 +6,6 @@ PtrList<fv::options> solidHeatSources(solidRegions.size());
 PtrList<volScalarField> betavSolid(solidRegions.size());
 PtrList<volSymmTensorField> aniAlphas(solidRegions.size());
 
-List<bool> residualReachedSolid(solidRegions.size(), true);
-List<bool> residualControlUsedSolid(solidRegions.size(), false);
-List<bool> firstIterationSolid(solidRegions.size(), true);
-
 // Populate solid field pointer lists
 forAll(solidRegions, i)
 {
@@ -108,19 +104,4 @@ forAll(solidRegions, i)
             )
         );
     }
-
-    const dictionary& pimpleDict =
-        solidRegions[i].solutionDict().subDict("PIMPLE");
-
-    if (pimpleDict.isDict("residualControl"))
-    {
-        Info<< "    Reading residual controls\n" << endl;
-
-        bool& residualControlUsed = residualControlUsedSolid[i];
-        bool& resReachedSolid = residualReachedSolid[i];
-        bool& firstIteration = firstIterationSolid[i];
-        const fvMesh& mesh = solidRegions[i];
-
-        #include "readSolidMultiRegionResidualControls.H"
-    }
 }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/readSolidMultiRegionPIMPLEControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/readSolidMultiRegionPIMPLEControls.H
deleted file mode 100644
index fbed7f41e..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/readSolidMultiRegionPIMPLEControls.H
+++ /dev/null
@@ -1,4 +0,0 @@
-const dictionary& pimple = mesh.solutionDict().subDict("PIMPLE");
-
-int nNonOrthCorr =
-    pimple.lookupOrDefault<int>("nNonOrthogonalCorrectors", 0);
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/readSolidMultiRegionResidualControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/readSolidMultiRegionResidualControls.H
deleted file mode 100644
index 5623de220..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/readSolidMultiRegionResidualControls.H
+++ /dev/null
@@ -1,36 +0,0 @@
-const dictionary& residualControl =
-    mesh.solutionDict().subDict("PIMPLE").subOrEmptyDict("residualControl");
-
-scalar hTol = -1;
-
-if (!residualControl.empty())
-{
-    if (!residualControl.subOrEmptyDict("h").empty())
-    {
-        hTol = readScalar(residualControl.subDict("h").lookup("tolerance"));
-
-        // Used residual control for actual solid region
-        if (hTol != -1)
-        {
-            residualControlUsed = true;
-            resReachedSolid = false;
-        }
-    }
-
-    if (firstIteration)
-    {
-        firstIteration = false;
-
-        if (hTol != -1)
-        {
-            Info<< "PIMPLE convergence criteria\n";
-
-            if (hTol != -1)
-            {
-                Info<< "   field h      tolerance " << hTol << "\n";
-            }
-
-            Info<< endl;
-        }
-    }
-}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/residualControlsSolid.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/residualControlsSolid.H
deleted file mode 100644
index 32ef7dbcb..000000000
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/residualControlsSolid.H
+++ /dev/null
@@ -1,8 +0,0 @@
-// Residual control used
-if (residualControlUsed)
-{
-    if (hTol > solvPerfh.initialResidual())
-    {
-        resReachedSolid = true;
-    }
-}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H
index 14abe1314..aa736e7d9 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H
@@ -31,6 +31,4 @@ const volScalarField& betav = betavSolid[i];
 
 fv::options& fvOptions = solidHeatSources[i];
 
-bool& resReachedSolid = residualReachedSolid[i];
-bool& residualControlUsed = residualControlUsedSolid[i];
-bool& firstIteration = firstIterationSolid[i];
+solidNoLoopControl& pimple = pimples.solid(i);
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H
index f7a2cbc12..697e90207 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H
@@ -1,18 +1,13 @@
-if (finalIter)
 {
-    mesh.data::add("finalIteration", true);
-}
-
-{
-    for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+    while (pimple.correctNonOrthogonal())
     {
         fvScalarMatrix hEqn
         (
             fvm::ddt(betav*rho, h)
           - (
-               thermo.isotropic()
-             ? fvm::laplacian(betav*thermo.alpha(), h, "laplacian(alpha,h)")
-             : fvm::laplacian(betav*taniAlpha(), h, "laplacian(alpha,h)")
+                thermo.isotropic()
+              ? fvm::laplacian(betav*thermo.alpha(), h, "laplacian(alpha,h)")
+              : fvm::laplacian(betav*taniAlpha(), h, "laplacian(alpha,h)")
             )
           ==
             fvOptions(rho, h)
@@ -22,7 +17,7 @@ if (finalIter)
 
         fvOptions.constrain(hEqn);
 
-        solvPerfh = hEqn.solve(mesh.solver(h.select(finalIter)));
+        hEqn.solve(mesh.solver(h.select(pimples.finalIter())));
 
         fvOptions.correct(h);
     }
@@ -32,8 +27,3 @@ thermo.correct();
 
 Info<< "Min/max T:" << min(thermo.T()).value() << ' '
     << max(thermo.T()).value() << endl;
-
-if (finalIter)
-{
-    mesh.data::remove("finalIteration");
-}
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/T b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/air/T
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/T
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/air/T
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/U b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/air/U
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/U
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/air/U
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/alphat b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/air/alphat
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/alphat
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/air/alphat
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/epsilon b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/air/epsilon
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/epsilon
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/air/epsilon
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/k b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/air/k
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/k
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/air/k
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/nut b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/air/nut
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/nut
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/air/nut
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/p b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/air/p
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/p
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/air/p
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/p_rgh b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/air/p_rgh
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/air/p_rgh
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/air/p_rgh
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/AoV b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/porous/AoV
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/AoV
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/porous/AoV
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/T b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/porous/T
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/T
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/porous/T
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/U b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/porous/U
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/U
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/porous/U
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/htcConst b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/porous/htcConst
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/htcConst
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/porous/htcConst
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/p b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/porous/p
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/p
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/porous/p
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/p_rgh b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/porous/p_rgh
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/0.orig/porous/p_rgh
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/0.orig/porous/p_rgh
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/Allclean
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allclean
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/Allclean
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/Allrun
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/Allrun
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun-parallel b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/Allrun-parallel
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun-parallel
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/Allrun-parallel
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/Allrun.pre
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun.pre
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/Allrun.pre
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/MRFProperties b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/air/MRFProperties
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/MRFProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/air/MRFProperties
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/air/fvOptions
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/air/fvOptions
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/g b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/air/g
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/g
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/air/g
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/air/radiationProperties
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/radiationProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/air/radiationProperties
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/air/thermophysicalProperties
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/thermophysicalProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/air/thermophysicalProperties
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/air/turbulenceProperties
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/turbulenceProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/air/turbulenceProperties
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/porous/fvOptions
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/porous/fvOptions
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/g b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/porous/g
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/g
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/porous/g
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/porous/thermophysicalProperties
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/thermophysicalProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/porous/thermophysicalProperties
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/porous/turbulenceProperties
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/turbulenceProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/porous/turbulenceProperties
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/regionProperties
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/regionProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/regionProperties
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/blockMeshDict
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/blockMeshDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/blockMeshDict
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/createBafflesDict b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/createBafflesDict
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/createBafflesDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/createBafflesDict
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/decomposeParDict
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/decomposeParDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/decomposeParDict
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/fvSchemes
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSchemes
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/fvSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/fvSolution
similarity index 73%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSolution
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/fvSolution
index 895988eac..cf328bbbf 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/fvSolution
@@ -10,55 +10,49 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
+    location    "system/air";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 solvers
 {
-    p_rgh
+    "p_rgh.*"
     {
         solver           GAMG;
         tolerance        1e-7;
         relTol           0.01;
-
         smoother         DIC;
-
-
         maxIter          100;
     }
 
-    "(U|h|e|k|epsilon)"
+    "(U|h|e|k|epsilon).*"
     {
-        solver          PBiCGStab;
-        preconditioner  DILU;
-        tolerance       1e-6;
-        relTol          0.1;
+        solver           PBiCGStab;
+        preconditioner   DILU;
+        tolerance        1e-6;
+        relTol           0.1;
     }
 }
 
-SIMPLE
+PIMPLE
 {
     nNonOrthogonalCorrectors 0;
-    rhoMax          2;
-    rhoMin          1;
 }
 
-
 relaxationFactors
 {
     fields
     {
-        rho             1;
-        p_rgh           0.7;
+        "rho.*"         1;
+        "p_rgh.*"       0.7;
     }
     equations
     {
-        U               0.3;
-        "(h|e)"         0.3;
-        k               0.3;
-        epsilon         0.3;
+        "U.*"           0.3;
+        "(h|e).*"       0.3;
+        "k.*"           0.3;
+        "epsilon.*"     0.3;
     }
 }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.1 b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/topoSetDict.1
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.1
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/topoSetDict.1
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.2 b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/topoSetDict.2
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/air/topoSetDict.2
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/air/topoSetDict.2
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/controlDict
similarity index 96%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/controlDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/controlDict
index 0a4ea76bc..a850d724e 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/controlDict
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     chtMultiRegionSimpleFoam;
+application     chtMultiRegionFoam;
 
 startFrom       latestTime;
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/decomposeParDict
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/decomposeParDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/decomposeParDict
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/fvSchemes
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/fvSchemes
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/fvSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/fvSolution
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/fvSolution
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/fvSolution
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/porous/blockMeshDict
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/blockMeshDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/porous/blockMeshDict
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/porous/decomposeParDict
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/decomposeParDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/porous/decomposeParDict
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/porous/fvSchemes
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSchemes
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/porous/fvSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/porous/fvSolution
similarity index 82%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSolution
rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/porous/fvSolution
index 945f8ea24..1e0b61b18 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/system/porous/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/system/porous/fvSolution
@@ -10,25 +10,23 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system/porous";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 solvers
 {
-    p_rgh
+    "p_rgh.*"
     {
         solver           GAMG;
         tolerance        1e-7;
         relTol           0.01;
-
         smoother         DIC;
-
-
         maxIter          10;
     }
 
-    "(U|h|e|k|epsilon)"
+    "(U|h|e|k|epsilon).*"
     {
         solver           PBiCGStab;
         preconditioner   DILU;
@@ -37,26 +35,24 @@ solvers
     }
 }
 
-SIMPLE
+PIMPLE
 {
     nNonOrthogonalCorrectors 0;
-    rhoMax          1100;
-    rhoMin          900;
 }
 
 relaxationFactors
 {
     fields
     {
-        rho             1;
-        p_rgh           0.7;
+        "rho.*"         1;
+        "p_rgh.*"       0.7;
     }
     equations
     {
-        U               0.3;
-        "(h|e)"         0.3;
-        k               0.3;
-        epsilon         0.3;
+        "U.*"           0.3;
+        "(h|e).*"       0.3;
+        "k.*"           0.3;
+        "epsilon.*"     0.3;
     }
 }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/G b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/0/G
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/G
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/0/G
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/IDefault b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/0/IDefault
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/IDefault
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/0/IDefault
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/T b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/0/T
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/T
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/0/T
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/U b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/0/U
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/U
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/0/U
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/epsilon b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/0/epsilon
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/epsilon
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/0/epsilon
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/k b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/0/k
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/k
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/0/k
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/p b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/0/p
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/p
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/0/p
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/p_rgh b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/0/p_rgh
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/p_rgh
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/0/p_rgh
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/qr b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/0/qr
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/0/qr
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/0/qr
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/Allclean
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allclean
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/Allclean
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/Allrun
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/Allrun
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun-parallel b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/Allrun-parallel
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun-parallel
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/Allrun-parallel
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun.pre b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/Allrun.pre
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun.pre
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/Allrun.pre
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/g b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/bottomAir/g
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/g
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/bottomAir/g
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/bottomAir/radiationProperties
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/radiationProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/bottomAir/radiationProperties
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/bottomAir/turbulenceProperties
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/turbulenceProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/bottomAir/turbulenceProperties
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/viewFactorsDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/bottomAir/viewFactorsDict
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/viewFactorsDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/bottomAir/viewFactorsDict
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/heater/radiationProperties
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/radiationProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/heater/radiationProperties
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/leftSolid/radiationProperties
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/radiationProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/leftSolid/radiationProperties
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/regionProperties
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/regionProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/regionProperties
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/rightSolid/radiationProperties
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/radiationProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/rightSolid/radiationProperties
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/g b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/topAir/g
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/g
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/topAir/g
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/radiationProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/topAir/radiationProperties
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/radiationProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/topAir/radiationProperties
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/topAir/turbulenceProperties
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/turbulenceProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/topAir/turbulenceProperties
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/viewFactorsDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/topAir/viewFactorsDict
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/viewFactorsDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/constant/topAir/viewFactorsDict
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/blockMeshDict
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/blockMeshDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/blockMeshDict
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/bottomAir/decomposeParDict
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/decomposeParDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/bottomAir/decomposeParDict
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/bottomAir/fvSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution
similarity index 70%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution
index e4ba12e77..f74dcefba 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution
@@ -16,15 +16,7 @@ FoamFile
 
 solvers
 {
-    rho
-    {
-        solver          PCG
-        preconditioner  DIC;
-        tolerance       1e-7;
-        relTol          0;
-    }
-
-    p_rgh
+    "p_rgh.*"
     {
         solver           GAMG;
         tolerance        1e-7;
@@ -34,47 +26,36 @@ solvers
 
     }
 
-    "(U|h|k|epsilon|G|Ii)"
+    "(U|h|k|epsilon).*"
     {
         solver           PBiCGStab;
         preconditioner   DILU;
         tolerance        1e-7;
         relTol           0.1;
     }
-
-    G
-    {
-        $p_rgh;
-        tolerance       1e-05;
-        relTol          0.1;
-    }
 }
 
-SIMPLE
+PIMPLE
 {
     momentumPredictor yes;
     nNonOrthogonalCorrectors 0;
     pRefCell        0;
     pRefValue       100000;
-    rhoMin          0.2;
-    rhoMax          2;
 }
 
 relaxationFactors
 {
     fields
     {
-        rho             1.0;
-        p_rgh           0.7;
+        "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;
+        "U.*"            0.3;
+        "h.*"            0.7;
+        "(k|epsilon|omega).*" 0.7;
+        "qr.*"          0.7;
     }
 }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/controlDict
similarity index 96%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/controlDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/controlDict
index 8cffdb8ad..fee06281a 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/controlDict
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     chtMultiRegionSimpleFoam;
+application     chtMultiRegionFoam;
 
 startFrom       startTime;
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/decomposeParDict
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/decomposeParDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/decomposeParDict
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/fvSchemes
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/fvSchemes
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/fvSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/fvSolution
similarity index 98%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/fvSolution
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/fvSolution
index 007d20b6c..56e62015b 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/fvSolution
@@ -14,4 +14,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+PIMPLE
+{
+}
+
+
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/heater/decomposeParDict
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/decomposeParDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/heater/decomposeParDict
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/heater/fvSchemes
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSchemes
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/heater/fvSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/heater/fvSolution
similarity index 95%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/heater/fvSolution
index b743687b8..611693d33 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/heater/fvSolution
@@ -16,7 +16,7 @@ FoamFile
 
 solvers
 {
-    h
+    "h.*"
     {
         solver           PCG;
         preconditioner   DIC;
@@ -25,7 +25,7 @@ solvers
     }
 }
 
-SIMPLE
+PIMPLE
 {
     nNonOrthogonalCorrectors 0;
 }
@@ -34,7 +34,7 @@ relaxationFactors
 {
     equations
     {
-        h               0.7;
+        "h.*"           0.7;
     }
 }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/leftSolid/decomposeParDict
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/decomposeParDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/leftSolid/decomposeParDict
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/leftSolid/fvSchemes
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/fvSchemes
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/leftSolid/fvSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution
similarity index 95%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution
index b743687b8..611693d33 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/leftSolid/fvSolution
@@ -16,7 +16,7 @@ FoamFile
 
 solvers
 {
-    h
+    "h.*"
     {
         solver           PCG;
         preconditioner   DIC;
@@ -25,7 +25,7 @@ solvers
     }
 }
 
-SIMPLE
+PIMPLE
 {
     nNonOrthogonalCorrectors 0;
 }
@@ -34,7 +34,7 @@ relaxationFactors
 {
     equations
     {
-        h               0.7;
+        "h.*"           0.7;
     }
 }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/rightSolid/decomposeParDict
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/decomposeParDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/rightSolid/decomposeParDict
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/rightSolid/fvSchemes
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/fvSchemes
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/rightSolid/fvSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution
similarity index 95%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSolution
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution
index b743687b8..611693d33 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/rightSolid/fvSolution
@@ -16,7 +16,7 @@ FoamFile
 
 solvers
 {
-    h
+    "h.*"
     {
         solver           PCG;
         preconditioner   DIC;
@@ -25,7 +25,7 @@ solvers
     }
 }
 
-SIMPLE
+PIMPLE
 {
     nNonOrthogonalCorrectors 0;
 }
@@ -34,7 +34,7 @@ relaxationFactors
 {
     equations
     {
-        h               0.7;
+        "h.*"           0.7;
     }
 }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/topAir/decomposeParDict
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/decomposeParDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/topAir/decomposeParDict
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/topAir/fvSchemes
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/fvSchemes
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/topAir/fvSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/topAir/fvSolution
similarity index 70%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/topAir/fvSolution
index e4ba12e77..432878de1 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/fvSolution
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/topAir/fvSolution
@@ -16,15 +16,7 @@ FoamFile
 
 solvers
 {
-    rho
-    {
-        solver          PCG
-        preconditioner  DIC;
-        tolerance       1e-7;
-        relTol          0;
-    }
-
-    p_rgh
+    "p_rgh.*"
     {
         solver           GAMG;
         tolerance        1e-7;
@@ -34,47 +26,36 @@ solvers
 
     }
 
-    "(U|h|k|epsilon|G|Ii)"
+    "(U|h|k|epsilon).*"
     {
         solver           PBiCGStab;
         preconditioner   DILU;
         tolerance        1e-7;
         relTol           0.1;
     }
-
-    G
-    {
-        $p_rgh;
-        tolerance       1e-05;
-        relTol          0.1;
-    }
 }
 
-SIMPLE
+PIMPLE
 {
     momentumPredictor yes;
     nNonOrthogonalCorrectors 0;
     pRefCell        0;
     pRefValue       100000;
-    rhoMin          0.2;
-    rhoMax          2;
 }
 
 relaxationFactors
 {
     fields
     {
-        rho             1.0;
-        p_rgh           0.7;
+        "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;
+        "U.*"           0.3;
+        "h.*"           0.7;
+        "(k|epsilon|omega).*" 0.7;
+        "qr.*"          0.7;
     }
 }
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topoSetDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/topoSetDict
similarity index 100%
rename from tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topoSetDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeaterRadiation/system/topoSetDict